1 files changed, 8 insertions, 5 deletions
diff --git a/lib/efl/ffi/evas.rb b/lib/efl/ffi/evas.rb
index f6bc3c6..ce97982 100644
--- a/lib/efl/ffi/evas.rb
+++ b/lib/efl/ffi/evas.rb
@@ -6,13 +6,15 @@ require 'efl/ffi'
 module Efl
     #
     module Evas
+        #
+        extend Efl::FFIHelper
+        #
         def self.method_missing m, *args, &block
-            return Efl::FFI.send 'evas_'+m.to_s, *args, &block
+            sym = 'evas_'+m.to_s
+            raise NameError.new "#{self.name}.#{sym} (#{m})" if not self.respond_to? sym
+            self.module_eval "def self.#{m} *args, &block; r=self.#{sym}(*args); yield r if block_given?; r; end"
+            self.send sym, *args, &block
         end
-    end
-    #
-    module FFI
-        #
         #
         ffi_lib 'evas'
         #
@@ -1288,6 +1290,7 @@ module Efl
         ]
         #
         attach_fcts fcts
+        #
     end
 end
 #