From 2e352b0c8211351804bc1403e372bec11fc5fd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sun, 8 May 2011 00:34:14 +0200
Subject: update test_elm_win_class => test_elm_win

---
 test/test_elm_win.rb       | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 test/test_elm_win_class.rb | 49 --------------------------------------------
 2 files changed, 51 insertions(+), 49 deletions(-)
 create mode 100644 test/test_elm_win.rb
 delete mode 100644 test/test_elm_win_class.rb

diff --git a/test/test_elm_win.rb b/test/test_elm_win.rb
new file mode 100644
index 0000000..ed6246a
--- /dev/null
+++ b/test/test_elm_win.rb
@@ -0,0 +1,51 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elementary'
+#
+include Efl
+#
+class MyWin < Elm::ElmWin
+    #
+    def initialize name, title
+        super FFI::MemoryPointer::NULL, name
+        title_set title
+        feed
+        smart_callback_add "delete,request", method(:exit), FFI::MemoryPointer.from_string("my data")
+    end
+    def feed
+        @bg = Elm::ElmBg.new(self) do |bg|
+            bg.size_hint_weight_set 1.0, 1.0
+#            bg.color = 200,255,100
+            bg.evas_object_color_set 200,255,100,150
+            bg.show
+        end
+        resize_object_add @bg
+        @lb = Elm::ElmLabel.new(self) do |lb|
+            lb.label_set "Hello World!"
+            lb.size_hint_weight_set 1.0, 1.0
+        end
+        @lb.show
+        resize_object_add @lb
+    end
+    def exit data, evas_object, event_info
+        puts "EXIT #{data.read_string}"
+        Elm.exit
+    end
+end
+#
+Elm.init
+#
+win = MyWin.new "App name", "Window Title" do |w|
+    w.alpha_set true
+    w.move 300, 300
+    w.resize 200, 100
+    w.show
+end
+win.show
+#
+Elm.run
+Elm.shutdown
+#
+# EOF
+
diff --git a/test/test_elm_win_class.rb b/test/test_elm_win_class.rb
deleted file mode 100644
index fb98e71..0000000
--- a/test/test_elm_win_class.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'efl/elementary'
-#
-include Efl
-#
-class MyWin < Elm::ElmWin
-    def initialize name, title
-        super FFI::MemoryPointer::NULL, name
-        title_set title
-        feed
-        smart_callback_add "delete,request", method(:exit), FFI::MemoryPointer.from_string("my data")
-    end
-    def feed
-        # using block
-        @bg = add 'bg' do |bg|
-            bg.size_hint_weight_set 1.0, 1.0
-            bg.color = 200,255,100,200 # same as bg.color_set 200,255,100,200
-            bg.show
-        end
-        resize_object_add @bg.to_ptr
-        @lb = add 'label'do |lb|
-            lb.label_label_set "Hello World!"   # complete function name
-            lb.size_hint_weight_set 1.0, 1.0    # implicit evas_object function name prefix
-        end
-        @lb.show
-        resize_object_add @lb.to_ptr
-    end
-    def exit data, evas_object, event_info
-        puts "EXIT #{data.read_string}"
-        Elm.exit
-    end
-end
-#
-Elm.init
-#
-win = MyWin.new "App name", "Window Title" do |w,eo|
-    w.alpha_set true
-    eo.move 300, 300
-    eo.resize 200, 100
-    eo.show
-end
-#
-Elm.run
-Elm.shutdown
-#
-# EOF
-
-- 
cgit v1.1-2-g2b99