2 files changed, 27 insertions, 28 deletions
diff --git a/test/test_elm_win.rb b/test/test_elm_win.rb
index 1fe5e9b..24c4d6c 100644
--- a/test/test_elm_win.rb
+++ b/test/test_elm_win.rb
@@ -4,33 +4,32 @@
 require 'efl/elementary'
 #
 Efl::Elm.init
-
+#
 win_del = Proc.new { |data,evas_object,event_info|
-    Efl::FFI.elm_exit();
+    Efl::Elm.elm_exit();
 }
-
-win = Efl::FFI.elm_win_add ::FFI::MemoryPointer::NULL, "App name", :elm_win_basic
-Efl::FFI.elm_win_title_set win, "Window title"
-Efl::FFI.evas_object_smart_callback_add win, "delete,request", win_del, ::FFI::MemoryPointer::NULL
-
-bg = Efl::FFI.elm_bg_add win
-Efl::FFI.evas_object_size_hint_weight_set bg, 1.0, 1.0
-Efl::FFI.elm_win_resize_object_add win, bg
-Efl::FFI.evas_object_show bg
-
-lb = Efl::FFI.elm_label_add win
-Efl::FFI.elm_label_label_set lb, "Hello World!"
-Efl::FFI.evas_object_size_hint_weight_set lb, 1.0, 1.0
-Efl::FFI.elm_win_resize_object_add win, lb
-Efl::FFI.evas_object_show lb
-
-Efl::FFI.evas_object_move win, 300, 300
-Efl::FFI.evas_object_resize win, 200, 100
-
-Efl::FFI.evas_object_show win
-
+#
+win = Efl::Elm.elm_win_add FFI::MemoryPointer::NULL, "App name", :elm_win_basic
+Efl::Elm.elm_win_title_set win, "Window title"
+Efl::Evas.evas_object_smart_callback_add win, "delete,request", win_del, FFI::MemoryPointer::NULL
+#
+bg = Efl::Elm.elm_bg_add win
+Efl::Evas.evas_object_size_hint_weight_set bg, 1.0, 1.0
+Efl::Elm.elm_win_resize_object_add win, bg
+Efl::Evas.evas_object_show bg
+#
+lb = Efl::Elm.elm_label_add win
+Efl::Elm.elm_label_label_set lb, "Hello World!"
+Efl::Evas.evas_object_size_hint_weight_set lb, 1.0, 1.0
+Efl::Elm.elm_win_resize_object_add win, lb
+Efl::Evas.evas_object_show lb
+#
+Efl::Evas.evas_object_move win, 300, 300
+Efl::Evas.evas_object_resize win, 200, 100
+#
+Efl::Evas.evas_object_show win
+#
 Efl::Elm.run
 Efl::Elm.shutdown
 #
 # EOF
-
diff --git a/test/test_elm_win_class.rb b/test/test_elm_win_class.rb
index fee0265..5aa3491 100644
--- a/test/test_elm_win_class.rb
+++ b/test/test_elm_win_class.rb
@@ -21,13 +21,13 @@ class MyWin < Elm::ElmWin
             bg.color = 200,255,100,200 # same as bg.color_set 200,255,100,200
             bg.show
         end
-        resize_object_add @bg.ptr
+        resize_object_add @bg.to_ptr
         @lb = add 'label'do |lb|
-            lb.elm_label_label_set "Hello World!"   # complete function name
-            lb.size_hint_weight_set 1.0, 1.0        # implicit evas_object function name prefix
+            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.ptr
+        resize_object_add @lb.to_ptr
     end
     def exit data, evas_object, event_info
         puts "EXIT #{data.read_string}"