Merge branch 'wip'

Conflicts:
	tools/genruby.rb

101 files changed, 5072 insertions, 7462 deletions

diff --git a/Changelog b/Changelog
index 7799429..8d850e2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+2012-01-xx Jérémy Zurcher <jeremy@asynk.ch>
+	* remove usage of autoload
+	* efl.rb holds objects and method_missing helper code
+	* native.rb only helps for ffi mapping
+	* follow new elementary header split
+	* object constructors use instance_eval instead of yield
+
 2011-09-02 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.0.9
 	* implement test_bg, test_actionslider, test_box
@@ -17,8 +24,8 @@
 	* elementary objects constructor helper
 	* elementary objects may wrap callback pointers
 	* quick add classes : ElmDiskSelectorItem, ElmEntry, ElmFlipSelector, ElmFLipSelectorItem, ElmHoversel, ElmHoverselItem, ElmGenlistItemClassStruct, ElmHover, ElmButton, ElmListItem, ElmGenList,
-    * auto complete _set and _get function suffixes
-    * bugfix ecore_getopt
+	* auto complete _set and _get function suffixes
+	* bugfix ecore_getopt
 	* add REinaList#from_a ptrt
 	* add REinaList#to_a ptrt=nil
 	* rework EcoreGetopt
diff --git a/README.rdoc b/README.rdoc
index 4c344ad..88fe7f9 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -12,40 +12,51 @@ A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries).
 
 == SYNOPSIS:
 
-    require 'efl/elementary'
-
-    Efl::Elm.init
-
-    on_exit = Proc.new do |data, evas_object, event_info|
-        puts "EXIT #{data.read_string}"
-        Efl::Elm.exit
-    end
-
-    win = Efl::Elm::ElmWin.new nil, "Window name" do |w|
-        w.title = "My title"
-        w.alpha = true
-        w.move 300, 300
-        w.resize 200, 100
-        bg = Efl::Elm::ElmBg.new w  do |bg|
-            bg.size_hint_weight_expand
-            bg.size_hint_align_fill
-            bg.evas_object_color_set 200,255,100,150
-            bg.show
+    require 'efl/elm/elm_win'
+    require 'efl/elm/elm_bg'
+    require 'efl/elm/elm_label'
+
+    include Efl
+
+    class MyWin < Elm::ElmWin
+        def initialize name, title, &block
+            super FFI::MemoryPointer::NULL, name, &block
+            title = title
+            feed
+            smart_callback_add "delete,request", method(:on_delete), FFI::MemoryPointer.from_string("my data")
         end
-        w.resize_object_add bg
-        lb = Efl::Elm::ElmLabel.new w do |lb|
-            lb.text = "Hello World!"
-            lb.size_hint_weight_set 1.0, 1.0
+        def feed
+            @bg = Elm::ElmBg.new(self) do
+                size_hint_weight_expand
+                evas_object_color_set 200,255,100,150
+                show
+            end
+            resize_object_add @bg
+            @lb = Elm::ElmLabel.new(self) do
+                text_set "Hello World!"
+                size_hint_align_fill
+                size_hint_weight_expand
+                show
+            end
+            resize_object_add @lb
+        end
+        def on_delete data, evas_object, event_info
+            puts "EXIT #{data.read_string}"
+            Elm.exit
         end
-        lb.show
-        w.resize_object_add lb
-        w.smart_callback_add "delete,request", on_exit, FFI::MemoryPointer.from_string("my data")
     end
 
-    win.show
+    Elm.init
+
+    win = MyWin.new "App name", "Window Title" do
+        alpha_set true
+        resize 200, 100
+        center_set 600, 300
+        show
+    end
 
-    Efl::Elm.run
-    Efl::Elm.shutdown
+    Elm.run
+    Elm.shutdown
 
 For more examples you may look at:
 
@@ -76,7 +87,6 @@ Online repositories:
 
 * https://github.com/jeremyz/ffi-efl
 * http://cgit.asynk.ch/cgi-bin/cgit/ffi-efl/
-* https://gitorious.org/ffi-efl
 
 Gem:
 
@@ -87,6 +97,7 @@ Gem:
 Special thanks to:
 
 * Lionel Orry
+* The enlightenment team
 
 == LICENSE:
 
diff --git a/lib/efl.rb b/lib/efl.rb
index 0864a77..19b5551 100644
--- a/lib/efl.rb
+++ b/lib/efl.rb
@@ -1,23 +1,97 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-#
 module Efl
     #
     VERSION = '0.0.10'
     #
-    autoload :EcoreEvas,    './lib/efl/ecore_evas.rb'
-    autoload :EcoreGetopt,  './lib/efl/ecore_getopt.rb'
-    autoload :EcoreInput,   './lib/efl/ecore_input.rb'
-    autoload :Ecore,        './lib/efl/ecore.rb'
-    autoload :Edje,         './lib/efl/edje.rb'
-    autoload :Eet,          './lib/efl/eet.rb'
-    autoload :EinaHash,     './lib/efl/eina_hash.rb'
-    autoload :EinaList,     './lib/efl/eina_list.rb'
-    autoload :EinaLog,      './lib/efl/eina_log.rb'
-    autoload :Eina,         './lib/efl/eina.rb'
-    autoload :Elm,          './lib/efl/elementary.rb'
-    autoload :Evas,         './lib/efl/evas.rb'
+    module MethodResolver
+        def self.resolve mod, meth, prefix
+            meth_s = meth.to_s
+            if meth_s =~/^(.*)=$/
+                meth_s = $1+'_set'
+                args_s = '*args[0]'
+            elsif meth_s =~/^(.*)\?$/
+                meth_s = $1+'_get'
+                args_s = '*args'
+            else
+                args_s = '*args'
+            end
+            sym = (
+                if Efl::Native.respond_to? prefix+meth_s
+                    prefix+meth_s
+                elsif Efl::Native.respond_to? meth_s
+                    meth_s
+                elsif Efl::Native.respond_to? prefix+meth_s+'_get'
+                    prefix+meth_s+'_get'
+                elsif Efl::Native.respond_to? meth_s+'_get'
+                    meth_s+'_get'
+                else
+                    raise NameError.new "#{mod.name}.#{meth_s} (#{meth})"
+                end
+            )
+            mod.module_eval "def self.#{meth} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
+            sym
+        end
+    end
+    #
+    module ClassHelper
+        def to_a; [self] end
+        def to_ary; [self] end
+        def to_s; Object.instance_method(:to_s).bind(self).call+' ['+self.to_ptr.to_s+']' end
+        alias :to_str :to_s
+        def to_ptr; @ptr; end
+        def === o; @ptr === o.to_ptr; end
+        def null?; @ptr.null?; end
+        def address; @ptr.address; end
+        def self.included kls
+            # create class instance @search_prefixes
+            kls.class_eval "@search_prefixes ||=[]"
+            # access and prepend *args to @search_prefixes
+            kls.class_eval "def self.search_prefixes *args; @search_prefixes.unshift *args unless args.empty?; @search_prefixes; end"
+            # on inheritance, copy ancestor's @search_prefixes
+            kls.class_eval <<-EOF
+            def self.inherited sub
+                sub.class_eval '@search_prefixes = []'
+                sub.search_prefixes *self.search_prefixes
+            end
+            EOF
+        end
+        def method_missing m, *args, &block
+            m_s = m.to_s
+            if m_s =~/^(.*)=$/
+                m_s = $1+'_set'
+                args_s = '*args[0]'
+            elsif m_s =~/^(.*)\?$/
+                m_s = $1+'_get'
+                args_s = '*args'
+            else
+                args_s = '*args'
+            end
+            (['']+self.class.search_prefixes).each do |p|
+                sym = p+m_s
+                meth = (
+                    if Efl::Native.respond_to? sym
+                        sym
+                    elsif Efl::Native.respond_to? m_s
+                        m_s
+                    elsif Efl::Native.respond_to? sym+'_get'
+                        sym+'_get'
+                    elsif Efl::Native.respond_to? m_s+'_get'
+                        m_s+'_get'
+                    else
+                        nil
+                    end
+                )
+                if not meth.nil?
+                    self.class.class_eval "def #{m} *args, &block; r=Efl::Native.#{meth}(@ptr,#{args_s}); yield r if block_given?; r; end"
+                    return self.send m, *args, &block
+                end
+            end
+            Kernel.raise NameError.new "#{self.class.name} is unable to resolve #{m} within #{self.class.search_prefixes.inspect}"
+        end
+    end
+    #
 end
 #
 # EOF
diff --git a/lib/efl/ecore.rb b/lib/efl/ecore.rb
index 5216763..cf0a865 100644
--- a/lib/efl/ecore.rb
+++ b/lib/efl/ecore.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore'
 #
 module Efl
diff --git a/lib/efl/ecore_evas.rb b/lib/efl/ecore_evas.rb
index 09ff03c..a2043a1 100644
--- a/lib/efl/ecore_evas.rb
+++ b/lib/efl/ecore_evas.rb
@@ -1,6 +1,8 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
+require 'efl/evas'
 require 'efl/native/ecore_evas'
 #
 module Efl
@@ -17,7 +19,7 @@ module Efl
         class REcoreEvas
             include Efl::ClassHelper
             search_prefixes 'ecore_evas_'
-            def initialize o=nil
+            def initialize o=nil, &block
                 @ptr = (
                     case o
                     when NilClass
@@ -30,7 +32,7 @@ module Efl
                         raise ArgumentError.new "wrong argument #{o.class.name}"
                     end
                 )
-                yield self if block_given?
+                instance_eval &block if block
             end
             def self.release p
                 Native.ecore_evas_free p
diff --git a/lib/efl/ecore_getopt.rb b/lib/efl/ecore_getopt.rb
index e403e22..bda40af 100644
--- a/lib/efl/ecore_getopt.rb
+++ b/lib/efl/ecore_getopt.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore_getopt'
 #
 module Efl
@@ -9,16 +10,16 @@ module Efl
         #
         class EcoreGetoptValue < FFI::Union
             layout  :strp,          :pointer,
-                    :boolp,         :eina_bool_p,
-                    :shortp,        :short_p,
-                    :intp,          :int_p,
-                    :longp,         :long_p,
-                    :ushortp,       :ushort_p,
-                    :uintp,         :uint_p,
-                    :ulongp,        :ulong_p,
-                    :doublep,       :double_p,
-                    :listp,         :eina_list_p,
-                    :ptrp,          :void_p
+                    :boolp,         :pointer,
+                    :shortp,        :pointer,
+                    :intp,          :pointer,
+                    :longp,         :pointer,
+                    :ushortp,       :pointer,
+                    :uintp,         :pointer,
+                    :ulongp,        :pointer,
+                    :doublep,       :pointer,
+                    :listp,         :pointer,
+                    :ptrp,          :pointer
 
             def value_ptr idx
                 Native::EcoreGetoptValue.new to_ptr+(idx*Native::EcoreGetoptValue.size)
@@ -43,7 +44,7 @@ module Efl
                     :def,           EcoreGetoptDescStoreDef
         end
         #
-        callback :ecore_getopt_desc_cb, [:ecore_getopt_p, :ecore_getopt_desc_p, :string, :pointer, :ecore_getopt_value_p ], :eina_bool
+        callback :ecore_getopt_desc_cb, [:pointer, :pointer, :string, :pointer, :pointer ], :eina_bool
         #
         class EcoreGetoptDescCallback < FFI::Struct
             layout  :func,          :ecore_getopt_desc_cb,
diff --git a/lib/efl/ecore_input.rb b/lib/efl/ecore_input.rb
index a317039..3677432 100644
--- a/lib/efl/ecore_input.rb
+++ b/lib/efl/ecore_input.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore_input'
 #
 module Efl
diff --git a/lib/efl/eet.rb b/lib/efl/eet.rb
index 00ab1c1..c0a7c60 100644
--- a/lib/efl/eet.rb
+++ b/lib/efl/eet.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/eet'
 #
 module Efl
diff --git a/lib/efl/eina.rb b/lib/efl/eina.rb
index 356d3b0..2f95e68 100644
--- a/lib/efl/eina.rb
+++ b/lib/efl/eina.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/eina'
 #
 module Efl
diff --git a/lib/efl/eina_hash.rb b/lib/efl/eina_hash.rb
index d9a782c..3bac050 100644
--- a/lib/efl/eina_hash.rb
+++ b/lib/efl/eina_hash.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl/eina'
 require 'efl/native/eina_hash'
 #
 module Efl
diff --git a/lib/efl/eina_list.rb b/lib/efl/eina_list.rb
index 7897827..1343840 100644
--- a/lib/efl/eina_list.rb
+++ b/lib/efl/eina_list.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl/eina'
 require 'efl/native/eina_list'
 #
 module Efl
diff --git a/lib/efl/eina_log.rb b/lib/efl/eina_log.rb
index d30cf43..4736003 100644
--- a/lib/efl/eina_log.rb
+++ b/lib/efl/eina_log.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl/eina'
 require 'efl/native/eina_log'
 #
 module Efl
@@ -44,6 +45,9 @@ module Efl
             file, line, func = caller[1].split ':'
             Native.eina_log_print Native.EINA_LOG_DOMAIN_GLOBAL, lvl, file, func, line.to_i, msg
         end
+        class << self
+            private :_log
+        end
         #
         def self.log_crit msg
             self._log :eina_log_level_critical, msg
diff --git a/lib/efl/elementary.rb b/lib/efl/elementary.rb
index 8970b28..f1c1ec5 100644
--- a/lib/efl/elementary.rb
+++ b/lib/efl/elementary.rb
@@ -6,42 +6,12 @@ require 'efl/native/elementary'
 #
 module Efl
     #
-    module Native
-        #
-        class ElmGenlistItemClassStruct < FFI::Struct
-            layout  :item_style,        :pointer,
-                    :label_get,         :pointer,
-                    :icon_get,          :pointer,
-                    :state_get,         :pointer,
-                    :del,               :pointer,
-                    :moved,             :pointer,
-                    :mode_item_style,   :pointer
-        end
-        #
-    end
-    #
     module Elm
         #
         def self.version
             Native::VersionStruct.new(Native.elm_version)
         end
         #
-        module Helper
-            def self.included kls
-                def kls.constructor meth
-                    self.class_eval <<-EOF
-                    def initialize ptr, &block
-                        if ptr.is_a? FFI::Pointer
-                            super ptr, &block
-                        else
-                            super Native.method(:#{meth}), ptr, &block
-                        end
-                    end
-                    EOF
-                end
-            end
-        end
-        #
         class << self
             def init *args
                 a = args.select { |e| e.is_a? String }
@@ -54,638 +24,6 @@ module Efl
             end
         end
         #
-        class ElmObject < Efl::Evas::REvasObject
-            #
-            search_prefixes 'elm_object_'
-            #
-            def smart_callback_add event_str, cb, data=FFI::MemoryPointer::NULL
-                Native.evas_object_smart_callback_add @ptr, event_str, cb, data
-            end
-            #
-            def text_set label
-                Native.elm_object_part_text_set @ptr, nil, label
-            end
-            alias :text= :text_set
-            #
-            def text_get
-                Native.elm_object_part_text_get @ptr, nil
-            end
-            alias :text :text_get
-            #
-            def content_set content
-                Native.elm_object_part_content_set @ptr, nil, content
-            end
-            alias :content= :content_set
-            #
-            def content_get
-                Native.elm_object_part_content_get @ptr, nil
-            end
-            alias :content :content_get
-            #
-            def content_unset
-                Native.elm_object_part_content_unset @ptr, nil
-            end
-            #
-            def parent_widget_get
-                ElmObject.new Native.elm_object_parent_widget_get @ptr
-            end
-            alias :parent_widget :parent_widget_get
-        end
-        #
-        ####################################################################################
-        #
-        class ElmActionSlider < ElmObject
-            #
-            @as_pos = Native.enum_type :elm_actionslider_pos
-            class << self
-                attr_reader :as_pos
-            end
-            #
-            include Helper
-            constructor :elm_actionslider_add
-            search_prefixes 'elm_actionslider_'
-            #
-            def texts_set l=nil, c=nil, r=nil
-                l,c,r = *l if l.is_a? Array
-                Native.elm_object_part_text_set @ptr, "left", l
-                Native.elm_object_part_text_set @ptr, "center", c
-                Native.elm_object_part_text_set @ptr, "right", r
-            end
-            alias :texts= :texts_set
-            def indicator_set str
-                p = self.class.as_pos
-                v = (
-                     case str
-                     when 'l'
-                         p[:elm_actionslider_left]
-                     when 'c'
-                         p[:elm_actionslider_center]
-                     when 'r'
-                         p[:elm_actionslider_right]
-                     else
-                         p[:elm_actionslider_none]
-                     end
-                    )
-                Native.elm_actionslider_indicator_pos_set @ptr, v
-            end
-            alias :indicator= :indicator_set
-            def enabled_set str
-                p = self.class.as_pos
-                v = p[:elm_actionslider_none]
-                v |= p[:elm_actionslider_left] if str=~/l/
-                v |= p[:elm_actionslider_center] if str=~/c/
-                v |= p[:elm_actionslider_right] if str=~/r/
-                v |= p[:elm_actionslider_all] if str=~/a/
-                Native.elm_actionslider_enabled_pos_set @ptr, v
-            end
-            alias :enabled= :enabled_set
-            def magnet_set str
-                p = self.class.as_pos
-                v = p[:elm_actionslider_none]
-                v |= p[:elm_actionslider_left] if str=~/l/
-                v |= p[:elm_actionslider_center] if str=~/c/
-                v |= p[:elm_actionslider_right] if str=~/r/
-                v |= p[:elm_actionslider_all] if str=~/a/
-                Native.elm_actionslider_magnet_pos_set @ptr, v
-            end
-            alias :magnet= :magnet_set
-            #
-            def setup t=[], i='l', m='a', e='a'
-                texts_set *t
-                indicator_set i
-                magnet_set m
-                enabled_set e
-            end
-        end
-        #
-        class ElmAnchorBlock < ElmObject
-            #
-            include Helper
-            constructor :elm_anchorblock_add
-            search_prefixes 'elm_anchorblock_'
-        end
-        #
-        class ElmAnchorView < ElmObject
-            #
-            include Helper
-            constructor :elm_anchorview_add
-            search_prefixes 'elm_anchorview_'
-        end
-        #
-        class ElmBg < ElmObject
-            #
-            include Helper
-            constructor :elm_bg_add
-            search_prefixes 'elm_bg_'
-            #
-            def file_get
-                f = FFI::MemoryPointer.new :pointer
-                g = FFI::MemoryPointer.new :pointer
-                Native.elm_bg_file_get @ptr, f, g
-                [ f.read_pointer.read_string, g.read_pointer.read_string ]
-            end
-            alias :file :file_get
-            def color_get
-                r = FFI::MemoryPointer.new :int
-                g = FFI::MemoryPointer.new :int
-                b = FFI::MemoryPointer.new :int
-                Native.elm_bg_color_get @ptr, r, g, b
-                [ r.read_int, g.read_int, b.read_int ]
-            end
-            alias :color :color_get
-        end
-        #
-        class ElmBox < ElmObject
-            #
-            include Helper
-            constructor :elm_box_add
-            search_prefixes 'elm_box_'
-            #
-            def padding_get
-                x = FFI::MemoryPointer.new :int
-                y = FFI::MemoryPointer.new :int
-                Native::elm_box_padding_get @ptr, x, y
-                [ x.read_int, y.read_int ]
-            end
-            alias :padding :padding_get
-            #
-            def align_get
-                x = FFI::MemoryPointer.new :float
-                y = FFI::MemoryPointer.new :float
-                Native::elm_box_align_get @ptr, x, y
-                [ x.read_float, y.read_float ]
-            end
-            alias :align :padding_get
-            #
-            def children_get
-                Efl::EinaList::REinaList.new Native.elm_box_children_get @ptr
-            end
-            alias :children :children_get
-        end
-        #
-        class ElmBubble < ElmObject
-            #
-            include Helper
-            constructor :elm_bubble_add
-            search_prefixes 'elm_bubble_'
-        end
-        #
-        class ElmButton < ElmObject
-            #
-            include Helper
-            constructor :elm_button_add
-            search_prefixes 'elm_button_'
-            #
-        end
-        #
-        class ElmCalendar < ElmObject
-            #
-            include Helper
-            constructor :elm_calendar_add
-            search_prefixes 'elm_calendar_'
-            #
-        end
-        #
-        class ElmCheck < ElmObject
-            #
-            include Helper
-            constructor :elm_check_add
-            search_prefixes 'elm_check_'
-            #
-        end
-        #
-        class ElmClock < ElmObject
-            #
-            include Helper
-            constructor :elm_clock_add
-            search_prefixes 'elm_clock_'
-        end
-        #
-        class ElmColorSelector < ElmObject
-            #
-            include Helper
-            constructor :elm_colorselector_add
-            search_prefixes 'elm_colorselector_'
-            #
-        end
-        #
-        class ElmDiskSelector < ElmObject
-            #
-            include Helper
-            constructor :elm_diskselector_add
-            search_prefixes 'elm_diskselector_'
-            #
-            def item_selected_set it, b
-                Native::elm_diskselector_item_selected_set it, b
-            end
-            alias :item_selected= :item_selected_set
-        end
-        #
-        class ElmDiskSelectorItem < ElmObject
-            #
-            search_prefixes 'elm_diskselector_item_'
-            #
-            def data_get
-                Native::elm_diskselector_item_data_get @ptr
-            end
-            alias :data :data_get
-        end
-        #
-        class ElmEntry < ElmObject
-            #
-            include Helper
-            constructor :elm_entry_add
-            search_prefixes 'elm_entry_'
-            #
-        end
-        #
-        class ElmFileSelector < ElmObject
-            #
-            include Helper
-            constructor :elm_fileselector_add
-            search_prefixes 'elm_fileselector_'
-        end
-        #
-        class ElmFileSelectorButton < ElmObject
-            #
-            include Helper
-            constructor :elm_fileselector_button_add
-            search_prefixes 'elm_fileselector_button_'
-        end
-        #
-        class ElmFileSelectorENtry < ElmObject
-            #
-            include Helper
-            constructor :elm_fileselector_entry_add
-            search_prefixes 'elm_fileselector_entry_'
-        end
-        #
-        class ElmFlip < ElmObject
-            #
-            include Helper
-            constructor :elm_flip_add
-            search_prefixes 'elm_flip_'
-        end
-        #
-        class ElmFlipSelector < ElmObject
-            #
-            include Helper
-            constructor :elm_flipselector_add
-            search_prefixes 'elm_flipselector_'
-            #
-            def item_append label, cb, data
-                ElmFlipSelectorItem.new Native::elm_flipselector_item_append @ptr, label, cb, data
-            end
-            #
-            def selected_item_get
-                ElmFlipSelectorItem.new Native::elm_flipselector_selected_item_get @ptr
-            end
-            alias :selected_item :selected_item_get
-        end
-        #
-        class ElmFlipSelectorItem < ElmObject
-            #
-            search_prefixes 'elm_flipselector_item_'
-            #
-        end
-        #
-        class ElmFrame < ElmObject
-            #
-            include Helper
-            constructor :elm_frame_add
-            search_prefixes 'elm_frame_'
-        end
-        #
-        class ElmGenGrid < ElmObject
-            #
-            include Helper
-            constructor :elm_gengrid_add
-            search_prefixes 'elm_gengrid_'
-        end
-        #
-        class ElmGenList < ElmObject
-            #
-            include Helper
-            constructor :elm_genlist_add
-            search_prefixes 'elm_genlist_'
-            #
-        end
-        #
-        class ElmGestureLayer < ElmObject
-            #
-            include Helper
-            constructor :elm_gesture_layer_add
-            search_prefixes 'elm_gesture_layer_'
-        end
-        #
-        class ElmGlView < ElmObject
-            #
-            include Helper
-            constructor :elm_glview_add
-            search_prefixes 'elm_glview_'
-            #
-        end
-        #
-        class ElmGrid < ElmObject
-            #
-            include Helper
-            constructor :elm_grid_add
-            search_prefixes 'elm_grid_'
-            #
-        end
-        #
-        class ElmHover < ElmObject
-            #
-            include Helper
-            constructor :elm_hover_add
-            search_prefixes 'elm_hover_'
-            #
-        end
-        #
-        class ElmHoverSel < ElmObject
-            #
-            include Helper
-            constructor :elm_hoversel_add
-            search_prefixes 'elm_hoversel_'
-            #
-            def item_add label, icon_file=nil, icon_type=:elm_icon_none, cb=nil, data=nil
-                ElmHoverselItem.new Native::elm_hoversel_item_add @ptr, label, icon_file, icon_type, cb, data
-            end
-        end
-        #
-        class ElmHoverSelItem < ElmObject
-            #
-            search_prefixes 'elm_hoversel_item_'
-            #
-        end
-        #
-        class ElmIcon < ElmObject
-            #
-            include Helper
-            constructor :elm_icon_add
-            search_prefixes 'elm_icon_'
-            #
-            def scale_set args
-                Native.elm_icon_scale_set @ptr, *args
-            end
-            alias :scale= :scale_set
-        end
-        #
-        class ElmImage < ElmObject
-            #
-            include Helper
-            constructor :elm_image_add
-            search_prefixes 'elm_image_'
-            #
-        end
-        #
-        class ElmIndex < ElmObject
-            #
-            include Helper
-            constructor :elm_index_add
-            search_prefixes 'elm_index_'
-            #
-        end
-        #
-        class ElmInWin < ElmObject
-            #
-            search_prefixes 'elm_win_inwin_', 'elm_win_'
-            #
-            def initialize parent, &block
-                super Native.method(:elm_win_inwin_add), parent, &block
-            end
-            #
-        end
-        #
-        class ElmLabel < ElmObject
-            #
-            include Helper
-            constructor :elm_label_add
-            search_prefixes 'elm_label_'
-            #
-        end
-        #
-        class ElmLayout < ElmObject
-            #
-            include Helper
-            constructor :elm_layout_add
-            search_prefixes 'elm_layout_'
-            #
-            def edje_get &block
-                Efl::Edje::REdje.new Native.method(:elm_layout_edje_get), @ptr, &block
-            end
-            alias :edje :edje_get
-        end
-        #
-        class ElmList < ElmObject
-            #
-            include Helper
-            constructor :elm_list_add
-            search_prefixes 'elm_list_'
-            #
-            def item_append label, left_icon=nil, right_icon=nil, cb=nil, data=nil
-                ElmListItem.new Native::elm_list_item_append @ptr, label, left_icon, right_icon, cb, data
-            end
-        end
-        #
-        class ElmListItem < ElmObject
-            #
-            search_prefixes 'elm_list_item_'
-            #
-            def data_get
-                Native::elm_list_item_data_get @ptr
-            end
-            alias :data :data_get
-        end
-        #
-        class ElmMenu < ElmObject
-            #
-            include Helper
-            constructor :elm_menu_add
-            search_prefixes 'elm_menu_'
-            #
-        end
-        #
-        class ElmMenuItem < ElmObject
-            #
-            include Helper
-            constructor :elm_menu_item_add
-            search_prefixes 'elm_menu_item_'
-            #
-        end
-        #
-        class ElmMenuItemSeparator < ElmObject
-            #
-            include Helper
-            constructor :elm_menu_item_separator_add
-            search_prefixes 'elm_menu_item_separator_'
-            #
-        end
-        #
-        class ElmNaviFrame < ElmObject
-            #
-            include Helper
-            constructor :elm_naviframe_add
-            search_prefixes 'elm_naviframe_'
-            #
-        end
-        #
-        class ElmNotify < ElmObject
-            #
-            include Helper
-            constructor :elm_notify_add
-            search_prefixes 'elm_notify_'
-            #
-        end
-        #
-        class ElmPager < ElmObject
-            #
-            include Helper
-            constructor :elm_pager_add
-            search_prefixes 'elm_pager_'
-            #
-        end
-        #
-        class ElmPanel < ElmObject
-            #
-            include Helper
-            constructor :elm_panel_add
-            search_prefixes 'elm_panel_'
-            #
-        end
-        #
-        class ElmPanes < ElmObject
-            #
-            include Helper
-            constructor :elm_panes_add
-            search_prefixes 'elm_panes_'
-            #
-        end
-        #
-        class ElmPlayer < ElmObject
-            #
-            include Helper
-            constructor :elm_player_add
-            search_prefixes 'elm_player_'
-            #
-        end
-        #
-        class ElmPhoto < ElmObject
-            #
-            include Helper
-            constructor :elm_photo_add
-            search_prefixes 'elm_photo_'
-        end
-        #
-        class ElmPhotoCam < ElmObject
-            #
-            include Helper
-            constructor :elm_photocam_add
-            search_prefixes 'elm_photocam_'
-        end
-        #
-        class ElmProgressBar < ElmObject
-            #
-            include Helper
-            constructor :elm_progressbar_add
-            search_prefixes 'elm_progressbar_'
-        end
-        #
-        class ElmRadio < ElmObject
-            #
-            include Helper
-            constructor :elm_radio_add
-            search_prefixes 'elm_radio_'
-            #
-        end
-        #
-        class ElmScroller < ElmObject
-            #
-            include Helper
-            constructor :elm_scroller_add
-            search_prefixes 'elm_scroller_'
-            #
-        end
-        #
-        class ElmSeparator < ElmObject
-            #
-            include Helper
-            constructor :elm_separator_add
-            search_prefixes 'elm_separator_'
-            #
-        end
-        #
-        class ElmSlider < ElmObject
-            #
-            include Helper
-            constructor :elm_slider_add
-            search_prefixes 'elm_slider_'
-            #
-        end
-        #
-        class ElmSlideshow < ElmObject
-            #
-            include Helper
-            constructor :elm_slideshow_add
-            search_prefixes 'elm_slideshow_'
-            #
-        end
-        #
-        class ElmSpinner < ElmObject
-            #
-            include Helper
-            constructor :elm_spinner_add
-            search_prefixes 'elm_spinner_'
-            #
-        end
-        #
-        class ElmTable < ElmObject
-            #
-            include Helper
-            constructor :elm_table_add
-            search_prefixes 'elm_table_'
-        end
-        #
-        class ElmThumb < ElmObject
-            #
-            include Helper
-            constructor :elm_thumb_add
-            search_prefixes 'elm_thumb_'
-        end
-        #
-        class ElmToolbar < ElmObject
-            #
-            include Helper
-            constructor :elm_toolbar_add
-            search_prefixes 'elm_toolbar_'
-        end
-        #
-        class ElmVideo < ElmObject
-            #
-            include Helper
-            constructor :elm_video_add
-            search_prefixes 'elm_video_'
-        end
-        #
-        class ElmWin < ElmObject
-            #
-            search_prefixes 'elm_win_'
-            #
-            def initialize parent, title, type=:elm_win_basic, &block
-                super Native.method(:elm_win_add), parent, title, type, &block
-            end
-            def inwin_add
-                ElmInWin.new @ptr
-            end
-            def screen_position_get
-                x = FFI::MemoryPointer.new :int
-                y = FFI::MemoryPointer.new :int
-                Native.elm_win_screen_position_get @ptr, x, y
-                [ x.read_int, y.read_int ]
-            end
-            alias :screen_position :screen_position_get
-        end
-        #
     end
 end
 #
diff --git a/lib/efl/elementary_all.rb b/lib/efl/elementary_all.rb
new file mode 100644
index 0000000..6cc7b9b
--- /dev/null
+++ b/lib/efl/elementary_all.rb
@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elementary'
+#
+require 'efl/elm/elm_object'
+require 'efl/elm/elm_object_item'
+#
+require 'efl/elm/elm_bg'
+require 'efl/elm/elm_box'
+require 'efl/elm/elm_button'
+require 'efl/elm/elm_entry'
+require 'efl/elm/elm_icon'
+require 'efl/elm/elm_label'
+require 'efl/elm/elm_list'
+require 'efl/elm/elm_scroller'
+require 'efl/elm/elm_tooltip'
+require 'efl/elm/elm_win'
+#
+# EOF
diff --git a/lib/efl/elm/elm_bg.rb b/lib/efl/elm/elm_bg.rb
new file mode 100644
index 0000000..1eea4ce
--- /dev/null
+++ b/lib/efl/elm/elm_bg.rb
@@ -0,0 +1,37 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_bg'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmBg < ElmObject
+            #
+            include Helper
+            constructor :elm_bg_add
+            search_prefixes 'elm_bg_'
+            #
+            def file_get
+                f = FFI::MemoryPointer.new :pointer
+                g = FFI::MemoryPointer.new :pointer
+                Native.elm_bg_file_get @ptr, f, g
+                [ f.read_pointer.read_string, g.read_pointer.read_string ]
+            end
+            alias :file :file_get
+            def color_get
+                r = FFI::MemoryPointer.new :int
+                g = FFI::MemoryPointer.new :int
+                b = FFI::MemoryPointer.new :int
+                Native.elm_bg_color_get @ptr, r, g, b
+                [ r.read_int, g.read_int, b.read_int ]
+            end
+            alias :color :color_get
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_box.rb b/lib/efl/elm/elm_box.rb
new file mode 100644
index 0000000..b0539a2
--- /dev/null
+++ b/lib/efl/elm/elm_box.rb
@@ -0,0 +1,42 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_box'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmBox < ElmObject
+            #
+            include Helper
+            constructor :elm_box_add
+            search_prefixes 'elm_box_'
+            #
+            def padding_get
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Native::elm_box_padding_get @ptr, x, y
+                [ x.read_int, y.read_int ]
+            end
+            alias :padding :padding_get
+            #
+            def align_get
+                x = FFI::MemoryPointer.new :float
+                y = FFI::MemoryPointer.new :float
+                Native::elm_box_align_get @ptr, x, y
+                [ x.read_float, y.read_float ]
+            end
+            alias :align :padding_get
+            #
+            def children_get
+                Efl::EinaList::REinaList.new Native.elm_box_children_get @ptr
+            end
+            alias :children :children_get
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_bubble.rb b/lib/efl/elm/elm_bubble.rb
new file mode 100644
index 0000000..ca5bbef
--- /dev/null
+++ b/lib/efl/elm/elm_bubble.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_bubble'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmBubble < ElmObject
+            #
+            include Helper
+            constructor :elm_bubble_add
+            search_prefixes 'elm_bubble_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_button.rb b/lib/efl/elm/elm_button.rb
new file mode 100644
index 0000000..dbf9c86
--- /dev/null
+++ b/lib/efl/elm/elm_button.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_button'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmButton < ElmObject
+            #
+            include Helper
+            constructor :elm_button_add
+            search_prefixes 'elm_button_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_calendar.rb b/lib/efl/elm/elm_calendar.rb
new file mode 100644
index 0000000..e8cf708
--- /dev/null
+++ b/lib/efl/elm/elm_calendar.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_calendar'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmCalendar < ElmObject
+            #
+            include Helper
+            constructor :elm_calendar_add
+            search_prefixes 'elm_calendar_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_check.rb b/lib/efl/elm/elm_check.rb
new file mode 100644
index 0000000..141890a
--- /dev/null
+++ b/lib/efl/elm/elm_check.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_check'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmCheck < ElmObject
+            #
+            include Helper
+            constructor :elm_check_add
+            search_prefixes 'elm_check_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_clock.rb b/lib/efl/elm/elm_clock.rb
new file mode 100644
index 0000000..4ebd02a
--- /dev/null
+++ b/lib/efl/elm/elm_clock.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_clock'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmClock < ElmObject
+            #
+            include Helper
+            constructor :elm_clock_add
+            search_prefixes 'elm_clock_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_cursor.rb b/lib/efl/elm/elm_cursor.rb
new file mode 100644
index 0000000..cfdd602
--- /dev/null
+++ b/lib/efl/elm/elm_cursor.rb
@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_cursor'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmCursor < ElmObject
+            #
+            search_prefixes 'elm_cursor_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_entry.rb b/lib/efl/elm/elm_entry.rb
new file mode 100644
index 0000000..0d2b287
--- /dev/null
+++ b/lib/efl/elm/elm_entry.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_entry'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmEntry < ElmObject
+            #
+            include Helper
+            constructor :elm_entry_add
+            search_prefixes 'elm_entry_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_frame.rb b/lib/efl/elm/elm_frame.rb
new file mode 100644
index 0000000..f1eb7a7
--- /dev/null
+++ b/lib/efl/elm/elm_frame.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_frame'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmFrame < ElmObject
+            #
+            include Helper
+            constructor :elm_frame_add
+            search_prefixes 'elm_frame_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_grid.rb b/lib/efl/elm/elm_grid.rb
new file mode 100644
index 0000000..9b00a35
--- /dev/null
+++ b/lib/efl/elm/elm_grid.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_grid'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmGrid < ElmObject
+            #
+            include Helper
+            constructor :elm_grid_add
+            search_prefixes 'elm_grid_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_icon.rb b/lib/efl/elm/elm_icon.rb
new file mode 100644
index 0000000..89a00ec
--- /dev/null
+++ b/lib/efl/elm/elm_icon.rb
@@ -0,0 +1,26 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_icon'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmIcon < ElmObject
+            #
+            include Helper
+            constructor :elm_icon_add
+            search_prefixes 'elm_icon_'
+            #
+            def scale_set args
+                Native.elm_icon_scale_set @ptr, *args
+            end
+            alias :scale= :scale_set
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_image.rb b/lib/efl/elm/elm_image.rb
new file mode 100644
index 0000000..6a37ee9
--- /dev/null
+++ b/lib/efl/elm/elm_image.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_image'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmImage < ElmObject
+            #
+            include Helper
+            constructor :elm_image_add
+            search_prefixes 'elm_image_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_label.rb b/lib/efl/elm/elm_label.rb
new file mode 100644
index 0000000..57460c4
--- /dev/null
+++ b/lib/efl/elm/elm_label.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_label'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmLabel < ElmObject
+            #
+            include Helper
+            constructor :elm_label_add
+            search_prefixes 'elm_label_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_layout.rb b/lib/efl/elm/elm_layout.rb
new file mode 100644
index 0000000..1eaeeef
--- /dev/null
+++ b/lib/efl/elm/elm_layout.rb
@@ -0,0 +1,26 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_layout'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmLayout < ElmObject
+            #
+            include Helper
+            constructor :elm_layout_add
+            search_prefixes 'elm_layout_'
+            #
+            def edje_get &block
+                Efl::Edje::REdje.new Native.method(:elm_layout_edje_get), @ptr, &block
+            end
+            alias :edje :edje_get
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_list.rb b/lib/efl/elm/elm_list.rb
new file mode 100644
index 0000000..dfdf7f9
--- /dev/null
+++ b/lib/efl/elm/elm_list.rb
@@ -0,0 +1,54 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/elm/elm_object_item'
+require 'efl/native/elm/elm_list'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmList < ElmObject
+            #
+            include Helper
+            constructor :elm_list_add
+            search_prefixes 'elm_list_'
+            #
+            def item_append label, left_icon=nil, right_icon=nil, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_list_item_append @ptr, label, left_icon, right_icon, cb, data
+            end
+            #
+            def item_prepend label, left_icon=nil, right_icon=nil, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_list_item_prepend @ptr, label, left_icon, right_icon, cb, data
+            end
+            #
+            def item_insert_before before, label, left_icon=nil, right_icon=nil, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_list_item_insert_before @ptr, before, label, left_icon, right_icon, cb, data
+            end
+            #
+            def item_insert_after after, label, left_icon=nil, right_icon=nil, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_list_item_insert_after @ptr, after, label, left_icon, right_icon, cb, data
+            end
+            #
+            def item_sorted_insert label, left_icon, right_icon, cb, data, cmp_fct
+                ElmObjectItem.new Native::elm_list_item_sorted_insert @ptr, label, left_icon, right_icon, cb, data, cmp_fct
+            end
+            #
+            def selected_item_get
+                ElmObjectItem.new Native::elm_list_selected_item_get @ptr
+            end
+            #
+            def item_prev
+                ElmObjectItem.new Native::elm_list_item_prev @ptr
+            end
+            #
+            def item_next
+                ElmObjectItem.new Native::elm_list_item_next @ptr
+            end
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_menu.rb b/lib/efl/elm/elm_menu.rb
new file mode 100644
index 0000000..f285011
--- /dev/null
+++ b/lib/efl/elm/elm_menu.rb
@@ -0,0 +1,55 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/elm/elm_object_item'
+require 'efl/native/elm/elm_menu'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmMenu < ElmObject
+            #
+            include Helper
+            constructor :elm_menu_add
+            search_prefixes 'elm_menu_'
+            #
+            def item_add parent, icon=nil, label=nil, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_menu_item_add @ptr, parent, icon, label, cb, data
+            end
+            #
+            def item_add_object parent, subobj, cb=nil, data=nil
+                ElmObjectItem.new Native::elm_menu_item_add_object @ptr, parent, subobj, cb, data
+            end
+            #
+            def item_separator_add parent
+                ElmObjectItem.new Native::elm_menu_item_separator_add @ptr, parent
+            end
+            #
+            def selected_item_get
+                ElmObjectItem.new Native::elm_menu_selected_item_get @ptr
+            end
+            #
+            def last_item_get
+                ElmObjectItem.new Native::elm_menu_last_item_get @ptr
+            end
+            #
+            def first_item_get
+                ElmObjectItem.new Native::elm_menu_first_item_get @ptr
+            end
+            #
+            def item_next_get it
+                ElmObjectItem.new Native::elm_menu_item_next_get it
+            end
+            #
+            def item_prev_get it
+                ElmObjectItem.new Native::elm_menu_item_prev_get it
+            end
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_notify.rb b/lib/efl/elm/elm_notify.rb
new file mode 100644
index 0000000..c1b3d4c
--- /dev/null
+++ b/lib/efl/elm/elm_notify.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_notify'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmNotify < ElmObject
+            #
+            include Helper
+            constructor :elm_notify_add
+            search_prefixes 'elm_check_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_object.rb b/lib/efl/elm/elm_object.rb
new file mode 100644
index 0000000..f640da5
--- /dev/null
+++ b/lib/efl/elm/elm_object.rb
@@ -0,0 +1,68 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elementary'
+require 'efl/native/elm/elm_object'
+#
+module Efl
+    #
+    module Elm
+        #
+        module Helper
+            def self.included kls
+                def kls.constructor meth
+                    self.class_eval <<-EOF
+                    def initialize ptr, &block
+                        if ptr.is_a? FFI::Pointer
+                            super ptr, &block
+                        else
+                            super Native.method(:#{meth}), ptr, &block
+                        end
+                    end
+                    EOF
+                end
+            end
+        end
+        #
+        class ElmObject < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_object_'
+            #
+            def smart_callback_add event_str, cb, data=FFI::MemoryPointer::NULL
+                Native.evas_object_smart_callback_add @ptr, event_str, cb, data
+            end
+            #
+            def text_set label
+                Native.elm_object_part_text_set @ptr, nil, label
+            end
+            alias :text= :text_set
+            #
+            def text_get
+                Native.elm_object_part_text_get @ptr, nil
+            end
+            alias :text :text_get
+            #
+            def content_set content
+                Native.elm_object_part_content_set @ptr, nil, content
+            end
+            alias :content= :content_set
+            #
+            def content_get
+                Native.elm_object_part_content_get @ptr, nil
+            end
+            alias :content :content_get
+            #
+            def content_unset
+                Native.elm_object_part_content_unset @ptr, nil
+            end
+            #
+            def parent_widget_get
+                ElmObject.new Native.elm_object_parent_widget_get @ptr
+            end
+            alias :parent_widget :parent_widget_get
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_object_item.rb b/lib/efl/elm/elm_object_item.rb
new file mode 100644
index 0000000..eacedf0
--- /dev/null
+++ b/lib/efl/elm/elm_object_item.rb
@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_object_item'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmObjectItem < ElmObject
+            #
+            search_prefixes 'elm_object_item_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_panel.rb b/lib/efl/elm/elm_panel.rb
new file mode 100644
index 0000000..41dbcc5
--- /dev/null
+++ b/lib/efl/elm/elm_panel.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_panel'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmPanel < ElmObject
+            #
+            include Helper
+            constructor :elm_panel_add
+            search_prefixes 'elm_panel_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_scroller.rb b/lib/efl/elm/elm_scroller.rb
new file mode 100644
index 0000000..9cd855a
--- /dev/null
+++ b/lib/efl/elm/elm_scroller.rb
@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_scroller'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmScroller < ElmObject
+            #
+            include Helper
+            constructor :elm_scroller_add
+            search_prefixes 'elm_scroller_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_tooltip.rb b/lib/efl/elm/elm_tooltip.rb
new file mode 100644
index 0000000..3938586
--- /dev/null
+++ b/lib/efl/elm/elm_tooltip.rb
@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_tooltip'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmTooltip < ElmObject
+            #
+            search_prefixes 'elm_tooltip_', 'elm_object_tooltip_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/elm/elm_win.rb b/lib/efl/elm/elm_win.rb
new file mode 100644
index 0000000..daac677
--- /dev/null
+++ b/lib/efl/elm/elm_win.rb
@@ -0,0 +1,33 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_win'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmWin < ElmObject
+            #
+            search_prefixes 'elm_win_'
+            #
+            def initialize parent, title, type=:elm_win_basic, &block
+                super Native.method(:elm_win_add), parent, title, type, &block
+            end
+#            def inwin_add
+#                ElmInWin.new @ptr
+#            end
+            def screen_position_get
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Native.elm_win_screen_position_get @ptr, x, y
+                [ x.read_int, y.read_int ]
+            end
+            alias :screen_position :screen_position_get
+        end
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/evas.rb b/lib/efl/evas.rb
index aaebc4d..e65a710 100644
--- a/lib/efl/evas.rb
+++ b/lib/efl/evas.rb
@@ -1,13 +1,14 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/evas'
 #
 module Efl
     #
     module Native
         #
-        callback :new_update_region_cb, [:int, :int, :int, :int, :int_p], :pointer
+        callback :new_update_region_cb, [:int, :int, :int, :int, :pointer], :pointer
         callback :free_update_region_cb, [:int, :int, :int, :int, :pointer], :void
         #
         class EngineInfoStruct < FFI::Struct
@@ -57,7 +58,7 @@ module Efl
             include Efl::ClassHelper
             search_prefixes 'evas_'
             #
-            def initialize o=nil
+            def initialize o=nil, &block
                 @ptr = (
                     case o
                     when NilClass
@@ -68,7 +69,7 @@ module Efl
                         raise ArgumentError.new "wrong argument #{o.class.name}"
                     end
                 )
-                yield self if block_given?
+                instance_eval &block if block
             end
             def self.release p
                 Native.evas_free p
@@ -132,7 +133,7 @@ module Efl
             include Efl::ClassHelper
             search_prefixes 'evas_object_', 'evas_'
             #
-            def initialize a, *args
+            def initialize a, *args, &block
                 @ptr = (
                     case a
                     when FFI::Pointer
@@ -143,7 +144,7 @@ module Efl
                         raise ArgumentError.new "wrong argument #{a.class.name}"
                     end
                 )
-                yield self if block_given?
+                instance_eval &block if block
             end
             def self.release p
                 Native.evas_object_del p unless p.nil?
@@ -160,9 +161,9 @@ module Efl
                 REvasObject.release @ptr
                 @ptr=nil
             end
-            def object_box_add
+            def object_box_add &block
                 o = Evas::REvasBox.new FFI::AutoPointer.new Native.evas_object_box_add_to(@ptr), REvasObject.method(:release)
-                yield o if block_given?
+                o.instance_eval &block if block
                 o
             end
             def evas_name
diff --git a/lib/efl/ffi.rb b/lib/efl/ffi.rb
deleted file mode 100644
index 98a9d69..0000000
--- a/lib/efl/ffi.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'ffi'
-#
-module Efl
-    #
-    module Native
-        #
-        extend FFI::Library
-        #
-        def self.attach_fcts fcts
-            fcts.each do |func|
-                begin
-                    attach_function(*func)
-                rescue Object => e
-                    puts "Could not attach #{func} #{e.message}"
-                end
-            end
-        end
-        #
-        class << self
-            alias :ffi_lib_orig :ffi_lib
-            def ffi_lib *names
-                @all_ffi_libs||=[]
-                @all_ffi_libs += ffi_lib_orig(names)
-                @all_ffi_libs.uniq!
-            end
-            def find_variable name
-                @all_ffi_libs.each do |lib|
-                    address = lib.find_variable name
-                    return address if not address.nil?
-                end
-                return nil
-            end
-        end
-        #
-        typedef :pointer, :char_p
-        typedef :pointer, :short_p
-        typedef :pointer, :int_p
-        typedef :pointer, :long_p
-        typedef :pointer, :float_p
-        typedef :pointer, :double_p
-        typedef :pointer, :uchar_p
-        typedef :pointer, :ushort_p
-        typedef :pointer, :uint_p
-        typedef :pointer, :ulong_p
-        typedef :pointer, :ufloat_p
-        typedef :pointer, :udouble_p
-        typedef :pointer, :void_p
-        typedef :pointer, :string_array
-        typedef :pointer, :string_array_p
-        typedef :uint_p,  :uintptr_t
-        #
-        typedef :bool,    :eina_bool
-        typedef :pointer, :eina_bool_p
-        typedef :pointer, :eina_list_p
-        typedef :pointer, :eina_hash_p
-        typedef :pointer, :eina_iterator_p
-        typedef :pointer, :eina_accessor_p
-        typedef :pointer, :evas_p
-        typedef :pointer, :evas_object_p
-        typedef :pointer, :evas_object_pp
-        typedef :pointer, :evas_gl_api_p
-        typedef :pointer, :ecore_getopt_p
-        typedef :pointer, :ecore_getopt_desc_p
-        typedef :pointer, :ecore_getopt_value_p
-        #
-        callback :eina_compare_cb, [ :void_p, :void_p ], :int
-        callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool
-        callback :eina_free_cb, [ :void_p ], :void
-        #
-        class VersionStruct < FFI::Struct
-            layout  :major,     :int,
-                    :minor,     :int,
-                    :micro,     :int,
-                    :revision,  :int
-
-            def full
-                [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.'
-            end
-        end
-    end
-    #
-    module ModuleHelper
-        def find_function m, prefix
-            m_s = m.to_s
-            if m_s =~/^(.*)=$/
-                m_s = $1+'_set'
-                args_s = '*args[0]'
-            elsif m_s =~/^(.*)\?$/
-                m_s = $1+'_get'
-                args_s = '*args'
-            else
-                args_s = '*args'
-            end
-            sym = (
-                if Efl::Native.respond_to? prefix+m_s
-                    prefix+m_s
-                elsif Efl::Native.respond_to? m_s
-                    m_s
-                elsif Efl::Native.respond_to? prefix+m_s+'_get'
-                    prefix+m_s+'_get'
-                elsif Efl::Native.respond_to? m_s+'_get'
-                    m_s+'_get'
-                else
-                    raise NameError.new "#{self.name}.#{m_s} (#{m})"
-                end
-            )
-            [sym, args_s]
-        end
-        module_function :find_function
-    end
-    #
-    module MethResolver
-        def self.resolve mod, meth, prefix
-            meth_s = meth.to_s
-            if meth_s =~/^(.*)=$/
-                meth_s = $1+'_set'
-                args_s = '*args[0]'
-            elsif meth_s =~/^(.*)\?$/
-                meth_s = $1+'_get'
-                args_s = '*args'
-            else
-                args_s = '*args'
-            end
-            sym = (
-                if Efl::Native.respond_to? prefix+meth_s
-                    prefix+meth_s
-                elsif Efl::Native.respond_to? meth_s
-                    meth_s
-                elsif Efl::Native.respond_to? prefix+meth_s+'_get'
-                    prefix+meth_s+'_get'
-                elsif Efl::Native.respond_to? meth_s+'_get'
-                    meth_s+'_get'
-                else
-                    raise NameError.new "#{mod.name}.#{meth_s} (#{meth})"
-                end
-            )
-            mod.module_eval "def self.#{meth} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            sym
-        end
-    end
-    #
-    module ClassHelper
-        def to_a; [self] end
-        def to_ary; [self] end
-        def to_s; Object.instance_method(:to_s).bind(self).call+' ['+self.to_ptr.to_s+']' end
-        def to_ptr; @ptr; end
-        def === o; @ptr === o.to_ptr; end
-        def null?; @ptr.null?; end
-        def address; @ptr.address; end
-        def self.included kls
-            # create class instance @search_prefixes
-            kls.class_eval "@search_prefixes ||=[]"
-            # access and prepend *args to @search_prefixes
-            kls.class_eval "def self.search_prefixes *args; @search_prefixes.unshift *args unless args.empty?; @search_prefixes; end"
-            # on inheritance, copy ancestor's @search_prefixes
-            kls.class_eval <<-EOF
-            def self.inherited sub
-                sub.class_eval '@search_prefixes = []'
-                sub.search_prefixes *self.search_prefixes
-            end
-            EOF
-        end
-        def method_missing m, *args, &block
-            m_s = m.to_s
-            if m_s =~/^(.*)=$/
-                m_s = $1+'_set'
-                args_s = '*args[0]'
-            elsif m_s =~/^(.*)\?$/
-                m_s = $1+'_get'
-                args_s = '*args'
-            else
-                args_s = '*args'
-            end
-            (['']+self.class.search_prefixes).each do |p|
-                sym = p+m_s
-                meth = (
-                    if Efl::Native.respond_to? sym
-                        sym
-                    elsif Efl::Native.respond_to? m_s
-                        m_s
-                    elsif Efl::Native.respond_to? sym+'_get'
-                        sym+'_get'
-                    elsif Efl::Native.respond_to? m_s+'_get'
-                        m_s+'_get'
-                    else
-                        nil
-                    end
-                )
-                if not meth.nil?
-                    self.class.class_eval "def #{m} *args, &block; r=Efl::Native.#{meth}(@ptr,#{args_s}); yield r if block_given?; r; end"
-                    return self.send m, *args, &block
-                end
-            end
-            Kernel.raise NameError.new "#{self.class.name} is unable to resolve #{m} within #{self.class.search_prefixes.inspect}"
-        end
-    end
-end
-#
-# EOF
diff --git a/lib/efl/native.rb b/lib/efl/native.rb
index 1908595..24b336c 100644
--- a/lib/efl/native.rb
+++ b/lib/efl/native.rb
@@ -1,16 +1,50 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/native/eet'
-require 'efl/native/eina'
-require 'efl/native/eina_hash'
-require 'efl/native/eina_list'
-require 'efl/native/evas'
-require 'efl/native/ecore'
-require 'efl/native/ecore_evas'
-require 'efl/native/ecore_getopt'
-require 'efl/native/ecore_input'
-require 'efl/native/edje'
-require 'efl/native/elementary'
+require 'ffi'
+#
+module Efl
+    #
+    module Native
+        #
+        extend FFI::Library
+        #
+        typedef :bool, :eina_bool
+        #
+        def self.attach_fcts fcts
+            fcts.each do |func|
+                begin
+                    attach_function(*func)
+                rescue Object => e
+                    puts "Could not attach #{func} #{e.message}"
+                end
+            end
+        end
+        #
+        class << self
+            def find_variable name
+                ffi_libraries.each do |lib|
+                    address = lib.find_variable name
+                    return address if not address.nil?
+                end
+                return nil
+            end
+        end
+        #
+        class VersionStruct < FFI::Struct
+            layout  :major,     :int,
+                    :minor,     :int,
+                    :micro,     :int,
+                    :revision,  :int
+
+            def full
+                [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.'
+            end
+        end
+    end
+    #
+end
+#
+require 'efl/native/eina_types'
 #
 # EOF
diff --git a/lib/efl/native/ecore.rb b/lib/efl/native/ecore.rb
index 683904b..04ddcaa 100644
--- a/lib/efl/native/ecore.rb
+++ b/lib/efl/native/ecore.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module Ecore
         #
-        FCT_PREFIX = 'ecore_'
+        FCT_PREFIX = 'ecore_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -22,35 +21,35 @@ module Efl
         ffi_lib 'ecore'
         #
         # ENUMS
-        # typedef enum _Ecore_Exe_Flags { ECORE_EXE_NONE = 0, ECORE_EXE_PIPE_READ = 1, ECORE_EXE_PIPE_WRITE = 2, ECORE_EXE_PIPE_ERROR = 4, ECORE_EXE_PIPE_READ_LINE_BUFFERED = 8, ECORE_EXE_PIPE_ERROR_LINE_BUFFERED = 16, ECORE_EXE_PIPE_AUTO = 32, ECORE_EXE_RESPAWN = 64, ECORE_EXE_USE_SH = 128, ECORE_EXE_NOT_LEADER = 256, ECORE_EXE_TERM_WITH_PARENT = 512 } Ecore_Exe_Flags
-        # FIXME
-        # typedef enum _Ecore_Exe_Win32_Priority { ECORE_EXE_WIN32_PRIORITY_IDLE, ECORE_EXE_WIN32_PRIORITY_BELOW_NORMAL, ECORE_EXE_WIN32_PRIORITY_NORMAL, ECORE_EXE_WIN32_PRIORITY_ABOVE_NORMAL, ECORE_EXE_WIN32_PRIORITY_HIGH, ECORE_EXE_WIN32_PRIORITY_REALTIME } Ecore_Exe_Win32_Priority
-        # FIXME
-        # typedef enum _Ecore_Fd_Handler_Flags { ECORE_FD_READ = 1, ECORE_FD_WRITE = 2, ECORE_FD_ERROR = 4 } Ecore_Fd_Handler_Flags
-        # FIXME
-        # typedef enum _Ecore_Poller_Type { ECORE_POLLER_CORE = 0 } Ecore_Poller_Type
-        # FIXME
-        # typedef enum _Ecore_Pos_Map { ECORE_POS_MAP_LINEAR, ECORE_POS_MAP_ACCELERATE, ECORE_POS_MAP_DECELERATE, ECORE_POS_MAP_SINUSOIDAL, ECORE_POS_MAP_ACCELERATE_FACTOR, ECORE_POS_MAP_DECELERATE_FACTOR, ECORE_POS_MAP_SINUSOIDAL_FACTOR, ECORE_POS_MAP_DIVISOR_INTERP, ECORE_POS_MAP_BOUNCE, ECORE_POS_MAP_SPRING } Ecore_Pos_Map
-        # FIXME
-        # typedef enum _Ecore_Animator_Source { ECORE_ANIMATOR_SOURCE_TIMER, ECORE_ANIMATOR_SOURCE_CUSTOM } Ecore_Animator_Source
-        # FIXME
+        # enum _Ecore_Exe_Flags {...} Ecore_Exe_Flags;
+        enum :ecore_exe_flags, [ :ecore_exe_none, 0, :ecore_exe_pipe_read, 1, :ecore_exe_pipe_write, 2, :ecore_exe_pipe_error, 4,
+            :ecore_exe_pipe_read_line_buffered, 8, :ecore_exe_pipe_error_line_buffered, 16, :ecore_exe_pipe_auto, 32, :ecore_exe_respawn, 64, :ecore_exe_use_sh,
+            128, :ecore_exe_not_leader, 256, :ecore_exe_term_with_parent, 512 ]
+        # enum _Ecore_Exe_Win32_Priority {...} Ecore_Exe_Win32_Priority;
+        enum :ecore_exe_win32_priority, [ :ecore_exe_win32_priority_idle, :ecore_exe_win32_priority_below_normal, :ecore_exe_win32_priority_normal,
+            :ecore_exe_win32_priority_above_normal, :ecore_exe_win32_priority_high, :ecore_exe_win32_priority_realtime ]
+        # enum _Ecore_Fd_Handler_Flags {...} Ecore_Fd_Handler_Flags;
+        enum :ecore_fd_handler_flags, [ :ecore_fd_read, 1, :ecore_fd_write, 2, :ecore_fd_error, 4 ]
+        # enum _Ecore_Poller_Type {...} Ecore_Poller_Type;
+        enum :ecore_poller_type, [ :ecore_poller_core, 0 ]
+        # enum _Ecore_Pos_Map {...} Ecore_Pos_Map;
+        enum :ecore_pos_map, [ :ecore_pos_map_linear, :ecore_pos_map_accelerate, :ecore_pos_map_decelerate, :ecore_pos_map_sinusoidal,
+            :ecore_pos_map_accelerate_factor, :ecore_pos_map_decelerate_factor, :ecore_pos_map_sinusoidal_factor, :ecore_pos_map_divisor_interp,
+            :ecore_pos_map_bounce, :ecore_pos_map_spring ]
+        # enum _Ecore_Animator_Source {...} Ecore_Animator_Source;
+        enum :ecore_animator_source, [ :ecore_animator_source_timer, :ecore_animator_source_custom ]
         #
         # TYPEDEFS
         # typedef struct _Ecore_Version Ecore_Version;
         typedef :pointer, :ecore_version
-        typedef :pointer, :ecore_version_p
         # typedef struct _Ecore_Win32_Handler Ecore_Win32_Handler;
         typedef :pointer, :ecore_win32_handler
-        typedef :pointer, :ecore_win32_handler_p
         # typedef struct _Ecore_Event_Handler Ecore_Event_Handler;
         typedef :pointer, :ecore_event_handler
-        typedef :pointer, :ecore_event_handler_p
         # typedef struct _Ecore_Event_Filter Ecore_Event_Filter;
         typedef :pointer, :ecore_event_filter
-        typedef :pointer, :ecore_event_filter_p
         # typedef struct _Ecore_Event Ecore_Event;
         typedef :pointer, :ecore_event
-        typedef :pointer, :ecore_event_p
         # typedef struct _Ecore_Event_Signal_User Ecore_Event_Signal_User;
         typedef :pointer, :ecore_event_signal_user
         # typedef struct _Ecore_Event_Signal_Hup Ecore_Event_Signal_Hup;
@@ -61,13 +60,8 @@ module Efl
         typedef :pointer, :ecore_event_signal_power
         # typedef struct _Ecore_Event_Signal_Realtime Ecore_Event_Signal_Realtime;
         typedef :pointer, :ecore_event_signal_realtime
-        # typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags;
-        typedef :pointer, :ecore_exe_flags
-        # typedef enum _Ecore_Exe_Win32_Priority Ecore_Exe_Win32_Priority;
-        typedef :pointer, :ecore_exe_win32_priority
         # typedef struct _Ecore_Exe Ecore_Exe;
         typedef :pointer, :ecore_exe
-        typedef :pointer, :ecore_exe_p
         # typedef struct _Ecore_Exe_Event_Add Ecore_Exe_Event_Add;
         typedef :pointer, :ecore_exe_event_add
         # typedef struct _Ecore_Exe_Event_Del Ecore_Exe_Event_Del;
@@ -76,81 +70,62 @@ module Efl
         typedef :pointer, :ecore_exe_event_data_line
         # typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data;
         typedef :pointer, :ecore_exe_event_data
-        typedef :pointer, :ecore_exe_event_data_p
         # typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
         typedef :pointer, :ecore_fd_handler
-        typedef :pointer, :ecore_fd_handler_p
-        # typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
-        typedef :pointer, :ecore_fd_handler_flags
-        # typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
-        typedef :pointer, :ecore_poller_type
         # typedef struct _Ecore_Poller Ecore_Poller;
         typedef :pointer, :ecore_poller
-        typedef :pointer, :ecore_poller_p
         # typedef struct _Ecore_Animator Ecore_Animator;
         typedef :pointer, :ecore_animator
-        typedef :pointer, :ecore_animator_p
-        # typedef enum _Ecore_Pos_Map Ecore_Pos_Map;
-        typedef :pointer, :ecore_pos_map
-        # typedef enum _Ecore_Animator_Source Ecore_Animator_Source;
-        typedef :pointer, :ecore_animator_source
         # typedef struct _Ecore_Timer Ecore_Timer;
         typedef :pointer, :ecore_timer
-        typedef :pointer, :ecore_timer_p
         # typedef struct _Ecore_Idler Ecore_Idler;
         typedef :pointer, :ecore_idler
-        typedef :pointer, :ecore_idler_p
         # typedef struct _Ecore_Idle_Enterer Ecore_Idle_Enterer;
         typedef :pointer, :ecore_idle_enterer
-        typedef :pointer, :ecore_idle_enterer_p
         # typedef struct _Ecore_Idle_Exiter Ecore_Idle_Exiter;
         typedef :pointer, :ecore_idle_exiter
-        typedef :pointer, :ecore_idle_exiter_p
         # typedef struct _Ecore_Thread Ecore_Thread;
         typedef :pointer, :ecore_thread
-        typedef :pointer, :ecore_thread_p
         # typedef struct _Ecore_Pipe Ecore_Pipe;
         typedef :pointer, :ecore_pipe
-        typedef :pointer, :ecore_pipe_p
         # typedef struct _Ecore_Job Ecore_Job;
         typedef :pointer, :ecore_job
-        typedef :pointer, :ecore_job_p
         #
         # CALLBACKS
         # typedef Eina_Bool (*Ecore_Task_Cb) (void *data);
-        callback :ecore_task_cb, [ :void_p ], :eina_bool
+        callback :ecore_task_cb, [ :pointer ], :bool
         # typedef int (*Ecore_Select_Function) (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
-        callback :ecore_select_function, [ :int, :pointer, :pointer, :pointer, :pointer ], :int
+        callback :ecore_select_function_cb, [ :int, :pointer, :pointer, :pointer, :pointer ], :int
         # typedef void (*Ecore_Cb) (void *data);
-        callback :ecore_cb, [ :void_p ], :void
+        callback :ecore_cb, [ :pointer ], :void
         # typedef void *(*Ecore_Data_Cb) (void *data);
-        callback :ecore_data_cb, [ :void_p ], :void_p
+        callback :ecore_data_cb, [ :pointer ], :pointer
         # typedef Eina_Bool (*Ecore_Filter_Cb) (void *data, void *loop_data, int type, void *event);
-        callback :ecore_filter_cb, [ :void_p, :void_p, :int, :void_p ], :eina_bool
+        callback :ecore_filter_cb, [ :pointer, :pointer, :int, :pointer ], :bool
         # typedef void (*Ecore_End_Cb) (void *user_data, void *func_data);
-        callback :ecore_end_cb, [ :void_p, :void_p ], :void
+        callback :ecore_end_cb, [ :pointer, :pointer ], :void
         # typedef Eina_Bool (*Ecore_Event_Handler_Cb) (void *data, int type, void *event);
-        callback :ecore_event_handler_cb, [ :void_p, :int, :void_p ], :eina_bool
+        callback :ecore_event_handler_cb, [ :pointer, :int, :pointer ], :bool
         # typedef void (*Ecore_Exe_Cb) (void *data, const Ecore_Exe *exe);
-        callback :ecore_exe_cb, [ :void_p, :ecore_exe_p ], :void
+        callback :ecore_exe_cb, [ :pointer, :ecore_exe ], :void
         # typedef Eina_Bool (*Ecore_Fd_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
-        callback :ecore_fd_cb, [ :void_p, :ecore_fd_handler_p ], :eina_bool
+        callback :ecore_fd_cb, [ :pointer, :ecore_fd_handler ], :bool
         # typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
-        callback :ecore_fd_prep_cb, [ :void_p, :ecore_fd_handler_p ], :void
+        callback :ecore_fd_prep_cb, [ :pointer, :ecore_fd_handler ], :void
         # typedef Eina_Bool (*Ecore_Win32_Handle_Cb) (void *data, Ecore_Win32_Handler *wh);
-        callback :ecore_win32_handle_cb, [ :void_p, :ecore_win32_handler_p ], :eina_bool
+        callback :ecore_win32_handle_cb, [ :pointer, :ecore_win32_handler ], :bool
         # typedef Eina_Bool (*Ecore_Timeline_Cb) (void *data, double pos);
-        callback :ecore_timeline_cb, [ :void_p, :double ], :eina_bool
+        callback :ecore_timeline_cb, [ :pointer, :double ], :bool
         # typedef void (*Ecore_Thread_Cb) (void *data, Ecore_Thread *thread);
-        callback :ecore_thread_cb, [ :void_p, :ecore_thread_p ], :void
+        callback :ecore_thread_cb, [ :pointer, :ecore_thread ], :void
         # typedef void (*Ecore_Thread_Notify_Cb) (void *data, Ecore_Thread *thread, void *msg_data);
-        callback :ecore_thread_notify_cb, [ :void_p, :ecore_thread_p, :void_p ], :void
+        callback :ecore_thread_notify_cb, [ :pointer, :ecore_thread, :pointer ], :void
         # typedef void (*Ecore_Pipe_Cb) (void *data, void *buffer, unsigned int nbyte);
-        callback :ecore_pipe_cb, [ :void_p, :void_p, :uint ], :void
+        callback :ecore_pipe_cb, [ :pointer, :pointer, :uint ], :void
         #
         # VARIABLES
         # EAPI extern Ecore_Version *ecore_version;
-        attach_variable :ecore_version, :ecore_version_p
+        attach_variable :ecore_version, :ecore_version
         # EAPI extern int ECORE_EXE_EVENT_ADD;
         attach_variable :ECORE_EXE_EVENT_ADD, :int
         # EAPI extern int ECORE_EXE_EVENT_DEL;
@@ -169,11 +144,11 @@ module Efl
         # EAPI void ecore_main_loop_iterate(void);
         [ :ecore_main_loop_iterate, [  ], :void ],
         # EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func);
-        [ :ecore_main_loop_select_func_set, [ :ecore_select_function ], :void ],
+        [ :ecore_main_loop_select_func_set, [ :ecore_select_function_cb ], :void ],
         # EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void);
-        [ :ecore_main_loop_select_func_get, [  ], :ecore_select_function ],
+        [ :ecore_main_loop_select_func_get, [  ], :ecore_select_function_cb ],
         # EAPI Eina_Bool ecore_main_loop_glib_integrate(void);
-        [ :ecore_main_loop_glib_integrate, [  ], :eina_bool ],
+        [ :ecore_main_loop_glib_integrate, [  ], :bool ],
         # EAPI void ecore_main_loop_glib_always_integrate_disable(void);
         [ :ecore_main_loop_glib_always_integrate_disable, [  ], :void ],
         # EAPI void ecore_main_loop_begin(void);
@@ -181,125 +156,125 @@ module Efl
         # EAPI void ecore_main_loop_quit(void);
         [ :ecore_main_loop_quit, [  ], :void ],
         # EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data);
-        [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :void_p ], :void ],
+        [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :pointer ], :void ],
         # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
-        [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :void_p ], :void_p ],
+        [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :pointer ], :pointer ],
         # EAPI int ecore_thread_main_loop_begin(void);
         [ :ecore_thread_main_loop_begin, [  ], :int ],
         # EAPI int ecore_thread_main_loop_end(void);
         [ :ecore_thread_main_loop_end, [  ], :int ],
         # EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
-        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :void_p ], :ecore_event_handler_p ],
+        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :pointer ], :ecore_event_handler ],
         # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
-        [ :ecore_event_handler_del, [ :ecore_event_handler_p ], :void_p ],
+        [ :ecore_event_handler_del, [ :ecore_event_handler ], :pointer ],
         # EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
-        [ :ecore_event_add, [ :int, :void_p, :ecore_end_cb, :void_p ], :ecore_event_p ],
+        [ :ecore_event_add, [ :int, :pointer, :ecore_end_cb, :pointer ], :ecore_event ],
         # EAPI void *ecore_event_del(Ecore_Event *event);
-        [ :ecore_event_del, [ :ecore_event_p ], :void_p ],
+        [ :ecore_event_del, [ :ecore_event ], :pointer ],
         # EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
-        [ :ecore_event_handler_data_get, [ :ecore_event_handler_p ], :void_p ],
+        [ :ecore_event_handler_data_get, [ :ecore_event_handler ], :pointer ],
         # EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
-        [ :ecore_event_handler_data_set, [ :ecore_event_handler_p, :void_p ], :void_p ],
+        [ :ecore_event_handler_data_set, [ :ecore_event_handler, :pointer ], :pointer ],
         # EAPI int ecore_event_type_new(void);
         [ :ecore_event_type_new, [  ], :int ],
         # EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data);
-        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :void_p ], :ecore_event_filter_p ],
+        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer ], :ecore_event_filter ],
         # EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
-        [ :ecore_event_filter_del, [ :ecore_event_filter_p ], :void_p ],
+        [ :ecore_event_filter_del, [ :ecore_event_filter ], :pointer ],
         # EAPI int ecore_event_current_type_get(void);
         [ :ecore_event_current_type_get, [  ], :int ],
         # EAPI void *ecore_event_current_event_get(void);
-        [ :ecore_event_current_event_get, [  ], :void_p ],
+        [ :ecore_event_current_event_get, [  ], :pointer ],
         # EAPI void ecore_exe_run_priority_set(int pri);
         [ :ecore_exe_run_priority_set, [ :int ], :void ],
         # EAPI int ecore_exe_run_priority_get(void);
         [ :ecore_exe_run_priority_get, [  ], :int ],
         # EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
-        [ :ecore_exe_run, [ :string, :void_p ], :ecore_exe_p ],
+        [ :ecore_exe_run, [ :string, :pointer ], :ecore_exe ],
         # EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
-        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :void_p ], :ecore_exe_p ],
+        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :pointer ], :ecore_exe ],
         # EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func);
-        [ :ecore_exe_callback_pre_free_set, [ :ecore_exe_p, :ecore_exe_cb ], :void ],
+        [ :ecore_exe_callback_pre_free_set, [ :ecore_exe, :ecore_exe_cb ], :void ],
         # EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size);
-        [ :ecore_exe_send, [ :ecore_exe_p, :void_p, :int ], :eina_bool ],
+        [ :ecore_exe_send, [ :ecore_exe, :pointer, :int ], :bool ],
         # EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
-        [ :ecore_exe_close_stdin, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_close_stdin, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
-        [ :ecore_exe_auto_limits_set, [ :ecore_exe_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_exe_auto_limits_set, [ :ecore_exe, :int, :int, :int, :int ], :void ],
         # EAPI Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
-        [ :ecore_exe_event_data_get, [ :ecore_exe_p, :ecore_exe_flags ], :ecore_exe_event_data_p ],
+        [ :ecore_exe_event_data_get, [ :ecore_exe, :ecore_exe_flags ], :ecore_exe_event_data ],
         # EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
-        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data_p ], :void ],
+        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data ], :void ],
         # EAPI void *ecore_exe_free(Ecore_Exe *exe);
-        [ :ecore_exe_free, [ :ecore_exe_p ], :void_p ],
+        [ :ecore_exe_free, [ :ecore_exe ], :pointer ],
         # EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
-        [ :ecore_exe_pid_get, [ :ecore_exe_p ], :ulong ],
+        [ :ecore_exe_pid_get, [ :ecore_exe ], :ulong ],
         # EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
-        [ :ecore_exe_tag_set, [ :ecore_exe_p, :string ], :void ],
+        [ :ecore_exe_tag_set, [ :ecore_exe, :string ], :void ],
         # EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
-        [ :ecore_exe_tag_get, [ :ecore_exe_p ], :string ],
+        [ :ecore_exe_tag_get, [ :ecore_exe ], :string ],
         # EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
-        [ :ecore_exe_cmd_get, [ :ecore_exe_p ], :string ],
+        [ :ecore_exe_cmd_get, [ :ecore_exe ], :string ],
         # EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
-        [ :ecore_exe_data_get, [ :ecore_exe_p ], :void_p ],
+        [ :ecore_exe_data_get, [ :ecore_exe ], :pointer ],
         # EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
-        [ :ecore_exe_data_set, [ :ecore_exe_p, :void_p ], :void_p ],
+        [ :ecore_exe_data_set, [ :ecore_exe, :pointer ], :pointer ],
         # EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe);
-        [ :ecore_exe_flags_get, [ :ecore_exe_p ], :ecore_exe_flags ],
+        [ :ecore_exe_flags_get, [ :ecore_exe ], :ecore_exe_flags ],
         # EAPI void ecore_exe_pause(Ecore_Exe *exe);
-        [ :ecore_exe_pause, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_pause, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_continue(Ecore_Exe *exe);
-        [ :ecore_exe_continue, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_continue, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_interrupt(Ecore_Exe *exe);
-        [ :ecore_exe_interrupt, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_interrupt, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_quit(Ecore_Exe *exe);
-        [ :ecore_exe_quit, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_quit, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_terminate(Ecore_Exe *exe);
-        [ :ecore_exe_terminate, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_terminate, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_kill(Ecore_Exe *exe);
-        [ :ecore_exe_kill, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_kill, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
-        [ :ecore_exe_signal, [ :ecore_exe_p, :int ], :void ],
+        [ :ecore_exe_signal, [ :ecore_exe, :int ], :void ],
         # EAPI void ecore_exe_hup(Ecore_Exe *exe);
-        [ :ecore_exe_hup, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_hup, [ :ecore_exe ], :void ],
         # EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data);
-        [ :ecore_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :void_p, :ecore_fd_cb, :void_p ], :ecore_fd_handler_p ],
+        [ :ecore_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :pointer, :ecore_fd_cb, :pointer ], :ecore_fd_handler ],
         # EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data);
-        [ :ecore_main_fd_handler_prepare_callback_set, [ :ecore_fd_handler_p, :ecore_fd_prep_cb, :void_p ], :void ],
+        [ :ecore_main_fd_handler_prepare_callback_set, [ :ecore_fd_handler, :ecore_fd_prep_cb, :pointer ], :void ],
         # EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
-        [ :ecore_main_fd_handler_del, [ :ecore_fd_handler_p ], :void_p ],
+        [ :ecore_main_fd_handler_del, [ :ecore_fd_handler ], :pointer ],
         # EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
-        [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler_p ], :int ],
+        [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler ], :int ],
         # EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
-        [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :eina_bool ],
+        [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :bool ],
         # EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
-        [ :ecore_main_fd_handler_active_set, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :void ],
+        [ :ecore_main_fd_handler_active_set, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :void ],
         # EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
-        [ :ecore_main_win32_handler_add, [ :void_p, :ecore_win32_handle_cb, :void_p ], :ecore_win32_handler_p ],
+        [ :ecore_main_win32_handler_add, [ :pointer, :ecore_win32_handle_cb, :pointer ], :ecore_win32_handler ],
         # EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
-        [ :ecore_main_win32_handler_del, [ :ecore_win32_handler_p ], :void_p ],
+        [ :ecore_main_win32_handler_del, [ :ecore_win32_handler ], :pointer ],
         # EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
         [ :ecore_poller_poll_interval_set, [ :ecore_poller_type, :double ], :void ],
         # EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
         [ :ecore_poller_poll_interval_get, [ :ecore_poller_type ], :double ],
         # EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
-        [ :ecore_poller_poller_interval_set, [ :ecore_poller_p, :int ], :eina_bool ],
+        [ :ecore_poller_poller_interval_set, [ :ecore_poller, :int ], :bool ],
         # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
-        [ :ecore_poller_poller_interval_get, [ :ecore_poller_p ], :int ],
+        [ :ecore_poller_poller_interval_get, [ :ecore_poller ], :int ],
         # EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
-        [ :ecore_poller_add, [ :ecore_poller_type, :int, :ecore_task_cb, :void_p ], :ecore_poller_p ],
+        [ :ecore_poller_add, [ :ecore_poller_type, :int, :ecore_task_cb, :pointer ], :ecore_poller ],
         # EAPI void *ecore_poller_del(Ecore_Poller *poller);
-        [ :ecore_poller_del, [ :ecore_poller_p ], :void_p ],
+        [ :ecore_poller_del, [ :ecore_poller ], :pointer ],
         # EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_animator_add, [ :ecore_task_cb, :void_p ], :ecore_animator_p ],
+        [ :ecore_animator_add, [ :ecore_task_cb, :pointer ], :ecore_animator ],
         # EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
-        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :void_p ], :ecore_animator_p ],
+        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :pointer ], :ecore_animator ],
         # EAPI void *ecore_animator_del(Ecore_Animator *animator);
-        [ :ecore_animator_del, [ :ecore_animator_p ], :void_p ],
+        [ :ecore_animator_del, [ :ecore_animator ], :pointer ],
         # EAPI void ecore_animator_freeze(Ecore_Animator *animator);
-        [ :ecore_animator_freeze, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_freeze, [ :ecore_animator ], :void ],
         # EAPI void ecore_animator_thaw(Ecore_Animator *animator);
-        [ :ecore_animator_thaw, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_thaw, [ :ecore_animator ], :void ],
         # EAPI void ecore_animator_frametime_set(double frametime);
         [ :ecore_animator_frametime_set, [ :double ], :void ],
         # EAPI double ecore_animator_frametime_get(void);
@@ -311,9 +286,9 @@ module Efl
         # EAPI Ecore_Animator_Source ecore_animator_source_get(void);
         [ :ecore_animator_source_get, [  ], :ecore_animator_source ],
         # EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data);
-        [ :ecore_animator_custom_source_tick_begin_callback_set, [ :ecore_cb, :void_p ], :void ],
+        [ :ecore_animator_custom_source_tick_begin_callback_set, [ :ecore_cb, :pointer ], :void ],
         # EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data);
-        [ :ecore_animator_custom_source_tick_end_callback_set, [ :ecore_cb, :void_p ], :void ],
+        [ :ecore_animator_custom_source_tick_end_callback_set, [ :ecore_cb, :pointer ], :void ],
         # EAPI void ecore_animator_custom_tick(void);
         [ :ecore_animator_custom_tick, [  ], :void ],
         # EAPI double ecore_time_get(void);
@@ -323,25 +298,25 @@ module Efl
         # EAPI double ecore_loop_time_get(void);
         [ :ecore_loop_time_get, [  ], :double ],
         # EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
-        [ :ecore_timer_add, [ :double, :ecore_task_cb, :void_p ], :ecore_timer_p ],
+        [ :ecore_timer_add, [ :double, :ecore_task_cb, :pointer ], :ecore_timer ],
         # EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
-        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :void_p ], :ecore_timer_p ],
+        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :pointer ], :ecore_timer ],
         # EAPI void *ecore_timer_del(Ecore_Timer *timer);
-        [ :ecore_timer_del, [ :ecore_timer_p ], :void_p ],
+        [ :ecore_timer_del, [ :ecore_timer ], :pointer ],
         # EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
-        [ :ecore_timer_interval_set, [ :ecore_timer_p, :double ], :void ],
+        [ :ecore_timer_interval_set, [ :ecore_timer, :double ], :void ],
         # EAPI double ecore_timer_interval_get(Ecore_Timer *timer);
-        [ :ecore_timer_interval_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_interval_get, [ :ecore_timer ], :double ],
         # EAPI void ecore_timer_freeze(Ecore_Timer *timer);
-        [ :ecore_timer_freeze, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_freeze, [ :ecore_timer ], :void ],
         # EAPI void ecore_timer_thaw(Ecore_Timer *timer);
-        [ :ecore_timer_thaw, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_thaw, [ :ecore_timer ], :void ],
         # EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
-        [ :ecore_timer_delay, [ :ecore_timer_p, :double ], :void ],
+        [ :ecore_timer_delay, [ :ecore_timer, :double ], :void ],
         # EAPI void ecore_timer_reset(Ecore_Timer *timer);
-        [ :ecore_timer_reset, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_reset, [ :ecore_timer ], :void ],
         # EAPI double ecore_timer_pending_get(Ecore_Timer *timer);
-        [ :ecore_timer_pending_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_pending_get, [ :ecore_timer ], :double ],
         # EAPI double ecore_timer_precision_get(void);
         [ :ecore_timer_precision_get, [  ], :double ],
         # EAPI void ecore_timer_precision_set(double precision);
@@ -349,31 +324,32 @@ module Efl
         # EAPI char *ecore_timer_dump(void);
         [ :ecore_timer_dump, [  ], :string ],
         # EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idler_add, [ :ecore_task_cb, :void_p ], :ecore_idler_p ],
+        [ :ecore_idler_add, [ :ecore_task_cb, :pointer ], :ecore_idler ],
         # EAPI void *ecore_idler_del(Ecore_Idler *idler);
-        [ :ecore_idler_del, [ :ecore_idler_p ], :void_p ],
+        [ :ecore_idler_del, [ :ecore_idler ], :pointer ],
         # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :void_p ], :ecore_idle_enterer_p ],
+        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :pointer ], :ecore_idle_enterer ],
         # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :void_p ], :ecore_idle_enterer_p ],
+        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :pointer ], :ecore_idle_enterer ],
         # EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
-        [ :ecore_idle_enterer_del, [ :ecore_idle_enterer_p ], :void_p ],
+        [ :ecore_idle_enterer_del, [ :ecore_idle_enterer ], :pointer ],
         # EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :void_p ], :ecore_idle_exiter_p ],
+        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :pointer ], :ecore_idle_exiter ],
         # EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
-        [ :ecore_idle_exiter_del, [ :ecore_idle_exiter_p ], :void_p ],
+        [ :ecore_idle_exiter_del, [ :ecore_idle_exiter ], :pointer ],
         # EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data);
-        [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p ], :ecore_thread_p ],
+        [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :pointer ], :ecore_thread ],
         # EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data, Eina_Bool try_no_queue);
-        [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p, :eina_bool ], :ecore_thread_p ],
+        [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :pointer, :bool ],
+            :ecore_thread ],
         # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
-        [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_cancel, [ :ecore_thread ], :bool ],
         # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
-        [ :ecore_thread_check, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_check, [ :ecore_thread ], :bool ],
         # EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data);
-        [ :ecore_thread_feedback, [ :ecore_thread_p, :void_p ], :eina_bool ],
+        [ :ecore_thread_feedback, [ :ecore_thread, :pointer ], :bool ],
         # EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
-        [ :ecore_thread_reschedule, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_reschedule, [ :ecore_thread ], :bool ],
         # EAPI int ecore_thread_active_get(void);
         [ :ecore_thread_active_get, [  ], :int ],
         # EAPI int ecore_thread_pending_get(void);
@@ -391,47 +367,47 @@ module Efl
         # EAPI int ecore_thread_available_get(void);
         [ :ecore_thread_available_get, [  ], :int ],
         # EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
-        [ :ecore_thread_local_data_add, [ :ecore_thread_p, :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ],
+        [ :ecore_thread_local_data_add, [ :ecore_thread, :string, :pointer, :eina_free_cb, :bool ], :bool ],
         # EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
-        [ :ecore_thread_local_data_set, [ :ecore_thread_p, :string, :void_p, :eina_free_cb ], :void_p ],
+        [ :ecore_thread_local_data_set, [ :ecore_thread, :string, :pointer, :eina_free_cb ], :pointer ],
         # EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
-        [ :ecore_thread_local_data_find, [ :ecore_thread_p, :string ], :void_p ],
+        [ :ecore_thread_local_data_find, [ :ecore_thread, :string ], :pointer ],
         # EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key);
-        [ :ecore_thread_local_data_del, [ :ecore_thread_p, :string ], :eina_bool ],
+        [ :ecore_thread_local_data_del, [ :ecore_thread, :string ], :bool ],
         # EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
-        [ :ecore_thread_global_data_add, [ :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ],
+        [ :ecore_thread_global_data_add, [ :string, :pointer, :eina_free_cb, :bool ], :bool ],
         # EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
-        [ :ecore_thread_global_data_set, [ :string, :void_p, :eina_free_cb ], :void_p ],
+        [ :ecore_thread_global_data_set, [ :string, :pointer, :eina_free_cb ], :pointer ],
         # EAPI void *ecore_thread_global_data_find(const char *key);
-        [ :ecore_thread_global_data_find, [ :string ], :void_p ],
+        [ :ecore_thread_global_data_find, [ :string ], :pointer ],
         # EAPI Eina_Bool ecore_thread_global_data_del(const char *key);
-        [ :ecore_thread_global_data_del, [ :string ], :eina_bool ],
+        [ :ecore_thread_global_data_del, [ :string ], :bool ],
         # EAPI void *ecore_thread_global_data_wait(const char *key, double seconds);
-        [ :ecore_thread_global_data_wait, [ :string, :double ], :void_p ],
+        [ :ecore_thread_global_data_wait, [ :string, :double ], :pointer ],
         # EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
-        [ :ecore_pipe_add, [ :ecore_pipe_cb, :void_p ], :ecore_pipe_p ],
+        [ :ecore_pipe_add, [ :ecore_pipe_cb, :pointer ], :ecore_pipe ],
         # EAPI void *ecore_pipe_del(Ecore_Pipe *p);
-        [ :ecore_pipe_del, [ :ecore_pipe_p ], :void_p ],
+        [ :ecore_pipe_del, [ :ecore_pipe ], :pointer ],
         # EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes);
-        [ :ecore_pipe_write, [ :ecore_pipe_p, :void_p, :uint ], :eina_bool ],
+        [ :ecore_pipe_write, [ :ecore_pipe, :pointer, :uint ], :bool ],
         # EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
-        [ :ecore_pipe_write_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_write_close, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
-        [ :ecore_pipe_read_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_read_close, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_thaw(Ecore_Pipe *p);
-        [ :ecore_pipe_thaw, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_thaw, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_freeze(Ecore_Pipe *p);
-        [ :ecore_pipe_freeze, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_freeze, [ :ecore_pipe ], :void ],
         # EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
-        [ :ecore_pipe_wait, [ :ecore_pipe_p, :int, :double ], :int ],
+        [ :ecore_pipe_wait, [ :ecore_pipe, :int, :double ], :int ],
         # EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
-        [ :ecore_job_add, [ :ecore_cb, :void_p ], :ecore_job_p ],
+        [ :ecore_job_add, [ :ecore_cb, :pointer ], :ecore_job ],
         # EAPI void *ecore_job_del(Ecore_Job *job);
-        [ :ecore_job_del, [ :ecore_job_p ], :void_p ],
+        [ :ecore_job_del, [ :ecore_job ], :pointer ],
         # EAPI void ecore_app_args_set(int argc, const char **argv);
-        [ :ecore_app_args_set, [ :int, :string_array ], :void ],
+        [ :ecore_app_args_set, [ :int, :pointer ], :void ],
         # EAPI void ecore_app_args_get(int *argc, char ***argv);
-        [ :ecore_app_args_get, [ :int_p, :string_array_p ], :void ],
+        [ :ecore_app_args_get, [ :pointer, :pointer ], :void ],
         # EAPI void ecore_app_restart(void);
         [ :ecore_app_restart, [  ], :void ],
         # EAPI void ecore_throttle_adjust(double amount);
diff --git a/lib/efl/native/ecore_evas.rb b/lib/efl/native/ecore_evas.rb
index cb53c26..46adac0 100644
--- a/lib/efl/native/ecore_evas.rb
+++ b/lib/efl/native/ecore_evas.rb
@@ -1,18 +1,19 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/ecore_getopt'
+require 'efl/native/evas'
 #
 module Efl
     #
     module EcoreEvas
         #
-        FCT_PREFIX = 'ecore_evas_'
+        FCT_PREFIX = 'ecore_evas_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -24,37 +25,35 @@ module Efl
         # ENUMS
         # typedef enum _Ecore_Evas_Engine_Type {...} Ecore_Evas_Engine_Type;
         enum :ecore_evas_engine_type, [ :ecore_evas_engine_software_buffer, :ecore_evas_engine_software_xlib, :ecore_evas_engine_xrender_x11,
-            :ecore_evas_engine_opengl_x11, :ecore_evas_engine_software_xcb, :ecore_evas_engine_xrender_xcb, :ecore_evas_engine_software_gdi, :ecore_evas_engine_software_ddraw,
-            :ecore_evas_engine_direct3d, :ecore_evas_engine_opengl_glew, :ecore_evas_engine_opengl_cocoa, :ecore_evas_engine_software_sdl, :ecore_evas_engine_directfb,
-            :ecore_evas_engine_software_fb, :ecore_evas_engine_software_8_x11, :ecore_evas_engine_software_16_x11, :ecore_evas_engine_software_16_ddraw,
-            :ecore_evas_engine_software_16_wince, :ecore_evas_engine_opengl_sdl, :ecore_evas_engine_ews, :ecore_evas_engine_psl1ght ]
+            :ecore_evas_engine_opengl_x11, :ecore_evas_engine_software_xcb, :ecore_evas_engine_xrender_xcb, :ecore_evas_engine_software_gdi,
+            :ecore_evas_engine_software_ddraw, :ecore_evas_engine_direct3d, :ecore_evas_engine_opengl_glew, :ecore_evas_engine_opengl_cocoa,
+            :ecore_evas_engine_software_sdl, :ecore_evas_engine_directfb, :ecore_evas_engine_software_fb, :ecore_evas_engine_software_8_x11,
+            :ecore_evas_engine_software_16_x11, :ecore_evas_engine_software_16_ddraw, :ecore_evas_engine_software_16_wince, :ecore_evas_engine_opengl_sdl,
+            :ecore_evas_engine_ews, :ecore_evas_engine_psl1ght, :ecore_evas_engine_wayland_shm, :ecore_evas_engine_wayland_egl ]
         # typedef enum _Ecore_Evas_Avoid_Damage_Type {...} Ecore_Evas_Avoid_Damage_Type;
-        enum :ecore_evas_avoid_damage_type, [ :ecore_evas_avoid_damage_none, 0, :ecore_evas_avoid_damage_expose, 1, :ecore_evas_avoid_damage_built_in, 2 ]
+        enum :ecore_evas_avoid_damage_type, [ :ecore_evas_avoid_damage_none, 0, :ecore_evas_avoid_damage_expose, 1, :ecore_evas_avoid_damage_built_in,
+            2 ]
         # typedef enum _Ecore_Evas_Object_Associate_Flags {...} Ecore_Evas_Object_Associate_Flags;
-        enum :ecore_evas_object_associate_flags, [ :ecore_evas_object_associate_base, 0, :ecore_evas_object_associate_stack, 1, :ecore_evas_object_associate_layer, 1,
-            :ecore_evas_object_associate_del, 1 ]
+        enum :ecore_evas_object_associate_flags, [ :ecore_evas_object_associate_base, 0, :ecore_evas_object_associate_stack, 1<<0,
+            :ecore_evas_object_associate_layer, 1<<1, :ecore_evas_object_associate_del, 1<<2 ]
         #
         # TYPEDEFS
         # typedef unsigned int Ecore_X_Window;
         typedef :uint, :ecore_x_window
         # typedef struct _Ecore_DirectFB_Window Ecore_DirectFB_Window;
         typedef :pointer, :ecore_directfb_window
-        typedef :pointer, :ecore_directfb_window_p
         # typedef struct _Ecore_Win32_Window Ecore_Win32_Window;
         typedef :pointer, :ecore_win32_window
-        typedef :pointer, :ecore_win32_window_p
         # typedef struct _Ecore_WinCE_Window Ecore_WinCE_Window;
         typedef :pointer, :ecore_wince_window
-        typedef :pointer, :ecore_wince_window_p
         # typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window;
         typedef :pointer, :ecore_cocoa_window
         # typedef struct _Ecore_Evas Ecore_Evas;
         typedef :pointer, :ecore_evas
-        typedef :pointer, :ecore_evas_p
         #
         # CALLBACKS
-        # void (*func) (Ecore_Evas *ee)
-        callback :ecore_evas_event_cb, [:ecore_evas_p], :void
+        # typedef void (*Ecore_Evas_Event_Cb) (Ecore_Evas *ee);
+        callback :ecore_evas_event_cb, [ :ecore_evas ], :void
         #
         # VARIABLES
         # EAPI extern int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE;
@@ -105,360 +104,378 @@ module Efl
         # EAPI int ecore_evas_shutdown(void);
         [ :ecore_evas_shutdown, [  ], :int ],
         # EAPI void ecore_evas_app_comp_sync_set(Eina_Bool do_sync);
-        [ :ecore_evas_app_comp_sync_set, [ :eina_bool ], :void ],
+        [ :ecore_evas_app_comp_sync_set, [ :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_app_comp_sync_get(void);
-        [ :ecore_evas_app_comp_sync_get, [  ], :eina_bool ],
+        [ :ecore_evas_app_comp_sync_get, [  ], :bool ],
         # EAPI Eina_List *ecore_evas_engines_get(void);
-        [ :ecore_evas_engines_get, [  ], :eina_list_p ],
+        [ :ecore_evas_engines_get, [  ], :eina_list ],
         # EAPI void ecore_evas_engines_free(Eina_List *engines);
-        [ :ecore_evas_engines_free, [ :eina_list_p ], :void ],
+        [ :ecore_evas_engines_free, [ :eina_list ], :void ],
         # EAPI Ecore_Evas *ecore_evas_new(const char *engine_name, int x, int y, int w, int h, const char *extra_options);
-        [ :ecore_evas_new, [ :string, :int, :int, :int, :int, :string ], :ecore_evas_p ],
+        [ :ecore_evas_new, [ :string, :int, :int, :int, :int, :string ], :ecore_evas ],
         # EAPI void ecore_evas_alpha_set(Ecore_Evas *ee, Eina_Bool alpha);
-        [ :ecore_evas_alpha_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_alpha_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_alpha_get(const Ecore_Evas *ee);
-        [ :ecore_evas_alpha_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_alpha_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_transparent_set(Ecore_Evas *ee, Eina_Bool transparent);
-        [ :ecore_evas_transparent_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_transparent_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_transparent_get(const Ecore_Evas *ee);
-        [ :ecore_evas_transparent_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_transparent_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_geometry_get, [ :ecore_evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_request_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_request_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_request_geometry_get, [ :ecore_evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_focus_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_focus_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_focus_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_focus_get(const Ecore_Evas *ee);
-        [ :ecore_evas_focus_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_focus_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_iconified_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_iconified_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_iconified_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_iconified_get(const Ecore_Evas *ee);
-        [ :ecore_evas_iconified_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_iconified_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_borderless_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_borderless_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_borderless_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_borderless_get(const Ecore_Evas *ee);
-        [ :ecore_evas_borderless_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_borderless_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_fullscreen_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_fullscreen_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_fullscreen_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_fullscreen_get(const Ecore_Evas *ee);
-        [ :ecore_evas_fullscreen_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_fullscreen_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_ignore_events_set(Ecore_Evas *ee, Eina_Bool ignore);
-        [ :ecore_evas_ignore_events_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_ignore_events_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_ignore_events_get(const Ecore_Evas *ee);
-        [ :ecore_evas_ignore_events_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_ignore_events_get, [ :ecore_evas ], :bool ],
         # EAPI int ecore_evas_visibility_get(const Ecore_Evas *ee);
-        [ :ecore_evas_visibility_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_visibility_get, [ :ecore_evas ], :int ],
         # EAPI void ecore_evas_layer_set(Ecore_Evas *ee, int layer);
-        [ :ecore_evas_layer_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_layer_set, [ :ecore_evas, :int ], :void ],
         # EAPI int ecore_evas_layer_get(const Ecore_Evas *ee);
-        [ :ecore_evas_layer_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_layer_get, [ :ecore_evas ], :int ],
         # EAPI void ecore_evas_maximized_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_maximized_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_maximized_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_maximized_get(const Ecore_Evas *ee);
-        [ :ecore_evas_maximized_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_maximized_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_move(Ecore_Evas *ee, int x, int y);
-        [ :ecore_evas_move, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_move, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_resize(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_resize, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_resize, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_move_resize, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_move_resize, [ :ecore_evas, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_rotation_set(Ecore_Evas *ee, int rot);
-        [ :ecore_evas_rotation_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_rotation_set, [ :ecore_evas, :int ], :void ],
         # EAPI void ecore_evas_rotation_with_resize_set(Ecore_Evas *ee, int rot);
-        [ :ecore_evas_rotation_with_resize_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_rotation_with_resize_set, [ :ecore_evas, :int ], :void ],
         # EAPI int ecore_evas_rotation_get(const Ecore_Evas *ee);
-        [ :ecore_evas_rotation_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_rotation_get, [ :ecore_evas ], :int ],
         # EAPI void ecore_evas_raise(Ecore_Evas *ee);
-        [ :ecore_evas_raise, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_raise, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_lower(Ecore_Evas *ee);
-        [ :ecore_evas_lower, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_lower, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_title_set(Ecore_Evas *ee, const char *t);
-        [ :ecore_evas_title_set, [ :ecore_evas_p, :string ], :void ],
+        [ :ecore_evas_title_set, [ :ecore_evas, :string ], :void ],
         # EAPI const char *ecore_evas_title_get(const Ecore_Evas *ee);
-        [ :ecore_evas_title_get, [ :ecore_evas_p ], :string ],
+        [ :ecore_evas_title_get, [ :ecore_evas ], :string ],
         # EAPI void ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c);
-        [ :ecore_evas_name_class_set, [ :ecore_evas_p, :string, :string ], :void ],
+        [ :ecore_evas_name_class_set, [ :ecore_evas, :string, :string ], :void ],
         # EAPI void ecore_evas_name_class_get(const Ecore_Evas *ee, const char **n, const char **c);
-        [ :ecore_evas_name_class_get, [ :ecore_evas_p, :string_array, :string_array ], :void ],
+        [ :ecore_evas_name_class_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI Ecore_Window ecore_evas_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_window_get, [ :ecore_evas_p ], :uintptr_t ],
+        [ :ecore_evas_window_get, [ :ecore_evas ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_window_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_direct_resize_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_direct_resize_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_gl_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h, const int *opt);
-        [ :ecore_evas_gl_x11_options_new, [ :string, :uint, :int, :int, :int, :int, :int_p ], :ecore_evas_p ],
+        [ :ecore_evas_gl_x11_options_new, [ :string, :uint, :int, :int, :int, :int, :pointer ], :ecore_evas ],
         # EAPI Ecore_X_Window ecore_evas_gl_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_gl_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_gl_x11_window_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_gl_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_gl_x11_direct_resize_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_gl_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_gl_x11_direct_resize_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_gl_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_gl_x11_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
         # FIXME
         # EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_xrender_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_xrender_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_xrender_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_xrender_x11_window_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_xrender_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_xrender_x11_direct_resize_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_xrender_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_xrender_x11_direct_resize_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_xrender_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_xrender_x11_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_8_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_8_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_8_window_get, [ :ecore_evas ], :uint ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_subwindow_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_8_subwindow_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_8_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_8_direct_resize_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_8_direct_resize_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_8_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_8_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_16_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_16_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_16_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_16_window_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_16_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_16_direct_resize_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_16_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_16_direct_resize_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_16_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_16_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
-        [ :ecore_evas_fb_new, [ :string, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_fb_new, [ :string, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w, int h);
-        [ :ecore_evas_directfb_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_directfb_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_directfb_window_get, [ :ecore_evas_p ], :ecore_directfb_window_p ],
+        [ :ecore_evas_directfb_window_get, [ :ecore_evas ], :ecore_directfb_window ],
+        # EAPI Ecore_Evas *ecore_evas_wayland_shm_new(const char *disp_name, int x, int y, int w, int h, int frame);
+        [ :ecore_evas_wayland_shm_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_wayland_egl_new(const char *disp_name, int x, int y, int w, int h, int frame);
+        [ :ecore_evas_wayland_egl_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI void ecore_evas_wayland_resize(Ecore_Evas *ee, int location);
+        [ :ecore_evas_wayland_resize, [ :ecore_evas, :int ], :void ],
+        # EAPI void ecore_evas_wayland_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source);
+        [ :ecore_evas_wayland_drag_start, [ :ecore_evas, :ecore_evas, :pointer ], :void ],
+        # EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y);
+        [ :ecore_evas_wayland_pointer_set, [ :ecore_evas, :int, :int ], :void ],
         # EAPI Ecore_Evas *ecore_evas_buffer_new(int w, int h);
-        [ :ecore_evas_buffer_new, [ :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_buffer_new, [ :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, int size), void (*free_func) (void *data, void *pix), const void *data);
         # FIXME
         # EAPI const void *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
-        [ :ecore_evas_buffer_pixels_get, [ :ecore_evas_p ], :void_p ],
+        [ :ecore_evas_buffer_pixels_get, [ :ecore_evas ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_ews_new(int x, int y, int w, int h);
-        [ :ecore_evas_ews_new, [ :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_ews_new, [ :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Evas_Object *ecore_evas_ews_backing_store_get(const Ecore_Evas *ee);
-        [ :ecore_evas_ews_backing_store_get, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_ews_backing_store_get, [ :ecore_evas ], :evas_object ],
         # EAPI void ecore_evas_ews_delete_request(Ecore_Evas *ee);
-        [ :ecore_evas_ews_delete_request, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_ews_delete_request, [ :ecore_evas ], :void ],
         # EAPI Evas_Object *ecore_evas_object_image_new(Ecore_Evas *ee_target);
-        [ :ecore_evas_object_image_new, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_object_image_new, [ :ecore_evas ], :evas_object ],
         # EAPI Ecore_Evas *ecore_evas_object_ecore_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_ecore_evas_get, [ :evas_object_p ], :ecore_evas_p ],
+        [ :ecore_evas_object_ecore_evas_get, [ :evas_object ], :ecore_evas ],
         # EAPI Evas *ecore_evas_object_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_evas_get, [ :evas_object_p ], :evas_p ],
+        [ :ecore_evas_object_evas_get, [ :evas_object ], :evas ],
         # EAPI Ecore_Evas *ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_gdi_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_gdi_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_ddraw_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_ddraw_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_16_ddraw_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_16_ddraw_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_direct3d_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_direct3d_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_direct3d_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_gl_glew_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_glew_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_win32_window_get, [ :ecore_evas_p ], :ecore_win32_window_p ],
+        [ :ecore_evas_win32_window_get, [ :ecore_evas ], :ecore_win32_window ],
         # EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
-        [ :ecore_evas_sdl_new, [ :string, :int, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_sdl_new, [ :pointer, :int, :int, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
-        [ :ecore_evas_sdl16_new, [ :string, :int, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_sdl16_new, [ :pointer, :int, :int, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_gl_sdl_new(const char* name, int w, int h, int fullscreen, int noframe);
-        [ :ecore_evas_gl_sdl_new, [ :string, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_sdl_new, [ :pointer, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_fb_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_fb_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_gapi_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_gapi_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_ddraw_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_ddraw_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_gdi_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_gdi_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_wince_window_get, [ :ecore_evas_p ], :ecore_wince_window_p ],
+        [ :ecore_evas_software_wince_window_get, [ :ecore_evas ], :ecore_wince_window ],
+        # EAPI Ecore_Evas *ecore_evas_cocoa_new(Ecore_Cocoa_Window *parent, 				 int x, 				 int y, 				 int w, 				 int h);
+        # FIXME
+        # EAPI Ecore_Evas *ecore_evas_psl1ght_new(const char* name, int w, int h);
+        [ :ecore_evas_psl1ght_new, [ :pointer, :int, :int ], :ecore_evas ],
         # EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
-        [ :ecore_evas_engine_name_get, [ :ecore_evas_p ], :string ],
+        [ :ecore_evas_engine_name_get, [ :ecore_evas ], :string ],
         # EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
-        [ :ecore_evas_ecore_evas_get, [ :evas_p ], :ecore_evas_p ],
+        [ :ecore_evas_ecore_evas_get, [ :evas ], :ecore_evas ],
         # EAPI void ecore_evas_free(Ecore_Evas *ee);
-        [ :ecore_evas_free, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_free, [ :ecore_evas ], :void ],
         # EAPI void *ecore_evas_data_get(const Ecore_Evas *ee, const char *key);
-        [ :ecore_evas_data_get, [ :ecore_evas_p, :string ], :void_p ],
+        [ :ecore_evas_data_get, [ :ecore_evas, :string ], :pointer ],
         # EAPI void ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data);
-        [ :ecore_evas_data_set, [ :ecore_evas_p, :string, :void_p ], :void ],
-        # EAPI void ecore_evas_callback_resize_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_resize_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_move_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_move_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_show_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_show_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_hide_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_hide_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_delete_request_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_delete_request_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_destroy_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_destroy_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_focus_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_focus_in_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_focus_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_focus_out_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_sticky_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_sticky_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_unsticky_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_unsticky_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_mouse_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_mouse_in_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_mouse_out_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_pre_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_pre_render_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_post_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_post_render_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
-        # EAPI void ecore_evas_callback_pre_free_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_pre_free_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_data_set, [ :ecore_evas, :string, :pointer ], :void ],
+        # EAPI void ecore_evas_callback_resize_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_resize_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_move_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_move_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_show_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_show_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_hide_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_hide_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_delete_request_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_delete_request_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_destroy_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_destroy_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_focus_in_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_focus_in_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_focus_out_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_focus_out_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_sticky_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_sticky_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_unsticky_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_unsticky_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_mouse_in_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_mouse_in_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_mouse_out_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_pre_render_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_pre_render_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_post_render_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_post_render_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
+        # EAPI void ecore_evas_callback_pre_free_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
+        [ :ecore_evas_callback_pre_free_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
         # EAPI Evas *ecore_evas_get(const Ecore_Evas *ee);
-        [ :ecore_evas_get, [ :ecore_evas_p ], :evas_p ],
+        [ :ecore_evas_get, [ :ecore_evas ], :evas ],
         # EAPI void ecore_evas_managed_move(Ecore_Evas *ee, int x, int y);
-        [ :ecore_evas_managed_move, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_managed_move, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_shaped_set(Ecore_Evas *ee, Eina_Bool shaped);
-        [ :ecore_evas_shaped_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_shaped_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_shaped_get(const Ecore_Evas *ee);
-        [ :ecore_evas_shaped_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_shaped_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_show(Ecore_Evas *ee);
-        [ :ecore_evas_show, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_show, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_hide(Ecore_Evas *ee);
-        [ :ecore_evas_hide, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_hide, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_activate(Ecore_Evas *ee);
-        [ :ecore_evas_activate, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_activate, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_min_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_min_set, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_min_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_min_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_max_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_max_set, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_max_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_max_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_base_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_base_set, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_base_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_base_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_step_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_step_set, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_step_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_step_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int hot_y);
-        [ :ecore_evas_cursor_set, [ :ecore_evas_p, :string, :int, :int, :int ], :void ],
+        [ :ecore_evas_cursor_set, [ :ecore_evas, :string, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y);
-        [ :ecore_evas_cursor_get, [ :ecore_evas_p, :evas_object_pp, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_cursor_get, [ :ecore_evas, :evas_object, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
-        [ :ecore_evas_object_cursor_set, [ :ecore_evas_p, :evas_object_p, :int, :int, :int ], :void ],
+        [ :ecore_evas_object_cursor_set, [ :ecore_evas, :evas_object, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_override_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_override_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_override_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_override_get(const Ecore_Evas *ee);
-        [ :ecore_evas_override_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_override_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on);
-        [ :ecore_evas_avoid_damage_set, [ :ecore_evas_p, :ecore_evas_avoid_damage_type ], :void ],
+        [ :ecore_evas_avoid_damage_set, [ :ecore_evas, :ecore_evas_avoid_damage_type ], :void ],
         # EAPI Ecore_Evas_Avoid_Damage_Type ecore_evas_avoid_damage_get(const Ecore_Evas *ee);
-        [ :ecore_evas_avoid_damage_get, [ :ecore_evas_p ], :ecore_evas_avoid_damage_type ],
+        [ :ecore_evas_avoid_damage_get, [ :ecore_evas ], :ecore_evas_avoid_damage_type ],
         # EAPI void ecore_evas_withdrawn_set(Ecore_Evas *ee, Eina_Bool withdrawn);
-        [ :ecore_evas_withdrawn_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_withdrawn_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_withdrawn_get(const Ecore_Evas *ee);
-        [ :ecore_evas_withdrawn_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_withdrawn_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky);
-        [ :ecore_evas_sticky_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_sticky_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_sticky_get(const Ecore_Evas *ee);
-        [ :ecore_evas_sticky_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_sticky_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_manual_render_set(Ecore_Evas *ee, Eina_Bool manual_render);
-        [ :ecore_evas_manual_render_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_manual_render_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_manual_render_get(const Ecore_Evas *ee);
-        [ :ecore_evas_manual_render_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_manual_render_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_input_event_register(Ecore_Evas *ee);
-        [ :ecore_evas_input_event_register, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_input_event_register, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_input_event_unregister(Ecore_Evas *ee);
-        [ :ecore_evas_input_event_unregister, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_input_event_unregister, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_manual_render(Ecore_Evas *ee);
-        [ :ecore_evas_manual_render, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_manual_render, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_comp_sync_set(Ecore_Evas *ee, Eina_Bool do_sync);
-        [ :ecore_evas_comp_sync_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_comp_sync_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_comp_sync_get(const Ecore_Evas *ee);
-        [ :ecore_evas_comp_sync_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_comp_sync_get, [ :ecore_evas ], :bool ],
         # EAPI void ecore_evas_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_screen_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_screen_geometry_get, [ :ecore_evas, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void ecore_evas_draw_frame_set(Ecore_Evas *ee, Eina_Bool draw_frame);
+        [ :ecore_evas_draw_frame_set, [ :ecore_evas, :bool ], :void ],
+        # EAPI Eina_Bool ecore_evas_draw_frame_get(const Ecore_Evas *ee);
+        [ :ecore_evas_draw_frame_get, [ :ecore_evas ], :bool ],
         # EAPI Eina_Bool ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags);
-        [ :ecore_evas_object_associate, [ :ecore_evas_p, :evas_object_p, :ecore_evas_object_associate_flags ], :eina_bool ],
+        [ :ecore_evas_object_associate, [ :ecore_evas, :evas_object, :ecore_evas_object_associate_flags ], :bool ],
         # EAPI Eina_Bool ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj);
-        [ :ecore_evas_object_dissociate, [ :ecore_evas_p, :evas_object_p ], :eina_bool ],
+        [ :ecore_evas_object_dissociate, [ :ecore_evas, :evas_object ], :bool ],
         # EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
-        [ :ecore_evas_object_associate_get, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_object_associate_get, [ :ecore_evas ], :evas_object ],
         # EAPI unsigned char ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
-        [ :ecore_getopt_callback_ecore_evas_list_engines, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
+        [ :ecore_getopt_callback_ecore_evas_list_engines, [ :ecore_getopt, :ecore_getopt_desc, :string, :pointer, :ecore_getopt_value ], :uchar ],
         # EAPI Eina_List *ecore_evas_ecore_evas_list_get(void);
-        [ :ecore_evas_ecore_evas_list_get, [  ], :eina_list_p ],
+        [ :ecore_evas_ecore_evas_list_get, [  ], :eina_list ],
         # EAPI void ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_x11_leader_set, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_x11_leader_set, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_X_Window ecore_evas_x11_leader_get(Ecore_Evas *ee);
-        [ :ecore_evas_x11_leader_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_x11_leader_get, [ :ecore_evas ], :uint ],
         # EAPI void ecore_evas_x11_leader_default_set(Ecore_Evas *ee);
-        [ :ecore_evas_x11_leader_default_set, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_leader_default_set, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_set(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_set, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_set, [ :ecore_evas, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_add(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_add, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_add, [ :ecore_evas, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_subtract(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_subtract, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_subtract, [ :ecore_evas, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_empty(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_empty, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_empty, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_x11_shape_input_reset(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_reset, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_reset, [ :ecore_evas ], :void ],
         # EAPI void ecore_evas_x11_shape_input_apply(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_apply, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_apply, [ :ecore_evas ], :void ],
         # EAPI Eina_Bool ecore_evas_ews_engine_set(const char *engine, const char *options);
-        [ :ecore_evas_ews_engine_set, [ :string, :string ], :eina_bool ],
+        [ :ecore_evas_ews_engine_set, [ :string, :string ], :bool ],
         # EAPI Eina_Bool ecore_evas_ews_setup(int x, int y, int w, int h);
-        [ :ecore_evas_ews_setup, [ :int, :int, :int, :int ], :eina_bool ],
+        [ :ecore_evas_ews_setup, [ :int, :int, :int, :int ], :bool ],
         # EAPI Ecore_Evas *ecore_evas_ews_ecore_evas_get(void);
-        [ :ecore_evas_ews_ecore_evas_get, [  ], :ecore_evas_p ],
+        [ :ecore_evas_ews_ecore_evas_get, [  ], :ecore_evas ],
         # EAPI Evas *ecore_evas_ews_evas_get(void);
-        [ :ecore_evas_ews_evas_get, [  ], :evas_p ],
+        [ :ecore_evas_ews_evas_get, [  ], :evas ],
         # EAPI Evas_Object *ecore_evas_ews_background_get(void);
-        [ :ecore_evas_ews_background_get, [  ], :evas_object_p ],
+        [ :ecore_evas_ews_background_get, [  ], :evas_object ],
         # EAPI void ecore_evas_ews_background_set(Evas_Object *o);
-        [ :ecore_evas_ews_background_set, [ :evas_object_p ], :void ],
+        [ :ecore_evas_ews_background_set, [ :evas_object ], :void ],
         # EAPI const Eina_List *ecore_evas_ews_children_get(void);
-        [ :ecore_evas_ews_children_get, [  ], :eina_list_p ],
+        [ :ecore_evas_ews_children_get, [  ], :eina_list ],
         # EAPI void ecore_evas_ews_manager_set(const void *manager);
-        [ :ecore_evas_ews_manager_set, [ :void_p ], :void ],
+        [ :ecore_evas_ews_manager_set, [ :pointer ], :void ],
         # EAPI const void *ecore_evas_ews_manager_get(void);
-        [ :ecore_evas_ews_manager_get, [  ], :void_p ],
-        # EAPI Evas_Object *ecore_evas_extn_socket_new(Ecore_Evas *ee_target, const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :ecore_evas_extn_socket_new, [ :ecore_evas_p, :string, :int, :eina_bool ], :evas_object_p ],
-        # EAPI void ecore_evas_extn_socket_object_data_lock(Evas_Object *obj);
-        [ :ecore_evas_extn_socket_object_data_lock, [ :evas_object_p ], :void ],
-        # EAPI void ecore_evas_extn_socket_object_data_unlock(Evas_Object *obj);
-        [ :ecore_evas_extn_socket_object_data_unlock, [ :evas_object_p ], :void ],
-        # EAPI Ecore_Evas *ecore_evas_extn_plug_new(const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :ecore_evas_extn_plug_new, [ :string, :int, :eina_bool ], :ecore_evas_p ],
+        [ :ecore_evas_ews_manager_get, [  ], :pointer ],
+        # EAPI Ecore_Evas *ecore_evas_extn_socket_new(int w, int h);
+        [ :ecore_evas_extn_socket_new, [ :int, :int ], :ecore_evas ],
+        # EAPI Eina_Bool ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :ecore_evas_extn_socket_listen, [ :ecore_evas, :string, :int, :bool ], :bool ],
+        # EAPI void ecore_evas_extn_plug_object_data_lock(Evas_Object *obj);
+        [ :ecore_evas_extn_plug_object_data_lock, [ :evas_object ], :void ],
+        # EAPI void ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj);
+        [ :ecore_evas_extn_plug_object_data_unlock, [ :evas_object ], :void ],
+        # EAPI Evas_Object *ecore_evas_extn_plug_new(Ecore_Evas *ee_target);
+        [ :ecore_evas_extn_plug_new, [ :ecore_evas ], :evas_object ],
+        # EAPI Eina_Bool ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :ecore_evas_extn_plug_connect, [ :evas_object, :string, :int, :bool ], :bool ],
         ]
-        if RUBY_PLATFORM =~ /darwin/
-            # EAPI Ecore_Evas *ecore_evas_cocoa_new(const char* name, int w, int h);
-            fcts << [ :ecore_evas_cocoa_new, [ :string, :int, :int ], :ecore_evas_p ]
-        end
         #
         attach_fcts fcts
         #
diff --git a/lib/efl/native/ecore_getopt.rb b/lib/efl/native/ecore_getopt.rb
index f84e15b..cb13303 100644
--- a/lib/efl/native/ecore_getopt.rb
+++ b/lib/efl/native/ecore_getopt.rb
@@ -1,18 +1,18 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/eina_list'
 #
 module Efl
     #
     module EcoreGetopt
         #
-        FCT_PREFIX = 'ecore_getopt_'
+        FCT_PREFIX = 'ecore_getopt_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -23,12 +23,12 @@ module Efl
         #
         # ENUMS
         # typedef enum {...} Ecore_Getopt_Action;
-        enum :ecore_getopt_action, [ :ecore_getopt_action_store, :ecore_getopt_action_store_const, :ecore_getopt_action_store_true, :ecore_getopt_action_store_false,
-            :ecore_getopt_action_choice, :ecore_getopt_action_append, :ecore_getopt_action_count, :ecore_getopt_action_callback, :ecore_getopt_action_help,
-            :ecore_getopt_action_version, :ecore_getopt_action_copyright, :ecore_getopt_action_license ]
+        enum :ecore_getopt_action, [ :ecore_getopt_action_store, :ecore_getopt_action_store_const, :ecore_getopt_action_store_true,
+            :ecore_getopt_action_store_false, :ecore_getopt_action_choice, :ecore_getopt_action_append, :ecore_getopt_action_count, :ecore_getopt_action_callback,
+            :ecore_getopt_action_help, :ecore_getopt_action_version, :ecore_getopt_action_copyright, :ecore_getopt_action_license ]
         # typedef enum {...} Ecore_Getopt_Type;
-        enum :ecore_getopt_type, [ :ecore_getopt_type_str, :ecore_getopt_type_bool, :ecore_getopt_type_short, :ecore_getopt_type_int, :ecore_getopt_type_long,
-            :ecore_getopt_type_ushort, :ecore_getopt_type_uint, :ecore_getopt_type_ulong, :ecore_getopt_type_double ]
+        enum :ecore_getopt_type, [ :ecore_getopt_type_str, :ecore_getopt_type_bool, :ecore_getopt_type_short, :ecore_getopt_type_int,
+            :ecore_getopt_type_long, :ecore_getopt_type_ushort, :ecore_getopt_type_uint, :ecore_getopt_type_ulong, :ecore_getopt_type_double ]
         # typedef enum {...} Ecore_Getopt_Desc_Arg_Requirement;
         enum :ecore_getopt_desc_arg_requirement, [ :ecore_getopt_desc_arg_requirement_no, 0, :ecore_getopt_desc_arg_requirement_yes, 1,
             :ecore_getopt_desc_arg_requirement_optional, 3 ]
@@ -36,36 +36,29 @@ module Efl
         # TYPEDEFS
         # typedef union _Ecore_Getopt_Value Ecore_Getopt_Value;
         typedef :pointer, :ecore_getopt_value
-        typedef :pointer, :ecore_getopt_value_p
         # typedef struct _Ecore_Getopt_Desc_Store Ecore_Getopt_Desc_Store;
         typedef :pointer, :ecore_getopt_desc_store
         # typedef struct _Ecore_Getopt_Desc_Callback Ecore_Getopt_Desc_Callback;
         typedef :pointer, :ecore_getopt_desc_callback
         # typedef struct _Ecore_Getopt_Desc Ecore_Getopt_Desc;
         typedef :pointer, :ecore_getopt_desc
-        typedef :pointer, :ecore_getopt_desc_p
         # typedef struct _Ecore_Getopt Ecore_Getopt;
         typedef :pointer, :ecore_getopt
-        typedef :pointer, :ecore_getopt_p
-        #
-        # CALLBACKS
-        #
-        # VARIABLES
         #
         # FUNCTIONS
         fcts = [
         # EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
-        [ :ecore_getopt_help, [ :pointer, :ecore_getopt_p ], :void ],
+        [ :ecore_getopt_help, [ :pointer, :ecore_getopt ], :void ],
         # EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser);
-        [ :ecore_getopt_parser_has_duplicates, [ :ecore_getopt_p ], :eina_bool ],
+        [ :ecore_getopt_parser_has_duplicates, [ :ecore_getopt ], :bool ],
         # EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv);
-        [ :ecore_getopt_parse, [ :ecore_getopt_p, :ecore_getopt_value_p, :int, :string_array ], :int ],
+        [ :ecore_getopt_parse, [ :ecore_getopt, :ecore_getopt_value, :int, :pointer ], :int ],
         # EAPI Eina_List *ecore_getopt_list_free(Eina_List *list);
-        [ :ecore_getopt_list_free, [ :eina_list_p ], :eina_list_p ],
+        [ :ecore_getopt_list_free, [ :eina_list ], :eina_list ],
         # EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
-        [ :ecore_getopt_callback_geometry_parse, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
+        [ :ecore_getopt_callback_geometry_parse, [ :ecore_getopt, :ecore_getopt_desc, :string, :pointer, :ecore_getopt_value ], :bool ],
         # EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
-        [ :ecore_getopt_callback_size_parse, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
+        [ :ecore_getopt_callback_size_parse, [ :ecore_getopt, :ecore_getopt_desc, :string, :pointer, :ecore_getopt_value ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/ecore_input.rb b/lib/efl/native/ecore_input.rb
index d1a81d0..ebb4289 100644
--- a/lib/efl/native/ecore_input.rb
+++ b/lib/efl/native/ecore_input.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EcoreInput
         #
-        FCT_PREFIX = 'ecore_event_'
+        FCT_PREFIX = 'ecore_event_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -31,7 +30,7 @@ module Efl
         #
         # TYPEDEFS
         # typedef uintptr_t Ecore_Window;
-        typedef :uintptr_t, :ecore_window
+        typedef :pointer, :ecore_window
         # typedef struct _Ecore_Event_Key Ecore_Event_Key;
         typedef :pointer, :ecore_event_key
         # typedef struct _Ecore_Event_Mouse_Button Ecore_Event_Mouse_Button;
@@ -44,9 +43,6 @@ module Efl
         typedef :pointer, :ecore_event_mouse_io
         # typedef struct _Ecore_Event_Modifiers Ecore_Event_Modifiers;
         typedef :pointer, :ecore_event_modifiers
-        typedef :pointer, :ecore_event_modifiers_p
-        #
-        # CALLBACKS
         #
         # VARIABLES
         # EAPI extern int ECORE_EVENT_KEY_DOWN;
@@ -75,7 +71,7 @@ module Efl
         # EAPI unsigned int ecore_event_modifier_mask(Ecore_Event_Modifier modifier);
         [ :ecore_event_modifier_mask, [ :ecore_event_modifier ], :uint ],
         # EAPI Ecore_Event_Modifier ecore_event_update_modifier(const char *key, Ecore_Event_Modifiers *modifiers, int inc);
-        [ :ecore_event_update_modifier, [ :string, :ecore_event_modifiers_p, :int ], :ecore_event_modifier ],
+        [ :ecore_event_update_modifier, [ :string, :ecore_event_modifiers, :int ], :ecore_event_modifier ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/edje.rb b/lib/efl/native/edje.rb
index f6b2563..a0edb14 100644
--- a/lib/efl/native/edje.rb
+++ b/lib/efl/native/edje.rb
@@ -1,18 +1,18 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/evas'
 #
 module Efl
     #
     module Edje
         #
-        FCT_PREFIX = 'edje_'
+        FCT_PREFIX = 'edje_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -23,45 +23,48 @@ module Efl
         #
         # ENUMS
         # typedef enum _Edje_Message_Type {...} Edje_Message_Type;
-        enum :edje_message_type, [ :edje_message_none, 0, :edje_message_signal, 1, :edje_message_string, 2, :edje_message_int, 3, :edje_message_float, 4,
-            :edje_message_string_set, 5, :edje_message_int_set, 6, :edje_message_float_set, 7, :edje_message_string_int, 8, :edje_message_string_float, 9,
+        enum :edje_message_type, [ :edje_message_none, 0, :edje_message_signal, 1, :edje_message_string, 2, :edje_message_int, 3, :edje_message_float,
+            4, :edje_message_string_set, 5, :edje_message_int_set, 6, :edje_message_float_set, 7, :edje_message_string_int, 8, :edje_message_string_float, 9,
             :edje_message_string_int_set, 10, :edje_message_string_float_set, 11 ]
         # typedef enum _Edje_Aspect_Control {...} Edje_Aspect_Control;
-        enum :edje_aspect_control, [ :edje_aspect_control_none, 0, :edje_aspect_control_neither, 1, :edje_aspect_control_horizontal, 2, :edje_aspect_control_vertical, 3,
-            :edje_aspect_control_both, 4 ]
+        enum :edje_aspect_control, [ :edje_aspect_control_none, 0, :edje_aspect_control_neither, 1, :edje_aspect_control_horizontal, 2,
+            :edje_aspect_control_vertical, 3, :edje_aspect_control_both, 4 ]
         # typedef enum _Edje_Object_Table_Homogeneous_Mode {...} Edje_Object_Table_Homogeneous_Mode;
-        enum :edje_object_table_homogeneous_mode, [ :edje_object_table_homogeneous_none, 0, :edje_object_table_homogeneous_table, 1, :edje_object_table_homogeneous_item,
-            2 ]
+        enum :edje_object_table_homogeneous_mode, [ :edje_object_table_homogeneous_none, 0, :edje_object_table_homogeneous_table, 1,
+            :edje_object_table_homogeneous_item, 2 ]
         # typedef enum _Edje_Part_Type {...} Edje_Part_Type;
-        enum :edje_part_type, [ :edje_part_type_none, 0, :edje_part_type_rectangle, 1, :edje_part_type_text, 2, :edje_part_type_image, 3, :edje_part_type_swallow, 4,
-            :edje_part_type_textblock, 5, :edje_part_type_gradient, 6, :edje_part_type_group, 7, :edje_part_type_box, 8, :edje_part_type_table, 9, :edje_part_type_external, 10,
-            :edje_part_type_proxy, 11, :edje_part_type_last, 12 ]
+        enum :edje_part_type, [ :edje_part_type_none, 0, :edje_part_type_rectangle, 1, :edje_part_type_text, 2, :edje_part_type_image, 3,
+            :edje_part_type_swallow, 4, :edje_part_type_textblock, 5, :edje_part_type_gradient, 6, :edje_part_type_group, 7, :edje_part_type_box, 8,
+            :edje_part_type_table, 9, :edje_part_type_external, 10, :edje_part_type_proxy, 11, :edje_part_type_last, 12 ]
         # typedef enum _Edje_Text_Effect {...} Edje_Text_Effect;
-        enum :edje_text_effect, [ :edje_text_effect_none, 0, :edje_text_effect_plain, 1, :edje_text_effect_outline, 2, :edje_text_effect_soft_outline, 3,
-            :edje_text_effect_shadow, 4, :edje_text_effect_soft_shadow, 5, :edje_text_effect_outline_shadow, 6, :edje_text_effect_outline_soft_shadow, 7,
+        enum :edje_text_effect, [ :edje_text_effect_none, 0, :edje_text_effect_plain, 1, :edje_text_effect_outline, 2, :edje_text_effect_soft_outline,
+            3, :edje_text_effect_shadow, 4, :edje_text_effect_soft_shadow, 5, :edje_text_effect_outline_shadow, 6, :edje_text_effect_outline_soft_shadow, 7,
             :edje_text_effect_far_shadow, 8, :edje_text_effect_far_soft_shadow, 9, :edje_text_effect_glow, 10, :edje_text_effect_last, 11,
-            :edje_text_effect_shadow_direction_bottom_right, :edje_text_effect_shadow_direction_bottom, :edje_text_effect_shadow_direction_bottom_left,
-            :edje_text_effect_shadow_direction_left, :edje_text_effect_shadow_direction_top_left, :edje_text_effect_shadow_direction_top,
-            :edje_text_effect_shadow_direction_top_right, :edje_text_effect_shadow_direction_right ]
+            :edje_text_effect_shadow_direction_bottom_right, (0x0<<4), :edje_text_effect_shadow_direction_bottom, (0x1<<4),
+            :edje_text_effect_shadow_direction_bottom_left, (0x2<<4), :edje_text_effect_shadow_direction_left, (0x3<<4),
+            :edje_text_effect_shadow_direction_top_left, (0x4<<4), :edje_text_effect_shadow_direction_top, (0x5<<4), :edje_text_effect_shadow_direction_top_right,
+            (0x6<<4), :edje_text_effect_shadow_direction_right, (0x7<<4) ]
         # typedef enum _Edje_Action_Type {...} Edje_Action_Type;
-        enum :edje_action_type, [ :edje_action_type_none, 0, :edje_action_type_state_set, 1, :edje_action_type_action_stop, 2, :edje_action_type_signal_emit, 3,
-            :edje_action_type_drag_val_set, 4, :edje_action_type_drag_val_step, 5, :edje_action_type_drag_val_page, 6, :edje_action_type_script, 7, :edje_action_type_focus_set, 8,
-            :edje_action_type_reserved00, 9, :edje_action_type_focus_object, 10, :edje_action_type_param_copy, 11, :edje_action_type_param_set, 12, :edje_action_type_sound_sample,
-            13, :edje_action_type_sound_tone, 14, :edje_action_type_last, 15 ]
+        enum :edje_action_type, [ :edje_action_type_none, 0, :edje_action_type_state_set, 1, :edje_action_type_action_stop, 2,
+            :edje_action_type_signal_emit, 3, :edje_action_type_drag_val_set, 4, :edje_action_type_drag_val_step, 5, :edje_action_type_drag_val_page, 6,
+            :edje_action_type_script, 7, :edje_action_type_focus_set, 8, :edje_action_type_reserved00, 9, :edje_action_type_focus_object, 10,
+            :edje_action_type_param_copy, 11, :edje_action_type_param_set, 12, :edje_action_type_sound_sample, 13, :edje_action_type_sound_tone, 14,
+            :edje_action_type_last, 15 ]
         # typedef enum _Edje_Tween_Mode {...} Edje_Tween_Mode;
         enum :edje_tween_mode, [ :edje_tween_mode_none, 0, :edje_tween_mode_linear, 1, :edje_tween_mode_sinusoidal, 2, :edje_tween_mode_accelerate, 3,
             :edje_tween_mode_decelerate, 4, :edje_tween_mode_accelerate_factor, 5, :edje_tween_mode_decelerate_factor, 6, :edje_tween_mode_sinusoidal_factor, 7,
-            :edje_tween_mode_divisor_interp, 8, :edje_tween_mode_bounce, 9, :edje_tween_mode_spring, 10, :edje_tween_mode_last, 11,
-            :edje_tween_mode_mask, 0xff, :edje_tween_mode_opt_from_current, 0x1<<31]
+            :edje_tween_mode_divisor_interp, 8, :edje_tween_mode_bounce, 9, :edje_tween_mode_spring, 10, :edje_tween_mode_last, 11, :edje_tween_mode_mask, 0xff,
+            :edje_tween_mode_opt_from_current, (1<<31) ]
         # typedef enum _Edje_Cursor {...} Edje_Cursor;
-        enum :edje_cursor, [ :edje_cursor_main, :edje_cursor_selection_begin, :edje_cursor_selection_end, :edje_cursor_preedit_start, :edje_cursor_preedit_end,
-            :edje_cursor_user, :edje_cursor_user_extra ]
+        enum :edje_cursor, [ :edje_cursor_main, :edje_cursor_selection_begin, :edje_cursor_selection_end, :edje_cursor_preedit_start,
+            :edje_cursor_preedit_end, :edje_cursor_user, :edje_cursor_user_extra ]
         # typedef enum _Edje_Drag_Dir {...} Edje_Drag_Dir;
         enum :edje_drag_dir, [ :edje_drag_dir_none, 0, :edje_drag_dir_x, 1, :edje_drag_dir_y, 2, :edje_drag_dir_xy, 3 ]
         # typedef enum _Edje_Load_Error {...} Edje_Load_Error;
-        enum :edje_load_error, [ :edje_load_error_none, 0, :edje_load_error_generic, 1, :edje_load_error_does_not_exist, 2, :edje_load_error_permission_denied, 3,
-            :edje_load_error_resource_allocation_failed, 4, :edje_load_error_corrupt_file, 5, :edje_load_error_unknown_format, 6, :edje_load_error_incompatible_file, 7,
-            :edje_load_error_unknown_collection, 8, :edje_load_error_recursive_reference, 9 ]
+        enum :edje_load_error, [ :edje_load_error_none, 0, :edje_load_error_generic, 1, :edje_load_error_does_not_exist, 2,
+            :edje_load_error_permission_denied, 3, :edje_load_error_resource_allocation_failed, 4, :edje_load_error_corrupt_file, 5,
+            :edje_load_error_unknown_format, 6, :edje_load_error_incompatible_file, 7, :edje_load_error_unknown_collection, 8,
+            :edje_load_error_recursive_reference, 9 ]
         # typedef enum _Edje_Text_Filter_Type {...} Edje_Text_Filter_Type;
         enum :edje_text_filter_type, [ :edje_text_filter_text, 0, :edje_text_filter_format, 1, :edje_text_filter_markup, 2 ]
         # typedef enum _Edje_Text_Autocapital_Type {...} Edje_Text_Autocapital_Type;
@@ -71,17 +74,24 @@ module Efl
         enum :edje_external_param_type, [ :edje_external_param_type_int, :edje_external_param_type_double, :edje_external_param_type_string,
             :edje_external_param_type_bool, :edje_external_param_type_choice, :edje_external_param_type_max ]
         # typedef enum _Edje_External_Param_Flags {...} Edje_External_Param_Flags;
-        enum :edje_external_param_flags, [ :edje_external_param_flags_none, 0, :edje_external_param_flags_get, :edje_external_param_flags_set,
-            :edje_external_param_flags_state, :edje_external_param_flags_constructor, :edje_external_param_flags_regular, :edje_external_param_flags_set,
-            :edje_external_param_flags_state ]
-        # typedef enum {...} Edje_Input_Panel_Layout;
-        enum :edje_input_panel_layout, [ :edje_input_panel_layout_normal, :edje_input_panel_layout_number, :edje_input_panel_layout_email, :edje_input_panel_layout_url,
-            :edje_input_panel_layout_phonenumber, :edje_input_panel_layout_ip, :edje_input_panel_layout_month, :edje_input_panel_layout_numberonly, :edje_input_panel_layout_invalid ]
+        enum :edje_external_param_flags, [ :edje_external_param_flags_none, 0, :edje_external_param_flags_get, (1<<0), :edje_external_param_flags_set,
+            (1<<1), :edje_external_param_flags_state, (1<<2), :edje_external_param_flags_constructor, (1<<3), :edje_external_param_flags_regular,
+            (1<<0)|(1<<1)|(1<<2) ]
+        # typedef enum _Edje_Input_Panel_Layout {...} Edje_Input_Panel_Layout;
+        enum :edje_input_panel_layout, [ :edje_input_panel_layout_normal, :edje_input_panel_layout_number, :edje_input_panel_layout_email,
+            :edje_input_panel_layout_url, :edje_input_panel_layout_phonenumber, :edje_input_panel_layout_ip, :edje_input_panel_layout_month,
+            :edje_input_panel_layout_numberonly, :edje_input_panel_layout_invalid, :edje_input_panel_layout_hex, :edje_input_panel_layout_terminal,
+            :edje_input_panel_layout_password ]
+        # typedef enum _Edje_Input_Panel_Lang {...} Edje_Input_Panel_Lang;
+        enum :edje_input_panel_lang, [ :edje_input_panel_lang_automatic, :edje_input_panel_lang_alphabet ]
+        # typedef enum _Edje_Input_Panel_Return_Key_Type {...} Edje_Input_Panel_Return_Key_Type;
+        enum :edje_input_panel_return_key_type, [ :edje_input_panel_return_key_type_default, :edje_input_panel_return_key_type_done,
+            :edje_input_panel_return_key_type_go, :edje_input_panel_return_key_type_join, :edje_input_panel_return_key_type_login,
+            :edje_input_panel_return_key_type_next, :edje_input_panel_return_key_type_search, :edje_input_panel_return_key_type_send ]
         #
         # TYPEDEFS
         # typedef struct _Edje_Version Edje_Version;
         typedef :pointer, :edje_version
-        typedef :pointer, :edje_version_p
         # typedef struct _Edje_Entry_Change_Info Edje_Entry_Change_Info;
         typedef :pointer, :edje_entry_change_info
         # typedef struct _Edje_Message_String Edje_Message_String;
@@ -106,35 +116,32 @@ module Efl
         typedef :pointer, :edje_message_string_float_set
         # typedef struct _Edje_External_Param Edje_External_Param;
         typedef :pointer, :edje_external_param
-        typedef :pointer, :edje_external_param_p
         # typedef struct _Edje_External_Param_Info Edje_External_Param_Info;
         typedef :pointer, :edje_external_param_info
-        typedef :pointer, :edje_external_param_info_p
         # typedef struct _Edje_External_Type Edje_External_Type;
         typedef :pointer, :edje_external_type
-        typedef :pointer, :edje_external_type_p
         # typedef struct _Edje_External_Type_Info Edje_External_Type_Info;
         typedef :pointer, :edje_external_type_info
-        typedef :pointer, :edje_external_type_info_p
         # typedef struct _Edje_Perspective Edje_Perspective;
         typedef :pointer, :edje_perspective
-        typedef :pointer, :edje_perspective_p
         #
         # CALLBACKS
         # typedef void (*Edje_Signal_Cb) (void *data, Evas_Object *obj, const char *emission, const char *source);
-        callback :edje_signal_cb, [ :void_p, :evas_object_p, :string, :string ], :void
+        callback :edje_signal_cb, [ :pointer, :evas_object, :string, :string ], :void
         # typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :edje_text_change_cb, [ :void_p, :evas_object_p, :string ], :void
+        callback :edje_text_change_cb, [ :pointer, :evas_object, :string ], :void
         # typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg);
-        callback :edje_message_handler_cb, [ :void_p, :evas_object_p, :edje_message_type, :int, :void_p ], :void
+        callback :edje_message_handler_cb, [ :pointer, :evas_object, :edje_message_type, :int, :pointer ], :void
         # typedef void (*Edje_Text_Filter_Cb) (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text);
-        callback :edje_text_filter_cb, [ :void_p, :evas_object_p, :string, :edje_text_filter_type, :string_array ], :void
+        callback :edje_text_filter_cb, [ :pointer, :evas_object, :string, :edje_text_filter_type, :pointer ], :void
+        # typedef void (*Edje_Markup_Filter_Cb) (void *data, Evas_Object *obj, const char *part, char **text);
+        callback :edje_markup_filter_cb, [ :pointer, :evas_object, :string, :pointer ], :void
         # typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, const char *part, const char *item);
-        callback :edje_item_provider_cb, [ :void_p, :evas_object_p, :string, :string ], :evas_object_p
+        callback :edje_item_provider_cb, [ :pointer, :evas_object, :string, :string ], :evas_object
         #
         # VARIABLES
         # EAPI extern Edje_Version *edje_version;
-        attach_variable :edje_version, :edje_version_p
+        attach_variable :edje_version, :edje_version
         #
         # FUNCTIONS
         fcts = [
@@ -161,23 +168,23 @@ module Efl
         # EAPI double edje_scale_get (void);
         [ :edje_scale_get, [  ], :double ],
         # EAPI void edje_password_show_last_set(Eina_Bool password_show_last);
-        [ :edje_password_show_last_set, [ :eina_bool ], :void ],
+        [ :edje_password_show_last_set, [ :bool ], :void ],
         # EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout);
         [ :edje_password_show_last_timeout_set, [ :double ], :void ],
         # EAPI Eina_Bool edje_object_scale_set (Evas_Object *obj, double scale);
-        [ :edje_object_scale_set, [ :evas_object_p, :double ], :eina_bool ],
+        [ :edje_object_scale_set, [ :evas_object, :double ], :bool ],
         # EAPI double edje_object_scale_get (const Evas_Object *obj);
-        [ :edje_object_scale_get, [ :evas_object_p ], :double ],
+        [ :edje_object_scale_get, [ :evas_object ], :double ],
         # EAPI void edje_object_mirrored_set (Evas_Object *obj, Eina_Bool rtl);
-        [ :edje_object_mirrored_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :edje_object_mirrored_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool edje_object_mirrored_get (const Evas_Object *obj);
-        [ :edje_object_mirrored_get, [ :evas_object_p ], :eina_bool ],
+        [ :edje_object_mirrored_get, [ :evas_object ], :bool ],
         # EAPI Eina_List *edje_file_collection_list (const char *file);
-        [ :edje_file_collection_list, [ :string ], :eina_list_p ],
+        [ :edje_file_collection_list, [ :string ], :eina_list ],
         # EAPI void edje_file_collection_list_free (Eina_List *lst);
-        [ :edje_file_collection_list_free, [ :eina_list_p ], :void ],
+        [ :edje_file_collection_list_free, [ :eina_list ], :void ],
         # EAPI Eina_Bool edje_file_group_exists (const char *file, const char *glob);
-        [ :edje_file_group_exists, [ :string, :string ], :eina_bool ],
+        [ :edje_file_group_exists, [ :string, :string ], :bool ],
         # EAPI char *edje_file_data_get (const char *file, const char *key);
         [ :edje_file_data_get, [ :string, :string ], :string ],
         # EAPI void edje_file_cache_set (int count);
@@ -193,298 +200,337 @@ module Efl
         # EAPI void edje_collection_cache_flush (void);
         [ :edje_collection_cache_flush, [  ], :void ],
         # EAPI Eina_Bool edje_color_class_set (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
-        [ :edje_color_class_set, [ :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :eina_bool ],
+        [ :edje_color_class_set, [ :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :bool ],
         # EAPI Eina_Bool edje_color_class_get (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
-        [ :edje_color_class_get, [ :string, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :edje_color_class_get, [ :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer,
+            :pointer, :pointer ], :bool ],
         # EAPI void edje_color_class_del (const char *color_class);
         [ :edje_color_class_del, [ :string ], :void ],
         # EAPI Eina_List *edje_color_class_list (void);
-        [ :edje_color_class_list, [  ], :eina_list_p ],
+        [ :edje_color_class_list, [  ], :eina_list ],
         # EAPI Eina_Bool edje_text_class_set (const char *text_class, const char *font, Evas_Font_Size size);
-        [ :edje_text_class_set, [ :string, :string, :int ], :eina_bool ],
+        [ :edje_text_class_set, [ :string, :string, :int ], :bool ],
         # EAPI void edje_text_class_del (const char *text_class);
         [ :edje_text_class_del, [ :string ], :void ],
         # EAPI Eina_List *edje_text_class_list (void);
-        [ :edje_text_class_list, [  ], :eina_list_p ],
+        [ :edje_text_class_list, [  ], :eina_list ],
         # EAPI void edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
-        [ :edje_extern_object_min_size_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :edje_extern_object_min_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh);
-        [ :edje_extern_object_max_size_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :edje_extern_object_max_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah);
-        [ :edje_extern_object_aspect_set, [ :evas_object_p, :edje_aspect_control, :int, :int ], :void ],
+        [ :edje_extern_object_aspect_set, [ :evas_object, :edje_aspect_control, :int, :int ], :void ],
         # EAPI void edje_box_layout_register (const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data);
         # FIXME
         # EAPI Evas_Object *edje_object_add (Evas *evas);
-        [ :edje_object_add, [ :evas_p ], :evas_object_p ],
+        [ :edje_object_add, [ :evas ], :evas_object ],
         # EAPI const char *edje_object_data_get (const Evas_Object *obj, const char *key);
-        [ :edje_object_data_get, [ :evas_object_p, :string ], :string ],
+        [ :edje_object_data_get, [ :evas_object, :string ], :string ],
         # EAPI Eina_Bool edje_object_file_set (Evas_Object *obj, const char *file, const char *group);
-        [ :edje_object_file_set, [ :evas_object_p, :string, :string ], :eina_bool ],
+        [ :edje_object_file_set, [ :evas_object, :string, :string ], :bool ],
         # EAPI void edje_object_file_get (const Evas_Object *obj, const char **file, const char **group);
-        [ :edje_object_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
+        [ :edje_object_file_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Edje_Load_Error edje_object_load_error_get (const Evas_Object *obj);
-        [ :edje_object_load_error_get, [ :evas_object_p ], :edje_load_error ],
+        [ :edje_object_load_error_get, [ :evas_object ], :edje_load_error ],
         # EAPI const char *edje_load_error_str (Edje_Load_Error error);
         [ :edje_load_error_str, [ :edje_load_error ], :string ],
         # EAPI Eina_Bool edje_object_preload (Evas_Object *obj, Eina_Bool cancel);
-        [ :edje_object_preload, [ :evas_object_p, :eina_bool ], :eina_bool ],
+        [ :edje_object_preload, [ :evas_object, :bool ], :bool ],
         # EAPI void edje_object_signal_callback_add (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :edje_object_signal_callback_add, [ :evas_object_p, :string, :string, :edje_signal_cb, :void_p ], :void ],
+        [ :edje_object_signal_callback_add, [ :evas_object, :string, :string, :edje_signal_cb, :pointer ], :void ],
         # EAPI void *edje_object_signal_callback_del (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
-        [ :edje_object_signal_callback_del, [ :evas_object_p, :string, :string, :edje_signal_cb ], :void_p ],
+        [ :edje_object_signal_callback_del, [ :evas_object, :string, :string, :edje_signal_cb ], :pointer ],
         # EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :edje_object_signal_callback_del_full, [ :evas_object_p, :string, :string, :edje_signal_cb, :void_p ], :void_p ],
+        [ :edje_object_signal_callback_del_full, [ :evas_object, :string, :string, :edje_signal_cb, :pointer ], :pointer ],
         # EAPI void edje_object_signal_emit (Evas_Object *obj, const char *emission, const char *source);
-        [ :edje_object_signal_emit, [ :evas_object_p, :string, :string ], :void ],
+        [ :edje_object_signal_emit, [ :evas_object, :string, :string ], :void ],
         # EAPI void * edje_object_signal_callback_extra_data_get(void);
-        [ :edje_object_signal_callback_extra_data_get, [  ], :void_p ],
+        [ :edje_object_signal_callback_extra_data_get, [  ], :pointer ],
         # EAPI void edje_object_play_set (Evas_Object *obj, Eina_Bool play);
-        [ :edje_object_play_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :edje_object_play_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool edje_object_play_get (const Evas_Object *obj);
-        [ :edje_object_play_get, [ :evas_object_p ], :eina_bool ],
+        [ :edje_object_play_get, [ :evas_object ], :bool ],
         # EAPI void edje_object_animation_set (Evas_Object *obj, Eina_Bool on);
-        [ :edje_object_animation_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :edje_object_animation_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool edje_object_animation_get (const Evas_Object *obj);
-        [ :edje_object_animation_get, [ :evas_object_p ], :eina_bool ],
+        [ :edje_object_animation_get, [ :evas_object ], :bool ],
         # EAPI int edje_object_freeze (Evas_Object *obj);
-        [ :edje_object_freeze, [ :evas_object_p ], :int ],
+        [ :edje_object_freeze, [ :evas_object ], :int ],
         # EAPI int edje_object_thaw (Evas_Object *obj);
-        [ :edje_object_thaw, [ :evas_object_p ], :int ],
+        [ :edje_object_thaw, [ :evas_object ], :int ],
         # EAPI Eina_Bool edje_object_color_class_set (Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
-        [ :edje_object_color_class_set, [ :evas_object_p, :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :eina_bool ],
+        [ :edje_object_color_class_set, [ :evas_object, :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :bool ],
         # EAPI Eina_Bool edje_object_color_class_get (const Evas_Object *o, const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
-        [ :edje_object_color_class_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p ],
-            :eina_bool ],
+        [ :edje_object_color_class_get, [ :evas_object, :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer,
+            :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void edje_object_color_class_del (Evas_Object *obj, const char *color_class);
-        [ :edje_object_color_class_del, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_color_class_del, [ :evas_object, :string ], :void ],
         # EAPI Eina_Bool edje_object_text_class_set (Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size);
-        [ :edje_object_text_class_set, [ :evas_object_p, :string, :string, :int ], :eina_bool ],
+        [ :edje_object_text_class_set, [ :evas_object, :string, :string, :int ], :bool ],
         # EAPI void edje_object_size_min_get (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-        [ :edje_object_size_min_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :edje_object_size_min_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void edje_object_size_max_get (const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
-        [ :edje_object_size_max_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :edje_object_size_max_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void edje_object_calc_force (Evas_Object *obj);
-        [ :edje_object_calc_force, [ :evas_object_p ], :void ],
+        [ :edje_object_calc_force, [ :evas_object ], :void ],
         # EAPI void edje_object_size_min_calc (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-        [ :edje_object_size_min_calc, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :edje_object_size_min_calc, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Eina_Bool edje_object_parts_extends_calc (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_parts_extends_calc, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :edje_object_parts_extends_calc, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh);
-        [ :edje_object_size_min_restricted_calc, [ :evas_object_p, :int_p, :int_p, :int, :int ], :void ],
+        [ :edje_object_size_min_restricted_calc, [ :evas_object, :pointer, :pointer, :int, :int ], :void ],
         # EAPI Eina_Bool edje_object_part_exists (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_exists, [ :evas_object_p, :string ], :eina_bool ],
+        [ :edje_object_part_exists, [ :evas_object, :string ], :bool ],
         # EAPI const Evas_Object *edje_object_part_object_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_object_get, [ :evas_object_p, :string ], :evas_object_p ],
+        [ :edje_object_part_object_get, [ :evas_object, :string ], :evas_object ],
         # EAPI Eina_Bool edje_object_part_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_part_geometry_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :edje_object_part_geometry_get, [ :evas_object, :string, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void edje_object_item_provider_set (Evas_Object *obj, Edje_Item_Provider_Cb func, void *data);
-        [ :edje_object_item_provider_set, [ :evas_object_p, :edje_item_provider_cb, :void_p ], :void ],
+        [ :edje_object_item_provider_set, [ :evas_object, :edje_item_provider_cb, :pointer ], :void ],
         # EAPI void edje_object_text_change_cb_set (Evas_Object *obj, Edje_Text_Change_Cb func, void *data);
-        [ :edje_object_text_change_cb_set, [ :evas_object_p, :edje_text_change_cb, :void_p ], :void ],
+        [ :edje_object_text_change_cb_set, [ :evas_object, :edje_text_change_cb, :pointer ], :void ],
         # EAPI Eina_Bool edje_object_part_text_set (Evas_Object *obj, const char *part, const char *text);
-        [ :edje_object_part_text_set, [ :evas_object_p, :string, :string ], :eina_bool ],
+        [ :edje_object_part_text_set, [ :evas_object, :string, :string ], :bool ],
         # EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_get, [ :evas_object_p, :string ], :string ],
+        [ :edje_object_part_text_get, [ :evas_object, :string ], :string ],
+        # EAPI void edje_object_part_text_style_user_set(Evas_Object *obj, const char *part, const char *style);
+        [ :edje_object_part_text_style_user_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI const char *edje_object_part_text_style_user_get(Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_style_user_get, [ :evas_object, :string ], :string ],
         # EAPI Eina_Bool edje_object_part_text_unescaped_set (Evas_Object *obj, const char *part, const char *text_to_escape);
-        [ :edje_object_part_text_unescaped_set, [ :evas_object_p, :string, :string ], :eina_bool ],
+        [ :edje_object_part_text_unescaped_set, [ :evas_object, :string, :string ], :bool ],
         # EAPI char *edje_object_part_text_unescaped_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_unescaped_get, [ :evas_object_p, :string ], :string ],
+        [ :edje_object_part_text_unescaped_get, [ :evas_object, :string ], :string ],
         # EAPI const char *edje_object_part_text_selection_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_selection_get, [ :evas_object_p, :string ], :string ],
+        [ :edje_object_part_text_selection_get, [ :evas_object, :string ], :string ],
         # EAPI void edje_object_part_text_select_none (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_none, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_part_text_select_none, [ :evas_object, :string ], :void ],
         # EAPI void edje_object_part_text_select_all (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_all, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_part_text_select_all, [ :evas_object, :string ], :void ],
         # EAPI void edje_object_part_text_insert (Evas_Object *obj, const char *part, const char *text);
-        [ :edje_object_part_text_insert, [ :evas_object_p, :string, :string ], :void ],
+        [ :edje_object_part_text_insert, [ :evas_object, :string, :string ], :void ],
         # EAPI void edje_object_part_text_append(Evas_Object *obj, const char *part, const char *text);
-        [ :edje_object_part_text_append, [ :evas_object_p, :string, :string ], :void ],
+        [ :edje_object_part_text_append, [ :evas_object, :string, :string ], :void ],
         # EAPI const Eina_List *edje_object_part_text_anchor_list_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_anchor_list_get, [ :evas_object_p, :string ], :eina_list_p ],
+        [ :edje_object_part_text_anchor_list_get, [ :evas_object, :string ], :eina_list ],
         # EAPI const Eina_List *edje_object_part_text_anchor_geometry_get (const Evas_Object *obj, const char *part, const char *anchor);
-        [ :edje_object_part_text_anchor_geometry_get, [ :evas_object_p, :string, :string ], :eina_list_p ],
+        [ :edje_object_part_text_anchor_geometry_get, [ :evas_object, :string, :string ], :eina_list ],
         # EAPI const Eina_List *edje_object_part_text_item_list_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_item_list_get, [ :evas_object_p, :string ], :eina_list_p ],
+        [ :edje_object_part_text_item_list_get, [ :evas_object, :string ], :eina_list ],
         # EAPI Eina_Bool edje_object_part_text_item_geometry_get (const Evas_Object *obj, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :edje_object_part_text_item_geometry_get, [ :evas_object_p, :string, :string, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :edje_object_part_text_item_geometry_get, [ :evas_object, :string, :string, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void edje_object_part_text_cursor_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_part_text_cursor_geometry_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :edje_object_part_text_cursor_geometry_get, [ :evas_object, :string, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void edje_object_part_text_select_allow_set (const Evas_Object *obj, const char *part, Eina_Bool allow);
-        [ :edje_object_part_text_select_allow_set, [ :evas_object_p, :string, :eina_bool ], :void ],
+        [ :edje_object_part_text_select_allow_set, [ :evas_object, :string, :bool ], :void ],
         # EAPI void edje_object_part_text_select_abort (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_abort, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_part_text_select_abort, [ :evas_object, :string ], :void ],
         # EAPI void edje_object_part_text_select_begin (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_begin, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_part_text_select_begin, [ :evas_object, :string ], :void ],
         # EAPI void edje_object_part_text_select_extend (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_extend, [ :evas_object_p, :string ], :void ],
+        [ :edje_object_part_text_select_extend, [ :evas_object, :string ], :void ],
         # EAPI Eina_Bool edje_object_part_text_cursor_next (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_next, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
+        [ :edje_object_part_text_cursor_next, [ :evas_object, :string, :edje_cursor ], :bool ],
         # EAPI Eina_Bool edje_object_part_text_cursor_prev (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_prev, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
+        [ :edje_object_part_text_cursor_prev, [ :evas_object, :string, :edje_cursor ], :bool ],
         # EAPI Eina_Bool edje_object_part_text_cursor_up (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_up, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
+        [ :edje_object_part_text_cursor_up, [ :evas_object, :string, :edje_cursor ], :bool ],
         # EAPI Eina_Bool edje_object_part_text_cursor_down (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_down, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
+        [ :edje_object_part_text_cursor_down, [ :evas_object, :string, :edje_cursor ], :bool ],
         # EAPI void edje_object_part_text_cursor_begin_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_begin_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
+        [ :edje_object_part_text_cursor_begin_set, [ :evas_object, :string, :edje_cursor ], :void ],
         # EAPI void edje_object_part_text_cursor_end_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_end_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
+        [ :edje_object_part_text_cursor_end_set, [ :evas_object, :string, :edje_cursor ], :void ],
         # EAPI void edje_object_part_text_cursor_copy (Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst);
-        [ :edje_object_part_text_cursor_copy, [ :evas_object_p, :string, :edje_cursor, :edje_cursor ], :void ],
+        [ :edje_object_part_text_cursor_copy, [ :evas_object, :string, :edje_cursor, :edje_cursor ], :void ],
         # EAPI void edje_object_part_text_cursor_line_begin_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_line_begin_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
+        [ :edje_object_part_text_cursor_line_begin_set, [ :evas_object, :string, :edje_cursor ], :void ],
         # EAPI void edje_object_part_text_cursor_line_end_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_line_end_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
+        [ :edje_object_part_text_cursor_line_end_set, [ :evas_object, :string, :edje_cursor ], :void ],
         # EAPI Eina_Bool edje_object_part_text_cursor_coord_set (Evas_Object *obj, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y);
-        [ :edje_object_part_text_cursor_coord_set, [ :evas_object_p, :string, :edje_cursor, :int, :int ], :eina_bool ],
+        [ :edje_object_part_text_cursor_coord_set, [ :evas_object, :string, :edje_cursor, :int, :int ], :bool ],
         # EAPI Eina_Bool edje_object_part_text_cursor_is_format_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_is_format_get, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
+        [ :edje_object_part_text_cursor_is_format_get, [ :evas_object, :string, :edje_cursor ], :bool ],
         # EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_is_visible_format_get, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI const char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_content_get, [ :evas_object_p, :string, :edje_cursor ], :string ],
+        [ :edje_object_part_text_cursor_is_visible_format_get, [ :evas_object, :string, :edje_cursor ], :bool ],
+        # EAPI char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
+        [ :edje_object_part_text_cursor_content_get, [ :evas_object, :string, :edje_cursor ], :string ],
         # EAPI void edje_object_part_text_cursor_pos_set (Evas_Object *obj, const char *part, Edje_Cursor cur, int pos);
-        [ :edje_object_part_text_cursor_pos_set, [ :evas_object_p, :string, :edje_cursor, :int ], :void ],
+        [ :edje_object_part_text_cursor_pos_set, [ :evas_object, :string, :edje_cursor, :int ], :void ],
         # EAPI int edje_object_part_text_cursor_pos_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_pos_get, [ :evas_object_p, :string, :edje_cursor ], :int ],
-        # EAPI void edje_object_part_text_input_panel_layout_set (const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
-        [ :edje_object_part_text_input_panel_layout_set, [ :evas_object_p, :string, :edje_input_panel_layout ], :void ],
+        [ :edje_object_part_text_cursor_pos_get, [ :evas_object, :string, :edje_cursor ], :int ],
+        # EAPI void edje_object_part_text_imf_context_reset (const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_imf_context_reset, [ :evas_object, :string ], :void ],
+        # EAPI void *edje_object_part_text_imf_context_get (const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_imf_context_get, [ :evas_object, :string ], :pointer ],
+        # EAPI void edje_object_part_text_input_panel_layout_set (Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
+        [ :edje_object_part_text_input_panel_layout_set, [ :evas_object, :string, :edje_input_panel_layout ], :void ],
         # EAPI Edje_Input_Panel_Layout edje_object_part_text_input_panel_layout_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_input_panel_layout_get, [ :evas_object_p, :string ], :edje_input_panel_layout ],
-        # EAPI void edje_object_part_text_autocapital_type_set (const Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type);
-        [ :edje_object_part_text_autocapital_type_set, [ :evas_object_p, :string, :edje_text_autocapital_type ], :void ],
+        [ :edje_object_part_text_input_panel_layout_get, [ :evas_object, :string ], :edje_input_panel_layout ],
+        # EAPI void edje_object_part_text_autocapital_type_set (Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type);
+        [ :edje_object_part_text_autocapital_type_set, [ :evas_object, :string, :edje_text_autocapital_type ], :void ],
         # EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_autocapital_type_get, [ :evas_object_p, :string ], :edje_text_autocapital_type ],
-        # EAPI void edje_object_part_text_input_panel_enabled_set (const Evas_Object *obj, const char *part, Eina_Bool enabled);
-        [ :edje_object_part_text_input_panel_enabled_set, [ :evas_object_p, :string, :eina_bool ], :void ],
+        [ :edje_object_part_text_autocapital_type_get, [ :evas_object, :string ], :edje_text_autocapital_type ],
+        # EAPI void edje_object_part_text_prediction_allow_set (Evas_Object *obj, const char *part, Eina_Bool prediction);
+        [ :edje_object_part_text_prediction_allow_set, [ :evas_object, :string, :bool ], :void ],
+        # EAPI Eina_Bool edje_object_part_text_prediction_allow_get (const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_prediction_allow_get, [ :evas_object, :string ], :bool ],
+        # EAPI void edje_object_part_text_input_panel_enabled_set (Evas_Object *obj, const char *part, Eina_Bool enabled);
+        [ :edje_object_part_text_input_panel_enabled_set, [ :evas_object, :string, :bool ], :void ],
         # EAPI Eina_Bool edje_object_part_text_input_panel_enabled_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_input_panel_enabled_get, [ :evas_object_p, :string ], :eina_bool ],
+        [ :edje_object_part_text_input_panel_enabled_get, [ :evas_object, :string ], :bool ],
+        # EAPI void edje_object_part_text_input_panel_show(const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_show, [ :evas_object, :string ], :void ],
+        # EAPI void edje_object_part_text_input_panel_hide(const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_hide, [ :evas_object, :string ], :void ],
+        # EAPI void edje_object_part_text_input_panel_language_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Lang lang);
+        [ :edje_object_part_text_input_panel_language_set, [ :evas_object, :string, :edje_input_panel_lang ], :void ],
+        # EAPI Edje_Input_Panel_Lang edje_object_part_text_input_panel_language_get(const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_language_get, [ :evas_object, :string ], :edje_input_panel_lang ],
+        # EAPI void edje_object_part_text_input_panel_imdata_set(Evas_Object *obj, const char *part, const void *data, int len);
+        [ :edje_object_part_text_input_panel_imdata_set, [ :evas_object, :string, :pointer, :int ], :void ],
+        # EAPI void edje_object_part_text_input_panel_imdata_get(const Evas_Object *obj, const char *part, void *data, int *len);
+        [ :edje_object_part_text_input_panel_imdata_get, [ :evas_object, :string, :pointer, :pointer ], :void ],
+        # EAPI void edje_object_part_text_input_panel_return_key_type_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type);
+        [ :edje_object_part_text_input_panel_return_key_type_set, [ :evas_object, :string, :edje_input_panel_return_key_type ], :void ],
+        # EAPI Edje_Input_Panel_Return_Key_Type edje_object_part_text_input_panel_return_key_type_get(const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_return_key_type_get, [ :evas_object, :string ], :edje_input_panel_return_key_type ],
+        # EAPI void edje_object_part_text_input_panel_return_key_disabled_set(Evas_Object *obj, const char *part, Eina_Bool disabled);
+        [ :edje_object_part_text_input_panel_return_key_disabled_set, [ :evas_object, :string, :bool ], :void ],
+        # EAPI Eina_Bool edje_object_part_text_input_panel_return_key_disabled_get(const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_return_key_disabled_get, [ :evas_object, :string ], :bool ],
         # EAPI void edje_object_text_insert_filter_callback_add (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
-        [ :edje_object_text_insert_filter_callback_add, [ :evas_object_p, :string, :edje_text_filter_cb, :void_p ], :void ],
+        [ :edje_object_text_insert_filter_callback_add, [ :evas_object, :string, :edje_text_filter_cb, :pointer ], :void ],
         # EAPI void *edje_object_text_insert_filter_callback_del (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func);
-        [ :edje_object_text_insert_filter_callback_del, [ :evas_object_p, :string, :edje_text_filter_cb ], :void_p ],
+        [ :edje_object_text_insert_filter_callback_del, [ :evas_object, :string, :edje_text_filter_cb ], :pointer ],
         # EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
-        [ :edje_object_text_insert_filter_callback_del_full, [ :evas_object_p, :string, :edje_text_filter_cb, :void_p ], :void_p ],
+        [ :edje_object_text_insert_filter_callback_del_full, [ :evas_object, :string, :edje_text_filter_cb, :pointer ], :pointer ],
+        # EAPI void edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
+        [ :edje_object_text_markup_filter_callback_add, [ :evas_object, :string, :edje_markup_filter_cb, :pointer ], :void ],
+        # EAPI void *edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func);
+        [ :edje_object_text_markup_filter_callback_del, [ :evas_object, :string, :edje_markup_filter_cb ], :pointer ],
+        # EAPI void *edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
+        [ :edje_object_text_markup_filter_callback_del_full, [ :evas_object, :string, :edje_markup_filter_cb, :pointer ], :pointer ],
         # EAPI Eina_Bool edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow);
-        [ :edje_object_part_swallow, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
+        [ :edje_object_part_swallow, [ :evas_object, :string, :evas_object ], :bool ],
         # EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow);
-        [ :edje_object_part_unswallow, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :edje_object_part_unswallow, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *edje_object_part_swallow_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_swallow_get, [ :evas_object_p, :string ], :evas_object_p ],
+        [ :edje_object_part_swallow_get, [ :evas_object, :string ], :evas_object ],
         # EAPI const char *edje_object_part_state_get (const Evas_Object *obj, const char *part, double *val_ret);
-        [ :edje_object_part_state_get, [ :evas_object_p, :string, :double_p ], :string ],
+        [ :edje_object_part_state_get, [ :evas_object, :string, :pointer ], :string ],
         # EAPI Edje_Drag_Dir edje_object_part_drag_dir_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_drag_dir_get, [ :evas_object_p, :string ], :edje_drag_dir ],
+        [ :edje_object_part_drag_dir_get, [ :evas_object, :string ], :edje_drag_dir ],
         # EAPI Eina_Bool edje_object_part_drag_value_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_value_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_value_set, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_value_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_value_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
+        [ :edje_object_part_drag_value_get, [ :evas_object, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_size_set (Evas_Object *obj, const char *part, double dw, double dh);
-        [ :edje_object_part_drag_size_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_size_set, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_size_get (const Evas_Object *obj, const char *part, double *dw, double *dh);
-        [ :edje_object_part_drag_size_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
+        [ :edje_object_part_drag_size_get, [ :evas_object, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_step_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_step_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_step_set, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_step_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_step_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
+        [ :edje_object_part_drag_step_get, [ :evas_object, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_page_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_page_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_page_set, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_page_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_page_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
+        [ :edje_object_part_drag_page_get, [ :evas_object, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_step (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_step, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_step, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Eina_Bool edje_object_part_drag_page (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_page, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
+        [ :edje_object_part_drag_page, [ :evas_object, :string, :double, :double ], :bool ],
         # EAPI Evas_Object *edje_object_part_external_object_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_external_object_get, [ :evas_object_p, :string ], :evas_object_p ],
+        [ :edje_object_part_external_object_get, [ :evas_object, :string ], :evas_object ],
         # EAPI Eina_Bool edje_object_part_external_param_set (Evas_Object *obj, const char *part, const Edje_External_Param *param);
-        [ :edje_object_part_external_param_set, [ :evas_object_p, :string, :edje_external_param_p ], :eina_bool ],
+        [ :edje_object_part_external_param_set, [ :evas_object, :string, :edje_external_param ], :bool ],
         # EAPI Eina_Bool edje_object_part_external_param_get (const Evas_Object *obj, const char *part, Edje_External_Param *param);
-        [ :edje_object_part_external_param_get, [ :evas_object_p, :string, :edje_external_param_p ], :eina_bool ],
+        [ :edje_object_part_external_param_get, [ :evas_object, :string, :edje_external_param ], :bool ],
         # EAPI Evas_Object *edje_object_part_external_content_get (const Evas_Object *obj, const char *part, const char *content);
-        [ :edje_object_part_external_content_get, [ :evas_object_p, :string, :string ], :evas_object_p ],
+        [ :edje_object_part_external_content_get, [ :evas_object, :string, :string ], :evas_object ],
         # EAPI Edje_External_Param_Type edje_object_part_external_param_type_get (const Evas_Object *obj, const char *part, const char *param);
-        [ :edje_object_part_external_param_type_get, [ :evas_object_p, :string, :string ], :edje_external_param_type ],
+        [ :edje_object_part_external_param_type_get, [ :evas_object, :string, :string ], :edje_external_param_type ],
         # EAPI Eina_Bool edje_object_part_box_append (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_append, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
+        [ :edje_object_part_box_append, [ :evas_object, :string, :evas_object ], :bool ],
         # EAPI Eina_Bool edje_object_part_box_prepend (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_prepend, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
+        [ :edje_object_part_box_prepend, [ :evas_object, :string, :evas_object ], :bool ],
         # EAPI Eina_Bool edje_object_part_box_insert_before (Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
-        [ :edje_object_part_box_insert_before, [ :evas_object_p, :string, :evas_object_p, :evas_object_p ], :eina_bool ],
+        [ :edje_object_part_box_insert_before, [ :evas_object, :string, :evas_object, :evas_object ], :bool ],
         # EAPI Eina_Bool edje_object_part_box_insert_at (Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
-        [ :edje_object_part_box_insert_at, [ :evas_object_p, :string, :evas_object_p, :uint ], :eina_bool ],
+        [ :edje_object_part_box_insert_at, [ :evas_object, :string, :evas_object, :uint ], :bool ],
         # EAPI Evas_Object *edje_object_part_box_remove (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_remove, [ :evas_object_p, :string, :evas_object_p ], :evas_object_p ],
+        [ :edje_object_part_box_remove, [ :evas_object, :string, :evas_object ], :evas_object ],
         # EAPI Evas_Object *edje_object_part_box_remove_at (Evas_Object *obj, const char *part, unsigned int pos);
-        [ :edje_object_part_box_remove_at, [ :evas_object_p, :string, :uint ], :evas_object_p ],
+        [ :edje_object_part_box_remove_at, [ :evas_object, :string, :uint ], :evas_object ],
         # EAPI Eina_Bool edje_object_part_box_remove_all (Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :edje_object_part_box_remove_all, [ :evas_object_p, :string, :eina_bool ], :eina_bool ],
+        [ :edje_object_part_box_remove_all, [ :evas_object, :string, :bool ], :bool ],
         # EAPI Evas_Object *edje_object_part_table_child_get (Evas_Object *obj, const char *part, unsigned int col, unsigned int row);
-        [ :edje_object_part_table_child_get, [ :evas_object_p, :string, :uint, :uint ], :evas_object_p ],
+        [ :edje_object_part_table_child_get, [ :evas_object, :string, :uint, :uint ], :evas_object ],
         # EAPI Eina_Bool edje_object_part_table_pack (Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :edje_object_part_table_pack, [ :evas_object_p, :string, :evas_object_p, :ushort, :ushort, :ushort, :ushort ], :eina_bool ],
+        [ :edje_object_part_table_pack, [ :evas_object, :string, :evas_object, :ushort, :ushort, :ushort, :ushort ], :bool ],
         # EAPI Eina_Bool edje_object_part_table_unpack (Evas_Object *obj, const char *part, Evas_Object *child_obj);
-        [ :edje_object_part_table_unpack, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
+        [ :edje_object_part_table_unpack, [ :evas_object, :string, :evas_object ], :bool ],
         # EAPI Eina_Bool edje_object_part_table_col_row_size_get (const Evas_Object *obj, const char *part, int *cols, int *rows);
-        [ :edje_object_part_table_col_row_size_get, [ :evas_object_p, :string, :int_p, :int_p ], :eina_bool ],
+        [ :edje_object_part_table_col_row_size_get, [ :evas_object, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool edje_object_part_table_clear (Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :edje_object_part_table_clear, [ :evas_object_p, :string, :eina_bool ], :eina_bool ],
+        [ :edje_object_part_table_clear, [ :evas_object, :string, :bool ], :bool ],
         # EAPI void edje_object_message_send (Evas_Object *obj, Edje_Message_Type type, int id, void *msg);
-        [ :edje_object_message_send, [ :evas_object_p, :edje_message_type, :int, :void_p ], :void ],
+        [ :edje_object_message_send, [ :evas_object, :edje_message_type, :int, :pointer ], :void ],
         # EAPI void edje_object_message_handler_set (Evas_Object *obj, Edje_Message_Handler_Cb func, void *data);
-        [ :edje_object_message_handler_set, [ :evas_object_p, :edje_message_handler_cb, :void_p ], :void ],
+        [ :edje_object_message_handler_set, [ :evas_object, :edje_message_handler_cb, :pointer ], :void ],
         # EAPI void edje_object_message_signal_process (Evas_Object *obj);
-        [ :edje_object_message_signal_process, [ :evas_object_p ], :void ],
+        [ :edje_object_message_signal_process, [ :evas_object ], :void ],
         # EAPI void edje_message_signal_process (void);
         [ :edje_message_signal_process, [  ], :void ],
         # EAPI Eina_Bool edje_external_type_register (const char *type_name, const Edje_External_Type *type_info);
-        [ :edje_external_type_register, [ :string, :edje_external_type_p ], :eina_bool ],
+        [ :edje_external_type_register, [ :string, :edje_external_type ], :bool ],
         # EAPI Eina_Bool edje_external_type_unregister (const char *type_name);
-        [ :edje_external_type_unregister, [ :string ], :eina_bool ],
+        [ :edje_external_type_unregister, [ :string ], :bool ],
         # EAPI void edje_external_type_array_register (const Edje_External_Type_Info *array);
-        [ :edje_external_type_array_register, [ :edje_external_type_info_p ], :void ],
+        [ :edje_external_type_array_register, [ :edje_external_type_info ], :void ],
         # EAPI void edje_external_type_array_unregister (const Edje_External_Type_Info *array);
-        [ :edje_external_type_array_unregister, [ :edje_external_type_info_p ], :void ],
+        [ :edje_external_type_array_unregister, [ :edje_external_type_info ], :void ],
         # EAPI unsigned int edje_external_type_abi_version_get (void);
         [ :edje_external_type_abi_version_get, [  ], :uint ],
         # EAPI Eina_Iterator *edje_external_iterator_get (void);
-        [ :edje_external_iterator_get, [  ], :eina_iterator_p ],
+        [ :edje_external_iterator_get, [  ], :pointer ],
         # EAPI Edje_External_Param *edje_external_param_find (const Eina_List *params, const char *key);
-        [ :edje_external_param_find, [ :eina_list_p, :string ], :edje_external_param_p ],
+        [ :edje_external_param_find, [ :eina_list, :string ], :edje_external_param ],
         # EAPI Eina_Bool edje_external_param_int_get (const Eina_List *params, const char *key, int *ret);
-        [ :edje_external_param_int_get, [ :eina_list_p, :string, :int_p ], :eina_bool ],
+        [ :edje_external_param_int_get, [ :eina_list, :string, :pointer ], :bool ],
         # EAPI Eina_Bool edje_external_param_double_get (const Eina_List *params, const char *key, double *ret);
-        [ :edje_external_param_double_get, [ :eina_list_p, :string, :double_p ], :eina_bool ],
+        [ :edje_external_param_double_get, [ :eina_list, :string, :pointer ], :bool ],
         # EAPI Eina_Bool edje_external_param_string_get (const Eina_List *params, const char *key, const char **ret);
-        [ :edje_external_param_string_get, [ :eina_list_p, :string, :string_array ], :eina_bool ],
+        [ :edje_external_param_string_get, [ :eina_list, :string, :pointer ], :bool ],
         # EAPI Eina_Bool edje_external_param_bool_get (const Eina_List *params, const char *key, Eina_Bool *ret);
-        [ :edje_external_param_bool_get, [ :eina_list_p, :string, :eina_bool_p ], :eina_bool ],
+        [ :edje_external_param_bool_get, [ :eina_list, :string, :pointer ], :bool ],
         # EAPI Eina_Bool edje_external_param_choice_get (const Eina_List *params, const char *key, const char **ret);
-        [ :edje_external_param_choice_get, [ :eina_list_p, :string, :string_array ], :eina_bool ],
+        [ :edje_external_param_choice_get, [ :eina_list, :string, :pointer ], :bool ],
         # EAPI const Edje_External_Param_Info *edje_external_param_info_get (const char *type_name);
-        [ :edje_external_param_info_get, [ :string ], :edje_external_param_info_p ],
+        [ :edje_external_param_info_get, [ :string ], :edje_external_param_info ],
         # EAPI const Edje_External_Type *edje_external_type_get (const char *type_name);
-        [ :edje_external_type_get, [ :string ], :edje_external_type_p ],
+        [ :edje_external_type_get, [ :string ], :edje_external_type ],
         # EAPI Eina_Bool edje_module_load (const char *module);
-        [ :edje_module_load, [ :string ], :eina_bool ],
+        [ :edje_module_load, [ :string ], :bool ],
         # EAPI const Eina_List *edje_available_modules_get (void);
-        [ :edje_available_modules_get, [  ], :eina_list_p ],
+        [ :edje_available_modules_get, [  ], :eina_list ],
         # EAPI Edje_Perspective *edje_perspective_new (Evas *e);
-        [ :edje_perspective_new, [ :evas_p ], :edje_perspective_p ],
+        [ :edje_perspective_new, [ :evas ], :edje_perspective ],
         # EAPI void edje_perspective_free (Edje_Perspective *ps);
-        [ :edje_perspective_free, [ :edje_perspective_p ], :void ],
+        [ :edje_perspective_free, [ :edje_perspective ], :void ],
         # EAPI void edje_perspective_set (Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
-        [ :edje_perspective_set, [ :edje_perspective_p, :int, :int, :int, :int ], :void ],
+        [ :edje_perspective_set, [ :edje_perspective, :int, :int, :int, :int ], :void ],
         # EAPI void edje_perspective_global_set (Edje_Perspective *ps, Eina_Bool global);
-        [ :edje_perspective_global_set, [ :edje_perspective_p, :eina_bool ], :void ],
+        [ :edje_perspective_global_set, [ :edje_perspective, :bool ], :void ],
         # EAPI Eina_Bool edje_perspective_global_get (const Edje_Perspective *ps);
-        [ :edje_perspective_global_get, [ :edje_perspective_p ], :eina_bool ],
+        [ :edje_perspective_global_get, [ :edje_perspective ], :bool ],
         # EAPI const Edje_Perspective *edje_evas_global_perspective_get(const Evas *e);
-        [ :edje_evas_global_perspective_get, [ :evas_p ], :edje_perspective_p ],
+        [ :edje_evas_global_perspective_get, [ :evas ], :edje_perspective ],
         # EAPI void edje_object_perspective_set (Evas_Object *obj, Edje_Perspective *ps);
-        [ :edje_object_perspective_set, [ :evas_object_p, :edje_perspective_p ], :void ],
+        [ :edje_object_perspective_set, [ :evas_object, :edje_perspective ], :void ],
         # EAPI const Edje_Perspective *edje_object_perspective_get (const Evas_Object *obj);
-        [ :edje_object_perspective_get, [ :evas_object_p ], :edje_perspective_p ],
+        [ :edje_object_perspective_get, [ :evas_object ], :edje_perspective ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/eet.rb b/lib/efl/native/eet.rb
index dac5522..652a3e7 100644
--- a/lib/efl/native/eet.rb
+++ b/lib/efl/native/eet.rb
@@ -1,19 +1,19 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 require 'efl/native/eina_xattr'
+require 'efl/native/eina_list'
 #
 module Efl
     #
     module Eet
         #
-        FCT_PREFIX = 'eet_'
+        FCT_PREFIX = 'eet_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -24,110 +24,101 @@ module Efl
         #
         # ENUMS
         # typedef enum _Eet_Error {...} Eet_Error;
-        enum :eet_error, [ :eet_error_none, :eet_error_bad_object, :eet_error_empty, :eet_error_not_writable, :eet_error_out_of_memory, :eet_error_write_error,
-            :eet_error_write_error_file_too_big, :eet_error_write_error_io_error, :eet_error_write_error_out_of_space, :eet_error_write_error_file_closed, :eet_error_mmap_failed,
-            :eet_error_x509_encoding_failed, :eet_error_signature_failed, :eet_error_invalid_signature, :eet_error_not_signed, :eet_error_not_implemented, :eet_error_prng_not_seeded,
-            :eet_error_encrypt_failed, :eet_error_decrypt_failed ]
+        enum :eet_error, [ :eet_error_none, :eet_error_bad_object, :eet_error_empty, :eet_error_not_writable, :eet_error_out_of_memory,
+            :eet_error_write_error, :eet_error_write_error_file_too_big, :eet_error_write_error_io_error, :eet_error_write_error_out_of_space,
+            :eet_error_write_error_file_closed, :eet_error_mmap_failed, :eet_error_x509_encoding_failed, :eet_error_signature_failed,
+            :eet_error_invalid_signature, :eet_error_not_signed, :eet_error_not_implemented, :eet_error_prng_not_seeded, :eet_error_encrypt_failed,
+            :eet_error_decrypt_failed ]
         # typedef enum _Eet_File_Mode {...} Eet_File_Mode;
-        enum :eet_file_mode, [ :eet_file_mode_invalid, -1, :eet_file_mode_read, :eet_file_mode_write, :eet_file_mode_read_write ]
+        enum :eet_file_mode, [ :eet_file_mode_invalid, -1, :eet_file_mode_read, 0, :eet_file_mode_write, 1, :eet_file_mode_read_write, 2 ]
         #
         # TYPEDEFS
         # typedef struct _Eet_Version Eet_Version;
         typedef :pointer, :eet_version
-        typedef :pointer, :eet_version_p
         # typedef struct _Eet_File Eet_File;
         typedef :pointer, :eet_file
-        typedef :pointer, :eet_file_p
         # typedef struct _Eet_Dictionary Eet_Dictionary;
         typedef :pointer, :eet_dictionary
-        typedef :pointer, :eet_dictionary_p
         # typedef struct _Eet_Key Eet_Key;
         typedef :pointer, :eet_key
-        typedef :pointer, :eet_key_p
         # typedef struct _Eet_Data_Descriptor Eet_Data_Descriptor;
         typedef :pointer, :eet_data_descriptor
-        typedef :pointer, :eet_data_descriptor_p
         # typedef struct _Eet_Data_Descriptor_Class Eet_Data_Descriptor_Class;
         typedef :pointer, :eet_data_descriptor_class
-        typedef :pointer, :eet_data_descriptor_class_p
         # typedef struct _Eet_Node Eet_Node;
         typedef :pointer, :eet_node
-        typedef :pointer, :eet_node_p
         # typedef struct _Eet_Node_Data Eet_Node_Data;
         typedef :pointer, :eet_node_data
-        typedef :pointer, :eet_node_data_p
         # typedef struct _Eet_Node_Walk Eet_Node_Walk;
         typedef :pointer, :eet_node_walk
-        typedef :pointer, :eet_node_walk_p
         # typedef struct _Eet_Connection Eet_Connection;
         typedef :pointer, :eet_connection
-        typedef :pointer, :eet_connection_p
         #
         # CALLBACKS
         # typedef int (*Eet_Key_Password_Callback) (char *buffer, int size, int rwflag, void *data);
-        callback :eet_key_password_callback, [ :string, :int, :int, :void_p ], :int
+        callback :eet_key_password_callback_cb, [ :string, :int, :int, :pointer ], :int
         # typedef int (*Eet_Descriptor_Hash_Foreach_Callback_Callback) (void *h, const char *k, void *dt, void *fdt);
-        callback :eet_descriptor_hash_foreach_callback_callback, [ :void_p, :string, :void_p, :void_p ], :int
+        callback :eet_descriptor_hash_foreach_callback_callback_cb, [ :pointer, :string, :pointer, :pointer ], :int
         # typedef void * (*Eet_Descriptor_Mem_Alloc_Callback) (size_t size);
-        callback :eet_descriptor_mem_alloc_callback, [ :ulong ], :void_p
+        callback :eet_descriptor_mem_alloc_callback_cb, [ :ulong ], :pointer
         # typedef void (*Eet_Descriptor_Mem_Free_Callback) (void *mem);
-        callback :eet_descriptor_mem_free_callback, [ :void_p ], :void
+        callback :eet_descriptor_mem_free_callback_cb, [ :pointer ], :void
         # typedef char * (*Eet_Descriptor_Str_Alloc_Callback) (const char *str);
-        callback :eet_descriptor_str_alloc_callback, [ :string ], :string
+        callback :eet_descriptor_str_alloc_callback_cb, [ :string ], :string
         # typedef void (*Eet_Descriptor_Str_Free_Callback) (const char *str);
-        callback :eet_descriptor_str_free_callback, [ :string ], :void
+        callback :eet_descriptor_str_free_callback_cb, [ :string ], :void
         # typedef void * (*Eet_Descriptor_List_Next_Callback) (void *l);
-        callback :eet_descriptor_list_next_callback, [ :void_p ], :void_p
+        callback :eet_descriptor_list_next_callback_cb, [ :pointer ], :pointer
         # typedef void * (*Eet_Descriptor_List_Append_Callback) (void *l, void *d);
-        callback :eet_descriptor_list_append_callback, [ :void_p, :void_p ], :void_p
+        callback :eet_descriptor_list_append_callback_cb, [ :pointer, :pointer ], :pointer
         # typedef void * (*Eet_Descriptor_List_Data_Callback) (void *l);
-        callback :eet_descriptor_list_data_callback, [ :void_p ], :void_p
+        callback :eet_descriptor_list_data_callback_cb, [ :pointer ], :pointer
         # typedef void * (*Eet_Descriptor_List_Free_Callback) (void *l);
-        callback :eet_descriptor_list_free_callback, [ :void_p ], :void_p
+        callback :eet_descriptor_list_free_callback_cb, [ :pointer ], :pointer
         # typedef void (*Eet_Descriptor_Hash_Foreach_Callback) (void *h, Eet_Descriptor_Hash_Foreach_Callback_Callback func, void *fdt);
-        callback :eet_descriptor_hash_foreach_callback, [ :void_p, :eet_descriptor_hash_foreach_callback_callback, :void_p ], :void
+        callback :eet_descriptor_hash_foreach_callback_cb, [ :pointer, :eet_descriptor_hash_foreach_callback_callback_cb, :pointer ], :void
         # typedef void * (*Eet_Descriptor_Hash_Add_Callback) (void *h, const char *k, void *d);
-        callback :eet_descriptor_hash_add_callback, [ :void_p, :string, :void_p ], :void_p
+        callback :eet_descriptor_hash_add_callback_cb, [ :pointer, :string, :pointer ], :pointer
         # typedef void (*Eet_Descriptor_Hash_Free_Callback) (void *h);
-        callback :eet_descriptor_hash_free_callback, [ :void_p ], :void
+        callback :eet_descriptor_hash_free_callback_cb, [ :pointer ], :void
         # typedef char * (*Eet_Descriptor_Str_Direct_Alloc_Callback) (const char *str);
-        callback :eet_descriptor_str_direct_alloc_callback, [ :string ], :string
+        callback :eet_descriptor_str_direct_alloc_callback_cb, [ :string ], :string
         # typedef void (*Eet_Descriptor_Str_Direct_Free_Callback) (const char *str);
-        callback :eet_descriptor_str_direct_free_callback, [ :string ], :void
+        callback :eet_descriptor_str_direct_free_callback_cb, [ :string ], :void
         # typedef const char * (*Eet_Descriptor_Type_Get_Callback) (const void *data, Eina_Bool *unknow);
-        callback :eet_descriptor_type_get_callback, [ :void_p, :eina_bool_p ], :string
+        callback :eet_descriptor_type_get_callback_cb, [ :pointer, :pointer ], :string
         # typedef Eina_Bool (*Eet_Descriptor_Type_Set_Callback) (const char *type, void *data, Eina_Bool unknow);
-        callback :eet_descriptor_type_set_callback, [ :string, :void_p, :eina_bool ], :eina_bool
+        callback :eet_descriptor_type_set_callback_cb, [ :string, :pointer, :bool ], :bool
         # typedef void * (*Eet_Descriptor_Array_Alloc_Callback) (size_t size);
-        callback :eet_descriptor_array_alloc_callback, [ :ulong ], :void_p
+        callback :eet_descriptor_array_alloc_callback_cb, [ :ulong ], :pointer
         # typedef void (*Eet_Descriptor_Array_Free_Callback) (void *mem);
-        callback :eet_descriptor_array_free_callback, [ :void_p ], :void
+        callback :eet_descriptor_array_free_callback_cb, [ :pointer ], :void
         # typedef void (*Eet_Dump_Callback) (void *data, const char *str);
-        callback :eet_dump_callback, [ :void_p, :string ], :void
+        callback :eet_dump_callback_cb, [ :pointer, :string ], :void
         # typedef void * (*Eet_Node_Walk_Struct_Alloc_Callback) (const char *type, void *user_data);
-        callback :eet_node_walk_struct_alloc_callback, [ :string, :void_p ], :void_p
+        callback :eet_node_walk_struct_alloc_callback_cb, [ :string, :pointer ], :pointer
         # typedef void (*Eet_Node_Walk_Struct_Add_Callback) (void *parent, const char *name, void *child, void *user_data);
-        callback :eet_node_walk_struct_add_callback, [ :void_p, :string, :void_p, :void_p ], :void
+        callback :eet_node_walk_struct_add_callback_cb, [ :pointer, :string, :pointer, :pointer ], :void
         # typedef void * (*Eet_Node_Walk_Array_Callback) (Eina_Bool variable, const char *name, int count, void *user_data);
-        callback :eet_node_walk_array_callback, [ :eina_bool, :string, :int, :void_p ], :void_p
+        callback :eet_node_walk_array_callback_cb, [ :bool, :string, :int, :pointer ], :pointer
         # typedef void (*Eet_Node_Walk_Insert_Callback) (void *array, int index, void *child, void *user_data);
-        callback :eet_node_walk_insert_callback, [ :void_p, :int, :void_p, :void_p ], :void
+        callback :eet_node_walk_insert_callback_cb, [ :pointer, :int, :pointer, :pointer ], :void
         # typedef void * (*Eet_Node_Walk_List_Callback) (const char *name, void *user_data);
-        callback :eet_node_walk_list_callback, [ :string, :void_p ], :void_p
+        callback :eet_node_walk_list_callback_cb, [ :string, :pointer ], :pointer
         # typedef void (*Eet_Node_Walk_Append_Callback) (void *list, void *child, void *user_data);
-        callback :eet_node_walk_append_callback, [ :void_p, :void_p, :void_p ], :void
+        callback :eet_node_walk_append_callback_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef void * (*Eet_Node_Walk_Hash_Callback) (void *parent, const char *name, const char *key, void *value, void *user_data);
-        callback :eet_node_walk_hash_callback, [ :void_p, :string, :string, :void_p, :void_p ], :void_p
+        callback :eet_node_walk_hash_callback_cb, [ :pointer, :string, :string, :pointer, :pointer ], :pointer
         # typedef void * (*Eet_Node_Walk_Simple_Callback) (int type, Eet_Node_Data *data, void *user_data);
-        callback :eet_node_walk_simple_callback, [ :int, :eet_node_data_p, :void_p ], :void_p
+        callback :eet_node_walk_simple_callback_cb, [ :int, :eet_node_data, :pointer ], :pointer
         # typedef Eina_Bool Eet_Read_Cb (const void *eet_data, size_t size, void *user_data);
-        callback :eet_read_cb, [ :void_p, :ulong, :void_p ], :eina_bool
+        callback :eet_read_cb, [ :pointer, :ulong, :pointer ], :bool
         # typedef Eina_Bool Eet_Write_Cb (const void *data, size_t size, void *user_data);
-        callback :eet_write_cb, [ :void_p, :ulong, :void_p ], :eina_bool
+        callback :eet_write_cb, [ :pointer, :ulong, :pointer ], :bool
         #
         # VARIABLES
         # EAPI extern Eet_Version *eet_version;
-        attach_variable :eet_version, :eet_version_p
+        attach_variable :eet_version, :eet_version
         #
         # FUNCTIONS
         fcts = [
@@ -138,215 +129,221 @@ module Efl
         # EAPI void eet_clearcache(void);
         [ :eet_clearcache, [  ], :void ],
         # EAPI Eet_File * eet_open(const char *file, Eet_File_Mode mode);
-        [ :eet_open, [ :string, :eet_file_mode ], :eet_file_p ],
+        [ :eet_open, [ :string, :eet_file_mode ], :eet_file ],
         # EAPI Eet_File * eet_memopen_read(const void *data, size_t size);
-        [ :eet_memopen_read, [ :void_p, :ulong ], :eet_file_p ],
+        [ :eet_memopen_read, [ :pointer, :ulong ], :eet_file ],
         # EAPI Eet_File_Mode eet_mode_get(Eet_File *ef);
-        [ :eet_mode_get, [ :eet_file_p ], :eet_file_mode ],
+        [ :eet_mode_get, [ :eet_file ], :eet_file_mode ],
         # EAPI Eet_Error eet_close(Eet_File *ef);
-        [ :eet_close, [ :eet_file_p ], :eet_error ],
+        [ :eet_close, [ :eet_file ], :eet_error ],
         # EAPI Eet_Error eet_sync(Eet_File *ef);
-        [ :eet_sync, [ :eet_file_p ], :eet_error ],
+        [ :eet_sync, [ :eet_file ], :eet_error ],
         # EAPI Eet_Dictionary * eet_dictionary_get(Eet_File *ef);
-        [ :eet_dictionary_get, [ :eet_file_p ], :eet_dictionary_p ],
+        [ :eet_dictionary_get, [ :eet_file ], :eet_dictionary ],
         # EAPI int eet_dictionary_string_check(Eet_Dictionary *ed, const char *string);
-        [ :eet_dictionary_string_check, [ :eet_dictionary_p, :string ], :int ],
+        [ :eet_dictionary_string_check, [ :eet_dictionary, :string ], :int ],
+        # EAPI int eet_dictionary_count(const Eet_Dictionary *ed);
+        [ :eet_dictionary_count, [ :eet_dictionary ], :int ],
         # EAPI void * eet_read(Eet_File *ef, const char *name, int *size_ret);
-        [ :eet_read, [ :eet_file_p, :string, :int_p ], :void_p ],
+        [ :eet_read, [ :eet_file, :string, :pointer ], :pointer ],
         # EAPI const void * eet_read_direct(Eet_File *ef, const char *name, int *size_ret);
-        [ :eet_read_direct, [ :eet_file_p, :string, :int_p ], :void_p ],
+        [ :eet_read_direct, [ :eet_file, :string, :pointer ], :pointer ],
         # EAPI int eet_write(Eet_File *ef, const char *name, const void *data, int size, int compress);
-        [ :eet_write, [ :eet_file_p, :string, :void_p, :int, :int ], :int ],
+        [ :eet_write, [ :eet_file, :string, :pointer, :int, :int ], :int ],
         # EAPI int eet_delete(Eet_File *ef, const char *name);
-        [ :eet_delete, [ :eet_file_p, :string ], :int ],
+        [ :eet_delete, [ :eet_file, :string ], :int ],
         # EAPI Eina_Bool eet_alias(Eet_File *ef, const char *name, const char *destination, int compress);
-        [ :eet_alias, [ :eet_file_p, :string, :string, :int ], :eina_bool ],
+        [ :eet_alias, [ :eet_file, :string, :string, :int ], :bool ],
         # EAPI const char * eet_file_get(Eet_File *ef);
-        [ :eet_file_get, [ :eet_file_p ], :string ],
+        [ :eet_file_get, [ :eet_file ], :string ],
         # EAPI const char * eet_alias_get(Eet_File *ef, const char *name);
-        [ :eet_alias_get, [ :eet_file_p, :string ], :string ],
+        [ :eet_alias_get, [ :eet_file, :string ], :string ],
         # EAPI char ** eet_list(Eet_File *ef, const char *glob, int *count_ret);
-        [ :eet_list, [ :eet_file_p, :string, :int_p ], :string_array ],
+        [ :eet_list, [ :eet_file, :string, :pointer ], :pointer ],
         # EAPI int eet_num_entries(Eet_File *ef);
-        [ :eet_num_entries, [ :eet_file_p ], :int ],
+        [ :eet_num_entries, [ :eet_file ], :int ],
         # EAPI void * eet_read_cipher(Eet_File *ef, const char *name, int *size_ret, const char *cipher_key);
-        [ :eet_read_cipher, [ :eet_file_p, :string, :int_p, :string ], :void_p ],
+        [ :eet_read_cipher, [ :eet_file, :string, :pointer, :string ], :pointer ],
         # EAPI int eet_write_cipher(Eet_File *ef, const char *name, const void *data, int size, int compress, const char *cipher_key);
-        [ :eet_write_cipher, [ :eet_file_p, :string, :void_p, :int, :int, :string ], :int ],
+        [ :eet_write_cipher, [ :eet_file, :string, :pointer, :int, :int, :string ], :int ],
         # EAPI int eet_data_image_header_read(Eet_File *ef, const char *name, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_header_read, [ :eet_file_p, :string, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_header_read, [ :eet_file, :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI void * eet_data_image_read(Eet_File *ef, const char *name, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_read, [ :eet_file_p, :string, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :void_p ],
+        [ :eet_data_image_read, [ :eet_file, :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :pointer ],
         # EAPI int eet_data_image_read_to_surface(Eet_File *ef, const char *name, unsigned int src_x, unsigned int src_y, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_read_to_surface, [ :eet_file_p, :string, :uint, :uint, :uint_p, :uint, :uint, :uint, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_read_to_surface, [ :eet_file, :string, :uint, :uint, :pointer, :uint, :uint, :uint, :pointer, :pointer, :pointer, :pointer
+            ], :int ],
         # EAPI int eet_data_image_write(Eet_File *ef, const char *name, const void *data, unsigned int w, unsigned int h, int alpha, int compress, int quality, int lossy);
-        [ :eet_data_image_write, [ :eet_file_p, :string, :void_p, :uint, :uint, :int, :int, :int, :int ], :int ],
+        [ :eet_data_image_write, [ :eet_file, :string, :pointer, :uint, :uint, :int, :int, :int, :int ], :int ],
         # EAPI int eet_data_image_header_decode(const void *data, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_header_decode, [ :void_p, :int, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_header_decode, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI void * eet_data_image_decode(const void *data, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_decode, [ :void_p, :int, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :void_p ],
+        [ :eet_data_image_decode, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :pointer ],
         # EAPI int eet_data_image_decode_to_surface(const void *data, int size, unsigned int src_x, unsigned int src_y, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_decode_to_surface, [ :void_p, :int, :uint, :uint, :uint_p, :uint, :uint, :uint, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_decode_to_surface, [ :pointer, :int, :uint, :uint, :pointer, :uint, :uint, :uint, :pointer, :pointer, :pointer, :pointer ],
+            :int ],
         # EAPI void * eet_data_image_encode(const void *data, int *size_ret, unsigned int w, unsigned int h, int alpha, int compress, int quality, int lossy);
-        [ :eet_data_image_encode, [ :void_p, :int_p, :uint, :uint, :int, :int, :int, :int ], :void_p ],
+        [ :eet_data_image_encode, [ :pointer, :pointer, :uint, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI int eet_data_image_header_read_cipher(Eet_File *ef, const char *name, const char *cipher_key, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_header_read_cipher, [ :eet_file_p, :string, :string, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_header_read_cipher, [ :eet_file, :string, :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI void * eet_data_image_read_cipher(Eet_File *ef, const char *name, const char *cipher_key, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_read_cipher, [ :eet_file_p, :string, :string, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :void_p ],
+        [ :eet_data_image_read_cipher, [ :eet_file, :string, :string, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :pointer ],
         # EAPI int eet_data_image_read_to_surface_cipher(Eet_File *ef, const char *name, const char *cipher_key, unsigned int src_x, unsigned int src_y, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_read_to_surface_cipher, [ :eet_file_p, :string, :string, :uint, :uint, :uint_p, :uint, :uint, :uint, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_read_to_surface_cipher, [ :eet_file, :string, :string, :uint, :uint, :pointer, :uint, :uint, :uint, :pointer, :pointer,
+            :pointer, :pointer ], :int ],
         # EAPI int eet_data_image_write_cipher(Eet_File *ef, const char *name, const char *cipher_key, const void *data, unsigned int w, unsigned int h, int alpha, int compress, int quality, int lossy);
-        [ :eet_data_image_write_cipher, [ :eet_file_p, :string, :string, :void_p, :uint, :uint, :int, :int, :int, :int ], :int ],
+        [ :eet_data_image_write_cipher, [ :eet_file, :string, :string, :pointer, :uint, :uint, :int, :int, :int, :int ], :int ],
         # EAPI int eet_data_image_header_decode_cipher(const void *data, const char *cipher_key, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_header_decode_cipher, [ :void_p, :string, :int, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_header_decode_cipher, [ :pointer, :string, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI void * eet_data_image_decode_cipher(const void *data, const char *cipher_key, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_decode_cipher, [ :void_p, :string, :int, :uint_p, :uint_p, :int_p, :int_p, :int_p, :int_p ], :void_p ],
+        [ :eet_data_image_decode_cipher, [ :pointer, :string, :int, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :pointer ],
         # EAPI int eet_data_image_decode_to_surface_cipher(const void *data, const char *cipher_key, int size, unsigned int src_x, unsigned int src_y, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, int *alpha, int *compress, int *quality, int *lossy);
-        [ :eet_data_image_decode_to_surface_cipher, [ :void_p, :string, :int, :uint, :uint, :uint_p, :uint, :uint, :uint, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :eet_data_image_decode_to_surface_cipher, [ :pointer, :string, :int, :uint, :uint, :pointer, :uint, :uint, :uint, :pointer, :pointer,
+            :pointer, :pointer ], :int ],
         # EAPI void * eet_data_image_encode_cipher(const void *data, const char *cipher_key, unsigned int w, unsigned int h, int alpha, int compress, int quality, int lossy, int *size_ret);
-        [ :eet_data_image_encode_cipher, [ :void_p, :string, :uint, :uint, :int, :int, :int, :int, :int_p ], :void_p ],
+        [ :eet_data_image_encode_cipher, [ :pointer, :string, :uint, :uint, :int, :int, :int, :int, :pointer ], :pointer ],
         # EAPI Eet_Key * eet_identity_open(const char *certificate_file, const char *private_key_file, Eet_Key_Password_Callback cb);
-        [ :eet_identity_open, [ :string, :string, :eet_key_password_callback ], :eet_key_p ],
+        [ :eet_identity_open, [ :string, :string, :eet_key_password_callback_cb ], :eet_key ],
         # EAPI void eet_identity_close(Eet_Key *key);
-        [ :eet_identity_close, [ :eet_key_p ], :void ],
+        [ :eet_identity_close, [ :eet_key ], :void ],
         # EAPI Eet_Error eet_identity_set(Eet_File *ef, Eet_Key *key);
-        [ :eet_identity_set, [ :eet_file_p, :eet_key_p ], :eet_error ],
+        [ :eet_identity_set, [ :eet_file, :eet_key ], :eet_error ],
         # EAPI void eet_identity_print(Eet_Key *key, FILE *out);
-        [ :eet_identity_print, [ :eet_key_p, :pointer ], :void ],
+        [ :eet_identity_print, [ :eet_key, :pointer ], :void ],
         # EAPI const void * eet_identity_x509(Eet_File *ef, int *der_length);
-        [ :eet_identity_x509, [ :eet_file_p, :int_p ], :void_p ],
+        [ :eet_identity_x509, [ :eet_file, :pointer ], :pointer ],
         # EAPI const void * eet_identity_signature(Eet_File *ef, int *signature_length);
-        [ :eet_identity_signature, [ :eet_file_p, :int_p ], :void_p ],
+        [ :eet_identity_signature, [ :eet_file, :pointer ], :pointer ],
         # EAPI const void * eet_identity_sha1(Eet_File *ef, int *sha1_length);
-        [ :eet_identity_sha1, [ :eet_file_p, :int_p ], :void_p ],
+        [ :eet_identity_sha1, [ :eet_file, :pointer ], :pointer ],
         # EAPI void eet_identity_certificate_print(const unsigned char *certificate, int der_length, FILE *out);
-        [ :eet_identity_certificate_print, [ :uchar_p, :int, :pointer ], :void ],
+        [ :eet_identity_certificate_print, [ :pointer, :int, :pointer ], :void ],
         # EAPI Eet_Data_Descriptor * eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc);
-        [ :eet_data_descriptor_stream_new, [ :eet_data_descriptor_class_p ], :eet_data_descriptor_p ],
+        [ :eet_data_descriptor_stream_new, [ :eet_data_descriptor_class ], :eet_data_descriptor ],
         # EAPI Eet_Data_Descriptor * eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc);
-        [ :eet_data_descriptor_file_new, [ :eet_data_descriptor_class_p ], :eet_data_descriptor_p ],
+        [ :eet_data_descriptor_file_new, [ :eet_data_descriptor_class ], :eet_data_descriptor ],
         # EAPI Eina_Bool eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, unsigned int eddc_size, const char *name, int size);
-        [ :eet_eina_stream_data_descriptor_class_set, [ :eet_data_descriptor_class_p, :uint, :string, :int ], :eina_bool ],
+        [ :eet_eina_stream_data_descriptor_class_set, [ :eet_data_descriptor_class, :uint, :string, :int ], :bool ],
         # EAPI Eina_Bool eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, unsigned int eddc_size, const char *name, int size);
-        [ :eet_eina_file_data_descriptor_class_set, [ :eet_data_descriptor_class_p, :uint, :string, :int ], :eina_bool ],
+        [ :eet_eina_file_data_descriptor_class_set, [ :eet_data_descriptor_class, :uint, :string, :int ], :bool ],
         # EAPI void eet_data_descriptor_free(Eet_Data_Descriptor *edd);
-        [ :eet_data_descriptor_free, [ :eet_data_descriptor_p ], :void ],
+        [ :eet_data_descriptor_free, [ :eet_data_descriptor ], :void ],
         # EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, const char *name, int type, int group_type, int offset, /* int count_offset, */
         # FIXME
         # EAPI void * eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name);
-        [ :eet_data_read, [ :eet_file_p, :eet_data_descriptor_p, :string ], :void_p ],
+        [ :eet_data_read, [ :eet_file, :eet_data_descriptor, :string ], :pointer ],
         # EAPI int eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const void *data, int compress);
-        [ :eet_data_write, [ :eet_file_p, :eet_data_descriptor_p, :string, :void_p, :int ], :int ],
+        [ :eet_data_write, [ :eet_file, :eet_data_descriptor, :string, :pointer, :int ], :int ],
         # EAPI int eet_data_text_dump(const void *data_in, int size_in, Eet_Dump_Callback dumpfunc, void *dumpdata);
-        [ :eet_data_text_dump, [ :void_p, :int, :eet_dump_callback, :void_p ], :int ],
+        [ :eet_data_text_dump, [ :pointer, :int, :eet_dump_callback_cb, :pointer ], :int ],
         # EAPI void * eet_data_text_undump(const char *text, int textlen, int *size_ret);
-        [ :eet_data_text_undump, [ :string, :int, :int_p ], :void_p ],
+        [ :eet_data_text_undump, [ :string, :int, :pointer ], :pointer ],
         # EAPI int eet_data_dump(Eet_File *ef, const char *name, Eet_Dump_Callback dumpfunc, void *dumpdata);
-        [ :eet_data_dump, [ :eet_file_p, :string, :eet_dump_callback, :void_p ], :int ],
+        [ :eet_data_dump, [ :eet_file, :string, :eet_dump_callback_cb, :pointer ], :int ],
         # EAPI int eet_data_undump(Eet_File *ef, const char *name, const char *text, int textlen, int compress);
-        [ :eet_data_undump, [ :eet_file_p, :string, :string, :int, :int ], :int ],
+        [ :eet_data_undump, [ :eet_file, :string, :string, :int, :int ], :int ],
         # EAPI void * eet_data_descriptor_decode(Eet_Data_Descriptor *edd, const void *data_in, int size_in);
-        [ :eet_data_descriptor_decode, [ :eet_data_descriptor_p, :void_p, :int ], :void_p ],
+        [ :eet_data_descriptor_decode, [ :eet_data_descriptor, :pointer, :int ], :pointer ],
         # EAPI void * eet_data_descriptor_encode(Eet_Data_Descriptor *edd, const void *data_in, int *size_ret);
-        [ :eet_data_descriptor_encode, [ :eet_data_descriptor_p, :void_p, :int_p ], :void_p ],
+        [ :eet_data_descriptor_encode, [ :eet_data_descriptor, :pointer, :pointer ], :pointer ],
         # EAPI void * eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *cipher_key);
-        [ :eet_data_read_cipher, [ :eet_file_p, :eet_data_descriptor_p, :string, :string ], :void_p ],
+        [ :eet_data_read_cipher, [ :eet_file, :eet_data_descriptor, :string, :string ], :pointer ],
         # EAPI void * eet_data_xattr_cipher_get(const char *filename, const char *attribute, Eet_Data_Descriptor *edd, const char *cipher_key);
-        [ :eet_data_xattr_cipher_get, [ :string, :string, :eet_data_descriptor_p, :string ], :void_p ],
+        [ :eet_data_xattr_cipher_get, [ :string, :string, :eet_data_descriptor, :string ], :pointer ],
         # EAPI int eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *cipher_key, const void *data, int compress);
-        [ :eet_data_write_cipher, [ :eet_file_p, :eet_data_descriptor_p, :string, :string, :void_p, :int ], :int ],
+        [ :eet_data_write_cipher, [ :eet_file, :eet_data_descriptor, :string, :string, :pointer, :int ], :int ],
         # EAPI Eina_Bool eet_data_xattr_cipher_set(const char *filename, const char *attribute, Eet_Data_Descriptor *edd, const char *cipher_key, const void *data, Eina_Xattr_Flags flags);
-        [ :eet_data_xattr_cipher_set, [ :string, :string, :eet_data_descriptor_p, :string, :void_p, :eina_xattr_flags ], :eina_bool ],
+        [ :eet_data_xattr_cipher_set, [ :string, :string, :eet_data_descriptor, :string, :pointer, :eina_xattr_flags ], :bool ],
         # EAPI int eet_data_text_dump_cipher(const void *data_in, const char *cipher_key, int size_in, Eet_Dump_Callback dumpfunc, void *dumpdata);
-        [ :eet_data_text_dump_cipher, [ :void_p, :string, :int, :eet_dump_callback, :void_p ], :int ],
+        [ :eet_data_text_dump_cipher, [ :pointer, :string, :int, :eet_dump_callback_cb, :pointer ], :int ],
         # EAPI void * eet_data_text_undump_cipher(const char *text, const char *cipher_key, int textlen, int *size_ret);
-        [ :eet_data_text_undump_cipher, [ :string, :string, :int, :int_p ], :void_p ],
+        [ :eet_data_text_undump_cipher, [ :string, :string, :int, :pointer ], :pointer ],
         # EAPI int eet_data_dump_cipher(Eet_File *ef, const char *name, const char *cipher_key, Eet_Dump_Callback dumpfunc, void *dumpdata);
-        [ :eet_data_dump_cipher, [ :eet_file_p, :string, :string, :eet_dump_callback, :void_p ], :int ],
+        [ :eet_data_dump_cipher, [ :eet_file, :string, :string, :eet_dump_callback_cb, :pointer ], :int ],
         # EAPI int eet_data_undump_cipher(Eet_File *ef, const char *name, const char *cipher_key, const char *text, int textlen, int compress);
-        [ :eet_data_undump_cipher, [ :eet_file_p, :string, :string, :string, :int, :int ], :int ],
+        [ :eet_data_undump_cipher, [ :eet_file, :string, :string, :string, :int, :int ], :int ],
         # EAPI void * eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, const void *data_in, const char *cipher_key, int size_in);
-        [ :eet_data_descriptor_decode_cipher, [ :eet_data_descriptor_p, :void_p, :string, :int ], :void_p ],
+        [ :eet_data_descriptor_decode_cipher, [ :eet_data_descriptor, :pointer, :string, :int ], :pointer ],
         # EAPI void * eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, const void *data_in, const char *cipher_key, int *size_ret);
-        [ :eet_data_descriptor_encode_cipher, [ :eet_data_descriptor_p, :void_p, :string, :int_p ], :void_p ],
+        [ :eet_data_descriptor_encode_cipher, [ :eet_data_descriptor, :pointer, :string, :pointer ], :pointer ],
         # EAPI Eet_Node * eet_node_char_new(const char *name, char c);
-        [ :eet_node_char_new, [ :string, :char ], :eet_node_p ],
+        [ :eet_node_char_new, [ :string, :char ], :eet_node ],
         # EAPI Eet_Node * eet_node_short_new(const char *name, short s);
-        [ :eet_node_short_new, [ :string, :short ], :eet_node_p ],
+        [ :eet_node_short_new, [ :string, :short ], :eet_node ],
         # EAPI Eet_Node * eet_node_int_new(const char *name, int i);
-        [ :eet_node_int_new, [ :string, :int ], :eet_node_p ],
+        [ :eet_node_int_new, [ :string, :int ], :eet_node ],
         # EAPI Eet_Node * eet_node_long_long_new(const char *name, long long l);
-        [ :eet_node_long_long_new, [ :string, :long_long ], :eet_node_p ],
+        [ :eet_node_long_long_new, [ :string, :long_long ], :eet_node ],
         # EAPI Eet_Node * eet_node_float_new(const char *name, float f);
-        [ :eet_node_float_new, [ :string, :float ], :eet_node_p ],
+        [ :eet_node_float_new, [ :string, :float ], :eet_node ],
         # EAPI Eet_Node * eet_node_double_new(const char *name, double d);
-        [ :eet_node_double_new, [ :string, :double ], :eet_node_p ],
+        [ :eet_node_double_new, [ :string, :double ], :eet_node ],
         # EAPI Eet_Node * eet_node_unsigned_char_new(const char *name, unsigned char uc);
-        [ :eet_node_unsigned_char_new, [ :string, :uchar ], :eet_node_p ],
+        [ :eet_node_unsigned_char_new, [ :string, :uchar ], :eet_node ],
         # EAPI Eet_Node * eet_node_unsigned_short_new(const char *name, unsigned short us);
-        [ :eet_node_unsigned_short_new, [ :string, :ushort ], :eet_node_p ],
+        [ :eet_node_unsigned_short_new, [ :string, :ushort ], :eet_node ],
         # EAPI Eet_Node * eet_node_unsigned_int_new(const char *name, unsigned int ui);
-        [ :eet_node_unsigned_int_new, [ :string, :uint ], :eet_node_p ],
+        [ :eet_node_unsigned_int_new, [ :string, :uint ], :eet_node ],
         # EAPI Eet_Node * eet_node_unsigned_long_long_new(const char *name, unsigned long long l);
-        [ :eet_node_unsigned_long_long_new, [ :string, :ulong_long ], :eet_node_p ],
+        [ :eet_node_unsigned_long_long_new, [ :string, :ulong_long ], :eet_node ],
         # EAPI Eet_Node * eet_node_string_new(const char *name, const char *str);
-        [ :eet_node_string_new, [ :string, :string ], :eet_node_p ],
+        [ :eet_node_string_new, [ :string, :string ], :eet_node ],
         # EAPI Eet_Node * eet_node_inlined_string_new(const char *name, const char *str);
-        [ :eet_node_inlined_string_new, [ :string, :string ], :eet_node_p ],
+        [ :eet_node_inlined_string_new, [ :string, :string ], :eet_node ],
         # EAPI Eet_Node * eet_node_null_new(const char *name);
-        [ :eet_node_null_new, [ :string ], :eet_node_p ],
+        [ :eet_node_null_new, [ :string ], :eet_node ],
         # EAPI Eet_Node * eet_node_list_new(const char *name, Eina_List *nodes);
-        [ :eet_node_list_new, [ :string, :eina_list_p ], :eet_node_p ],
+        [ :eet_node_list_new, [ :string, :eina_list ], :eet_node ],
         # EAPI Eet_Node * eet_node_array_new(const char *name, int count, Eina_List *nodes);
-        [ :eet_node_array_new, [ :string, :int, :eina_list_p ], :eet_node_p ],
+        [ :eet_node_array_new, [ :string, :int, :eina_list ], :eet_node ],
         # EAPI Eet_Node * eet_node_var_array_new(const char *name, Eina_List *nodes);
-        [ :eet_node_var_array_new, [ :string, :eina_list_p ], :eet_node_p ],
+        [ :eet_node_var_array_new, [ :string, :eina_list ], :eet_node ],
         # EAPI Eet_Node * eet_node_hash_new(const char *name, const char *key, Eet_Node *node);
-        [ :eet_node_hash_new, [ :string, :string, :eet_node_p ], :eet_node_p ],
+        [ :eet_node_hash_new, [ :string, :string, :eet_node ], :eet_node ],
         # EAPI Eet_Node * eet_node_struct_new(const char *name, Eina_List *nodes);
-        [ :eet_node_struct_new, [ :string, :eina_list_p ], :eet_node_p ],
+        [ :eet_node_struct_new, [ :string, :eina_list ], :eet_node ],
         # EAPI Eet_Node * eet_node_struct_child_new(const char *parent, Eet_Node *child);
-        [ :eet_node_struct_child_new, [ :string, :eet_node_p ], :eet_node_p ],
+        [ :eet_node_struct_child_new, [ :string, :eet_node ], :eet_node ],
         # EAPI Eet_Node * eet_node_children_get(Eet_Node *node);
-        [ :eet_node_children_get, [ :eet_node_p ], :eet_node_p ],
+        [ :eet_node_children_get, [ :eet_node ], :eet_node ],
         # EAPI Eet_Node * eet_node_next_get(Eet_Node *node);
-        [ :eet_node_next_get, [ :eet_node_p ], :eet_node_p ],
+        [ :eet_node_next_get, [ :eet_node ], :eet_node ],
         # EAPI Eet_Node * eet_node_parent_get(Eet_Node *node);
-        [ :eet_node_parent_get, [ :eet_node_p ], :eet_node_p ],
+        [ :eet_node_parent_get, [ :eet_node ], :eet_node ],
         # EAPI void eet_node_list_append(Eet_Node *parent, const char *name, Eet_Node *child);
-        [ :eet_node_list_append, [ :eet_node_p, :string, :eet_node_p ], :void ],
+        [ :eet_node_list_append, [ :eet_node, :string, :eet_node ], :void ],
         # EAPI void eet_node_struct_append(Eet_Node *parent, const char *name, Eet_Node *child);
-        [ :eet_node_struct_append, [ :eet_node_p, :string, :eet_node_p ], :void ],
+        [ :eet_node_struct_append, [ :eet_node, :string, :eet_node ], :void ],
         # EAPI void eet_node_hash_add(Eet_Node *parent, const char *name, const char *key, Eet_Node *child);
-        [ :eet_node_hash_add, [ :eet_node_p, :string, :string, :eet_node_p ], :void ],
+        [ :eet_node_hash_add, [ :eet_node, :string, :string, :eet_node ], :void ],
         # EAPI void eet_node_dump(Eet_Node *n, int dumplevel, Eet_Dump_Callback dumpfunc, void *dumpdata);
-        [ :eet_node_dump, [ :eet_node_p, :int, :eet_dump_callback, :void_p ], :void ],
+        [ :eet_node_dump, [ :eet_node, :int, :eet_dump_callback_cb, :pointer ], :void ],
         # EAPI int eet_node_type_get(Eet_Node *node);
-        [ :eet_node_type_get, [ :eet_node_p ], :int ],
+        [ :eet_node_type_get, [ :eet_node ], :int ],
         # EAPI Eet_Node_Data * eet_node_value_get(Eet_Node *node);
-        [ :eet_node_value_get, [ :eet_node_p ], :eet_node_data_p ],
+        [ :eet_node_value_get, [ :eet_node ], :eet_node_data ],
         # EAPI void eet_node_del(Eet_Node *n);
-        [ :eet_node_del, [ :eet_node_p ], :void ],
+        [ :eet_node_del, [ :eet_node ], :void ],
         # EAPI void * eet_data_node_encode_cipher(Eet_Node *node, const char *cipher_key, int *size_ret);
-        [ :eet_data_node_encode_cipher, [ :eet_node_p, :string, :int_p ], :void_p ],
+        [ :eet_data_node_encode_cipher, [ :eet_node, :string, :pointer ], :pointer ],
         # EAPI Eet_Node * eet_data_node_decode_cipher(const void *data_in, const char *cipher_key, int size_in);
-        [ :eet_data_node_decode_cipher, [ :void_p, :string, :int ], :eet_node_p ],
+        [ :eet_data_node_decode_cipher, [ :pointer, :string, :int ], :eet_node ],
         # EAPI Eet_Node * eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *cipher_key);
-        [ :eet_data_node_read_cipher, [ :eet_file_p, :string, :string ], :eet_node_p ],
+        [ :eet_data_node_read_cipher, [ :eet_file, :string, :string ], :eet_node ],
         # EAPI int eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *cipher_key, Eet_Node *node, int compress);
-        [ :eet_data_node_write_cipher, [ :eet_file_p, :string, :string, :eet_node_p, :int ], :int ],
+        [ :eet_data_node_write_cipher, [ :eet_file, :string, :string, :eet_node, :int ], :int ],
         # EAPI void * eet_node_walk(void *parent, const char *name, Eet_Node *root, Eet_Node_Walk *cb, void *user_data);
-        [ :eet_node_walk, [ :void_p, :string, :eet_node_p, :eet_node_walk_p, :void_p ], :void_p ],
+        [ :eet_node_walk, [ :pointer, :string, :eet_node, :eet_node_walk, :pointer ], :pointer ],
         # EAPI Eet_Connection * eet_connection_new(Eet_Read_Cb *eet_read_cb, Eet_Write_Cb *eet_write_cb, const void *user_data);
-        [ :eet_connection_new, [ :eet_read_cb, :eet_write_cb, :void_p ], :eet_connection_p ],
+        [ :eet_connection_new, [ :pointer, :pointer, :pointer ], :eet_connection ],
         # EAPI int eet_connection_received(Eet_Connection *conn, const void *data, size_t size);
-        [ :eet_connection_received, [ :eet_connection_p, :void_p, :ulong ], :int ],
+        [ :eet_connection_received, [ :eet_connection, :pointer, :ulong ], :int ],
         # EAPI Eina_Bool eet_connection_send(Eet_Connection *conn, Eet_Data_Descriptor *edd, const void *data_in, const char *cipher_key);
-        [ :eet_connection_send, [ :eet_connection_p, :eet_data_descriptor_p, :void_p, :string ], :eina_bool ],
+        [ :eet_connection_send, [ :eet_connection, :eet_data_descriptor, :pointer, :string ], :bool ],
         # EAPI Eina_Bool eet_connection_node_send(Eet_Connection *conn, Eet_Node *node, const char *cipher_key);
-        [ :eet_connection_node_send, [ :eet_connection_p, :eet_node_p, :string ], :eina_bool ],
+        [ :eet_connection_node_send, [ :eet_connection, :eet_node, :string ], :bool ],
         # EAPI void * eet_connection_close(Eet_Connection *conn, Eina_Bool *on_going);
-        [ :eet_connection_close, [ :eet_connection_p, :eina_bool_p ], :void_p ],
+        [ :eet_connection_close, [ :eet_connection, :pointer ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/eina.rb b/lib/efl/native/eina.rb
index c28ae3d..cd014e9 100644
--- a/lib/efl/native/eina.rb
+++ b/lib/efl/native/eina.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module Eina
         #
-        FCT_PREFIX = 'eina_'
+        FCT_PREFIX = 'eina_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,18 +20,13 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_Version Eina_Version;
         typedef :pointer, :eina_version
-        typedef :pointer, :eina_version_p
-        #
-        # CALLBACKS
         #
         # VARIABLES
         # EAPI extern Eina_Version *eina_version;
-        attach_variable :eina_version, :eina_version_p
+        attach_variable :eina_version, :eina_version
         #
         # FUNCTIONS
         fcts = [
@@ -45,7 +39,7 @@ module Efl
         # EAPI int eina_threads_shutdown(void);
         [ :eina_threads_shutdown, [  ], :int ],
         # EAPI Eina_Bool eina_main_loop_is(void);
-        [ :eina_main_loop_is, [  ], :eina_bool ],
+        [ :eina_main_loop_is, [  ], :bool ],
         # EAPI void eina_main_loop_define(void);
         [ :eina_main_loop_define, [  ], :void ],
         ]
diff --git a/lib/efl/native/eina_hash.rb b/lib/efl/native/eina_hash.rb
index 383c182..37beff3 100644
--- a/lib/efl/native/eina_hash.rb
+++ b/lib/efl/native/eina_hash.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaHash
         #
-        FCT_PREFIX = 'eina_hash_'
+        FCT_PREFIX = 'eina_hash_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,91 +20,86 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_Hash Eina_Hash;
         typedef :pointer, :eina_hash
-        typedef :pointer, :eina_hash_p
         # typedef struct _Eina_Hash_Tuple Eina_Hash_Tuple;
         typedef :pointer, :eina_hash_tuple
         #
         # CALLBACKS
         # typedef unsigned int (*Eina_Key_Length) (const void *key);
-        callback :eina_key_length, [ :void_p ], :uint
+        callback :eina_key_length_cb, [ :pointer ], :uint
         # typedef int (*Eina_Key_Cmp) (const void *key1, int key1_length, const void *key2, int key2_length);
-        callback :eina_key_cmp, [ :void_p, :int, :void_p, :int ], :int
+        callback :eina_key_cmp_cb, [ :pointer, :int, :pointer, :int ], :int
         # typedef int (*Eina_Key_Hash) (const void *key, int key_length);
-        callback :eina_key_hash, [ :void_p, :int ], :int
+        callback :eina_key_hash_cb, [ :pointer, :int ], :int
         # typedef Eina_Bool (*Eina_Hash_Foreach) (const Eina_Hash *hash, const void *key, void *data, void *fdata);
-        callback :eina_hash_foreach, [ :eina_hash_p, :void_p, :void_p, :void_p ], :eina_bool
-        #
-        # VARIABLES
+        callback :eina_hash_foreach_cb, [ :eina_hash, :pointer, :pointer, :pointer ], :bool
         #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Hash *eina_hash_new(Eina_Key_Length key_length_cb, Eina_Key_Cmp key_cmp_cb, Eina_Key_Hash key_hash_cb, Eina_Free_Cb data_free_cb, int buckets_power_size);
-        [ :eina_hash_new, [ :eina_key_length, :eina_key_cmp, :eina_key_hash, :eina_free_cb, :int ], :eina_hash_p ],
+        [ :eina_hash_new, [ :eina_key_length_cb, :eina_key_cmp_cb, :eina_key_hash_cb, :eina_free_cb, :int ], :eina_hash ],
         # EAPI void eina_hash_free_cb_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb);
-        [ :eina_hash_free_cb_set, [ :eina_hash_p, :eina_free_cb ], :void ],
+        [ :eina_hash_free_cb_set, [ :eina_hash, :eina_free_cb ], :void ],
         # EAPI Eina_Hash *eina_hash_string_djb2_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_djb2_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_djb2_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_superfast_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_superfast_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_string_small_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_small_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_small_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_int32_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_int32_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_int32_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_int64_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_int64_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_int64_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_pointer_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_pointer_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_stringshared_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_stringshared_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_stringshared_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Bool eina_hash_add(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_add, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_add, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_direct_add(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_direct_add, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_direct_add, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_del, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI void *eina_hash_find(const Eina_Hash *hash, const void *key);
-        [ :eina_hash_find, [ :eina_hash_p, :void_p ], :void_p ],
+        [ :eina_hash_find, [ :eina_hash, :pointer ], :pointer ],
         # EAPI void *eina_hash_modify(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_modify, [ :eina_hash_p, :void_p, :void_p ], :void_p ],
+        [ :eina_hash_modify, [ :eina_hash, :pointer, :pointer ], :pointer ],
         # EAPI void *eina_hash_set(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_set, [ :eina_hash_p, :void_p, :void_p ], :void_p ],
+        [ :eina_hash_set, [ :eina_hash, :pointer, :pointer ], :pointer ],
         # EAPI Eina_Bool eina_hash_move(Eina_Hash *hash, const void *old_key, const void *new_key);
-        [ :eina_hash_move, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_move, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI void eina_hash_free(Eina_Hash *hash);
-        [ :eina_hash_free, [ :eina_hash_p ], :void ],
+        [ :eina_hash_free, [ :eina_hash ], :void ],
         # EAPI void eina_hash_free_buckets(Eina_Hash *hash);
-        [ :eina_hash_free_buckets, [ :eina_hash_p ], :void ],
+        [ :eina_hash_free_buckets, [ :eina_hash ], :void ],
         # EAPI int eina_hash_population(const Eina_Hash *hash);
-        [ :eina_hash_population, [ :eina_hash_p ], :int ],
+        [ :eina_hash_population, [ :eina_hash ], :int ],
         # EAPI Eina_Bool eina_hash_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_add_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_add_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_direct_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_direct_add_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_direct_add_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash);
-        [ :eina_hash_del_by_key_hash, [ :eina_hash_p, :void_p, :int, :int ], :eina_bool ],
+        [ :eina_hash_del_by_key_hash, [ :eina_hash, :pointer, :int, :int ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_key(Eina_Hash *hash, const void *key);
-        [ :eina_hash_del_by_key, [ :eina_hash_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_key, [ :eina_hash, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_data(Eina_Hash *hash, const void *data);
-        [ :eina_hash_del_by_data, [ :eina_hash_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_data, [ :eina_hash, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_del_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI void *eina_hash_find_by_hash(const Eina_Hash *hash, const void *key, int key_length, int key_hash);
-        [ :eina_hash_find_by_hash, [ :eina_hash_p, :void_p, :int, :int ], :void_p ],
+        [ :eina_hash_find_by_hash, [ :eina_hash, :pointer, :int, :int ], :pointer ],
         # EAPI void *eina_hash_modify_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_modify_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :void_p ],
+        [ :eina_hash_modify_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_key_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_key_new, [ :eina_hash_p ], :eina_iterator_p ],
+        [ :eina_hash_iterator_key_new, [ :eina_hash ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_data_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_data_new, [ :eina_hash_p ], :eina_iterator_p ],
+        [ :eina_hash_iterator_data_new, [ :eina_hash ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_tuple_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_tuple_new, [ :eina_hash_p ], :eina_iterator_p ],
+        [ :eina_hash_iterator_tuple_new, [ :eina_hash ], :pointer ],
         # EAPI void eina_hash_foreach(const Eina_Hash *hash, Eina_Hash_Foreach func, const void *fdata);
-        [ :eina_hash_foreach, [ :eina_hash_p, :eina_hash_foreach, :void_p ], :void ],
+        [ :eina_hash_foreach, [ :eina_hash, :eina_hash_foreach_cb, :pointer ], :void ],
         # EAPI int eina_hash_superfast(const char *key, int len);
         [ :eina_hash_superfast, [ :string, :int ], :int ],
         ]
diff --git a/lib/efl/native/eina_list.rb b/lib/efl/native/eina_list.rb
index 35a179a..37f6529 100644
--- a/lib/efl/native/eina_list.rb
+++ b/lib/efl/native/eina_list.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaList
         #
-        FCT_PREFIX = 'eina_list_'
+        FCT_PREFIX = 'eina_list_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,88 +20,80 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_List Eina_List;
         typedef :pointer, :eina_list
-        typedef :pointer, :eina_list_p
-        typedef :pointer, :eina_list_pp
         # typedef struct _Eina_List_Accounting Eina_List_Accounting;
         typedef :pointer, :eina_list_accounting
         #
-        # CALLBACKS
-        #
-        # VARIABLES
-        #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_List *eina_list_append(Eina_List *list, const void *data);
-        [ :eina_list_append, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_append, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend(Eina_List *list, const void *data);
-        [ :eina_list_prepend, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_prepend, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_append_relative(Eina_List *list, const void *data, const void *relative);
-        [ :eina_list_append_relative, [ :eina_list_p, :void_p, :void_p ], :eina_list_p ],
+        [ :eina_list_append_relative, [ :eina_list, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_append_relative_list(Eina_List *list, const void *data, Eina_List *relative);
-        [ :eina_list_append_relative_list, [ :eina_list_p, :void_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_append_relative_list, [ :eina_list, :pointer, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend_relative(Eina_List *list, const void *data, const void *relative);
-        [ :eina_list_prepend_relative, [ :eina_list_p, :void_p, :void_p ], :eina_list_p ],
+        [ :eina_list_prepend_relative, [ :eina_list, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend_relative_list(Eina_List *list, const void *data, Eina_List *relative);
-        [ :eina_list_prepend_relative_list, [ :eina_list_p, :void_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_prepend_relative_list, [ :eina_list, :pointer, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_sorted_insert(Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_sorted_insert, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_sorted_insert, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_remove(Eina_List *list, const void *data);
-        [ :eina_list_remove, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_remove, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_remove_list(Eina_List *list, Eina_List *remove_list);
-        [ :eina_list_remove_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_remove_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_promote_list(Eina_List *list, Eina_List *move_list);
-        [ :eina_list_promote_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_promote_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_demote_list(Eina_List *list, Eina_List *move_list);
-        [ :eina_list_demote_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_demote_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI void *eina_list_data_find(const Eina_List *list, const void *data);
-        [ :eina_list_data_find, [ :eina_list_p, :void_p ], :void_p ],
+        [ :eina_list_data_find, [ :eina_list, :pointer ], :pointer ],
         # EAPI Eina_List *eina_list_data_find_list(const Eina_List *list, const void *data);
-        [ :eina_list_data_find_list, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_data_find_list, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_Bool eina_list_move(Eina_List **to, Eina_List **from, void *data);
-        [ :eina_list_move, [ :eina_list_pp, :eina_list_pp, :void_p ], :eina_bool ],
+        [ :eina_list_move, [ :eina_list, :eina_list, :pointer ], :bool ],
         # EAPI Eina_Bool eina_list_move_list(Eina_List **to, Eina_List **from, Eina_List *data);
-        [ :eina_list_move_list, [ :eina_list_pp, :eina_list_pp, :eina_list_p ], :eina_bool ],
+        [ :eina_list_move_list, [ :eina_list, :eina_list, :eina_list ], :bool ],
         # EAPI Eina_List *eina_list_free(Eina_List *list);
-        [ :eina_list_free, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_free, [ :eina_list ], :eina_list ],
         # EAPI void *eina_list_nth(const Eina_List *list, unsigned int n);
-        [ :eina_list_nth, [ :eina_list_p, :uint ], :void_p ],
+        [ :eina_list_nth, [ :eina_list, :uint ], :pointer ],
         # EAPI Eina_List *eina_list_nth_list(const Eina_List *list, unsigned int n);
-        [ :eina_list_nth_list, [ :eina_list_p, :uint ], :eina_list_p ],
+        [ :eina_list_nth_list, [ :eina_list, :uint ], :eina_list ],
         # EAPI Eina_List *eina_list_reverse(Eina_List *list);
-        [ :eina_list_reverse, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_reverse, [ :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_reverse_clone(const Eina_List *list);
-        [ :eina_list_reverse_clone, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_reverse_clone, [ :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_clone(const Eina_List *list);
-        [ :eina_list_clone, [ :eina_list_p ], :eina_list_p ],
-        # EAPI Eina_List *eina_list_sort(Eina_List *list, unsigned int size, Eina_Compare_Cb func);
-        [ :eina_list_sort, [ :eina_list_p, :uint, :eina_compare_cb ], :eina_list_p ],
+        [ :eina_list_clone, [ :eina_list ], :eina_list ],
+        # EAPI Eina_List *eina_list_sort(Eina_List *list, unsigned int limit, Eina_Compare_Cb func);
+        [ :eina_list_sort, [ :eina_list, :uint, :eina_compare_cb ], :eina_list ],
         # EAPI Eina_List *eina_list_merge(Eina_List *left, Eina_List *right);
-        [ :eina_list_merge, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_merge, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_sorted_merge(Eina_List *left, Eina_List *right, Eina_Compare_Cb func);
-        [ :eina_list_sorted_merge, [ :eina_list_p, :eina_list_p, :eina_compare_cb ], :eina_list_p ],
+        [ :eina_list_sorted_merge, [ :eina_list, :eina_list, :eina_compare_cb ], :eina_list ],
         # EAPI Eina_List *eina_list_split_list(Eina_List *list, Eina_List *relative, Eina_List **right);
-        [ :eina_list_split_list, [ :eina_list_p, :eina_list_p, :eina_list_pp ], :eina_list_p ],
+        [ :eina_list_split_list, [ :eina_list, :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data, int *result_cmp);
-        [ :eina_list_search_sorted_near_list, [ :eina_list_p, :eina_compare_cb, :void_p, :int_p ], :eina_list_p ],
+        [ :eina_list_search_sorted_near_list, [ :eina_list, :eina_compare_cb, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_search_sorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_sorted_list, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_search_sorted_list, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI void *eina_list_search_sorted(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_sorted, [ :eina_list_p, :eina_compare_cb, :void_p ], :void_p ],
+        [ :eina_list_search_sorted, [ :eina_list, :eina_compare_cb, :pointer ], :pointer ],
         # EAPI Eina_List *eina_list_search_unsorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_unsorted_list, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_search_unsorted_list, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI void *eina_list_search_unsorted(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_unsorted, [ :eina_list_p, :eina_compare_cb, :void_p ], :void_p ],
+        [ :eina_list_search_unsorted, [ :eina_list, :eina_compare_cb, :pointer ], :pointer ],
         # EAPI Eina_Iterator *eina_list_iterator_new(const Eina_List *list);
-        [ :eina_list_iterator_new, [ :eina_list_p ], :eina_iterator_p ],
+        [ :eina_list_iterator_new, [ :eina_list ], :pointer ],
         # EAPI Eina_Iterator *eina_list_iterator_reversed_new(const Eina_List *list);
-        [ :eina_list_iterator_reversed_new, [ :eina_list_p ], :eina_iterator_p ],
+        [ :eina_list_iterator_reversed_new, [ :eina_list ], :pointer ],
         # EAPI Eina_Accessor *eina_list_accessor_new(const Eina_List *list);
-        [ :eina_list_accessor_new, [ :eina_list_p ], :eina_accessor_p ],
+        [ :eina_list_accessor_new, [ :eina_list ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/eina_log.rb b/lib/efl/native/eina_log.rb
index 0aab2ec..f200485 100644
--- a/lib/efl/native/eina_log.rb
+++ b/lib/efl/native/eina_log.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaLog
         #
-        FCT_PREFIX = 'eina_log_'
+        FCT_PREFIX = 'eina_log_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -23,17 +22,16 @@ module Efl
         #
         # ENUMS
         # typedef enum _Eina_Log_Level {...} Eina_Log_Level;
-        enum :eina_log_level, [ :eina_log_level_critical, :eina_log_level_err, :eina_log_level_warn, :eina_log_level_info, :eina_log_level_dbg, :eina_log_levels,
-            :eina_log_level_unknown ]
+        enum :eina_log_level, [ :eina_log_level_critical, 0, :eina_log_level_err, 1, :eina_log_level_warn, 2, :eina_log_level_info, 3,
+            :eina_log_level_dbg, 4, :eina_log_levels, 5, :eina_log_level_unknown, (-2147483647-1) ]
         #
         # TYPEDEFS
         # typedef struct _Eina_Log_Domain Eina_Log_Domain;
         typedef :pointer, :eina_log_domain
-        typedef :pointer, :eina_log_domain_p
         #
         # CALLBACKS
         # typedef void (*Eina_Log_Print_Cb) (const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        callback :eina_log_print_cb, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void
+        callback :eina_log_print_cb, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void
         #
         # VARIABLES
         # EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
@@ -44,29 +42,29 @@ module Efl
         # EAPI void eina_log_threads_enable(void);
         [ :eina_log_threads_enable, [  ], :void ],
         # EAPI void eina_log_print_cb_set(Eina_Log_Print_Cb cb, void *data);
-        [ :eina_log_print_cb_set, [ :eina_log_print_cb, :void_p ], :void ],
+        [ :eina_log_print_cb_set, [ :eina_log_print_cb, :pointer ], :void ],
         # EAPI void eina_log_level_set(int level);
         [ :eina_log_level_set, [ :int ], :void ],
         # EAPI int eina_log_level_get(void);
         [ :eina_log_level_get, [  ], :int ],
         # EAPI Eina_Bool eina_log_main_thread_check(void);
-        [ :eina_log_main_thread_check, [  ], :eina_bool ],
+        [ :eina_log_main_thread_check, [  ], :bool ],
         # EAPI void eina_log_color_disable_set(Eina_Bool disabled);
-        [ :eina_log_color_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_color_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_color_disable_get(void);
-        [ :eina_log_color_disable_get, [  ], :eina_bool ],
+        [ :eina_log_color_disable_get, [  ], :bool ],
         # EAPI void eina_log_file_disable_set(Eina_Bool disabled);
-        [ :eina_log_file_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_file_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_file_disable_get(void);
-        [ :eina_log_file_disable_get, [  ], :eina_bool ],
+        [ :eina_log_file_disable_get, [  ], :bool ],
         # EAPI void eina_log_function_disable_set(Eina_Bool disabled);
-        [ :eina_log_function_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_function_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_function_disable_get(void);
-        [ :eina_log_function_disable_get, [  ], :eina_bool ],
+        [ :eina_log_function_disable_get, [  ], :bool ],
         # EAPI void eina_log_abort_on_critical_set(Eina_Bool abort_on_critical);
-        [ :eina_log_abort_on_critical_set, [ :eina_bool ], :void ],
+        [ :eina_log_abort_on_critical_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_abort_on_critical_get(void);
-        [ :eina_log_abort_on_critical_get, [  ], :eina_bool ],
+        [ :eina_log_abort_on_critical_get, [  ], :bool ],
         # EAPI void eina_log_abort_on_critical_level_set(int critical_level);
         [ :eina_log_abort_on_critical_level_set, [ :int ], :void ],
         # EAPI int eina_log_abort_on_critical_level_get(void);
@@ -86,11 +84,11 @@ module Efl
         # EAPI void eina_log_vprint(int domain, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, va_list args);
         [ :eina_log_vprint, [ :int, :eina_log_level, :string, :string, :int, :string, :pointer ], :void ],
         # EAPI void eina_log_print_cb_stdout(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_stdout, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_stdout, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         # EAPI void eina_log_print_cb_stderr(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_stderr, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_stderr, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         # EAPI void eina_log_print_cb_file(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_file, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_file, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/eina_types.rb b/lib/efl/native/eina_types.rb
index 16e3b48..47ab4e7 100644
--- a/lib/efl/native/eina_types.rb
+++ b/lib/efl/native/eina_types.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module Eina
         #
-        FCT_PREFIX = 'eina_'
+        FCT_PREFIX = 'eina_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,22 +20,17 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef unsigned char Eina_Bool;
         typedef :bool, :eina_bool
-        typedef :pointer, :eina_bool_p
         #
         # CALLBACKS
         # typedef int (*Eina_Compare_Cb) (const void *data1, const void *data2);
-        callback :eina_compare_cb, [ :void_p, :void_p ], :int
+        callback :eina_compare_cb, [ :pointer, :pointer ], :int
         # typedef Eina_Bool (*Eina_Each_Cb) (const void *container, void *data, void *fdata);
-        callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool
+        callback :eina_each_cb, [ :pointer, :pointer, :pointer ], :bool
         # typedef void (*Eina_Free_Cb) (void *data);
-        callback :eina_free_cb, [ :void_p ], :void
-        #
-        # VARIABLES
+        callback :eina_free_cb, [ :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
diff --git a/lib/efl/native/eina_xattr.rb b/lib/efl/native/eina_xattr.rb
index f16f0fd..f2f0e88 100644
--- a/lib/efl/native/eina_xattr.rb
+++ b/lib/efl/native/eina_xattr.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaXattr
         #
-        FCT_PREFIX = 'eina_xattr_'
+        FCT_PREFIX = 'eina_xattr_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -26,31 +25,35 @@ module Efl
         enum :eina_xattr_flags, [ :eina_xattr_insert, :eina_xattr_replace, :eina_xattr_created ]
         #
         # TYPEDEFS
-        #
-        # CALLBACKS
-        #
-        # VARIABLES
+        # typedef struct _Eina_Xattr Eina_Xattr;
+        typedef :pointer, :eina_xattr
         #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Iterator *eina_xattr_ls(const char *file);
-        [ :eina_xattr_ls, [ :string ], :eina_iterator_p ],
+        [ :eina_xattr_ls, [ :string ], :pointer ],
+        # EAPI Eina_Iterator *eina_xattr_value_ls(const char *file);
+        [ :eina_xattr_value_ls, [ :string ], :pointer ],
+        # EAPI Eina_Iterator *eina_xattr_fd_ls(int fd);
+        [ :eina_xattr_fd_ls, [ :int ], :pointer ],
+        # EAPI Eina_Iterator *eina_xattr_value_fd_ls(int fd);
+        [ :eina_xattr_value_fd_ls, [ :int ], :pointer ],
         # EAPI void *eina_xattr_get(const char *file, const char *attribute, ssize_t *size);
-        [ :eina_xattr_get, [ :string, :string, :long_p ], :void_p ],
+        [ :eina_xattr_get, [ :string, :string, :pointer ], :pointer ],
         # EAPI Eina_Bool eina_xattr_set(const char *file, const char *attribute, const void *data, ssize_t length, Eina_Xattr_Flags flags);
-        [ :eina_xattr_set, [ :string, :string, :void_p, :long, :eina_xattr_flags ], :eina_bool ],
+        [ :eina_xattr_set, [ :string, :string, :pointer, :long, :eina_xattr_flags ], :bool ],
         # EAPI Eina_Bool eina_xattr_string_set(const char *file, const char *attribute, const char *data, Eina_Xattr_Flags flags);
-        [ :eina_xattr_string_set, [ :string, :string, :string, :eina_xattr_flags ], :eina_bool ],
+        [ :eina_xattr_string_set, [ :string, :string, :string, :eina_xattr_flags ], :bool ],
         # EAPI char *eina_xattr_string_get(const char *file, const char *attribute);
         [ :eina_xattr_string_get, [ :string, :string ], :string ],
         # EAPI Eina_Bool eina_xattr_double_set(const char *file, const char *attribute, double value, Eina_Xattr_Flags flags);
-        [ :eina_xattr_double_set, [ :string, :string, :double, :eina_xattr_flags ], :eina_bool ],
+        [ :eina_xattr_double_set, [ :string, :string, :double, :eina_xattr_flags ], :bool ],
         # EAPI Eina_Bool eina_xattr_double_get(const char *file, const char *attribute, double *value);
-        [ :eina_xattr_double_get, [ :string, :string, :double_p ], :eina_bool ],
+        [ :eina_xattr_double_get, [ :string, :string, :pointer ], :bool ],
         # EAPI Eina_Bool eina_xattr_int_set(const char *file, const char *attribute, int value, Eina_Xattr_Flags flags);
-        [ :eina_xattr_int_set, [ :string, :string, :int, :eina_xattr_flags ], :eina_bool ],
+        [ :eina_xattr_int_set, [ :string, :string, :int, :eina_xattr_flags ], :bool ],
         # EAPI Eina_Bool eina_xattr_int_get(const char *file, const char *attribute, int *value);
-        [ :eina_xattr_int_get, [ :string, :string, :int_p ], :eina_bool ],
+        [ :eina_xattr_int_get, [ :string, :string, :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elementary.rb b/lib/efl/native/elementary.rb
index e339801..1bba9d0 100644
--- a/lib/efl/native/elementary.rb
+++ b/lib/efl/native/elementary.rb
@@ -1,3506 +1,37 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
-require 'efl/native/evas'
-require 'efl/native/edje'
-require 'efl/native/emap'
-require 'efl/native/eina_list'
+require 'efl/native'
+require 'efl/native/elm/elm_general'
+require 'efl/native/elm/elm_tooltip'
 #
 module Efl
     #
     module Elm
         #
-        FCT_PREFIX = 'elm_'
+        FCT_PREFIX = 'elm_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
     #
     module Native
         #
-        ffi_lib 'libelementary-ver-pre-svn-09.so.0'
-        #
-        # ENUMS
-        # typedef enum _Elm_Object_Layer {...} Elm_Object_Layer;
-        enum :elm_object_layer, [ :elm_object_layer_background, :elm_object_layer_default, 0, :elm_object_layer_focus, :elm_object_layer_tooltip,
-            :elm_object_layer_cursor, :elm_object_layer_last ]
-        # typedef enum _Elm_Policy {...} Elm_Policy;
-        enum :elm_policy, [ :elm_policy_quit, :elm_policy_last ]
-        # typedef enum _Elm_Policy_Quit {...} Elm_Policy_Quit;
-        enum :elm_policy_quit, [ :elm_policy_quit_none, 0, :elm_policy_quit_last_window_closed ]
-        # typedef enum _Elm_Focus_Direction {...} Elm_Focus_Direction;
-        enum :elm_focus_direction, [ :elm_focus_previous, :elm_focus_next ]
-        # typedef enum _Elm_Text_Format {...} Elm_Text_Format;
-        enum :elm_text_format, [ :elm_text_format_plain_utf8, :elm_text_format_markup_utf8 ]
-        typedef :pointer, :elm_text_format_p
-        # typedef enum _Elm_Wrap_Type {...} Elm_Wrap_Type;
-        enum :elm_wrap_type, [ :elm_wrap_none, 0, :elm_wrap_char, :elm_wrap_word, :elm_wrap_mixed, :elm_wrap_last ]
-        # typedef enum {...} Elm_Input_Panel_Layout;
-        enum :elm_input_panel_layout, [ :elm_input_panel_layout_normal, :elm_input_panel_layout_number, :elm_input_panel_layout_email, :elm_input_panel_layout_url,
-            :elm_input_panel_layout_phonenumber, :elm_input_panel_layout_ip, :elm_input_panel_layout_month, :elm_input_panel_layout_numberonly, :elm_input_panel_layout_invalid ]
-        # typedef enum {...} Elm_Autocapital_Type;
-        enum :elm_autocapital_type, [ :elm_autocapital_type_none, :elm_autocapital_type_word, :elm_autocapital_type_sentence, :elm_autocapital_type_allcharacter ]
-        # typedef enum _Elm_Win_Type {...} Elm_Win_Type;
-        enum :elm_win_type, [ :elm_win_basic, :elm_win_dialog_basic, :elm_win_desktop, :elm_win_dock, :m, :elm_win_toolbar, :elm_win_menu, :elm_win_utility,
-            :elm_win_splash, :elm_win_dropdown_menu, :elm_win_popup_menu, :elm_win_tooltip, :t, :elm_win_notification, :elm_win_combo, :elm_win_dnd, :elm_win_inlined_image, :t, :e,
-            :e ]
-        # typedef enum _Elm_Win_Keyboard_Mode {...} Elm_Win_Keyboard_Mode;
-        enum :elm_win_keyboard_mode, [ :elm_win_keyboard_unknown, :elm_win_keyboard_off, :elm_win_keyboard_on, :elm_win_keyboard_alpha, :elm_win_keyboard_numeric,
-            :elm_win_keyboard_pin, :elm_win_keyboard_phone_number, :elm_win_keyboard_hex, :elm_win_keyboard_terminal, :elm_win_keyboard_password, :elm_win_keyboard_ip,
-            :elm_win_keyboard_host, :elm_win_keyboard_file, :elm_win_keyboard_url, :elm_win_keyboard_keypad, :elm_win_keyboard_j2me ]
-        # typedef enum _Elm_Illume_Command {...} Elm_Illume_Command;
-        enum :elm_illume_command, [ :elm_illume_command_focus_back, :elm_illume_command_focus_forward, :elm_illume_command_focus_home, :elm_illume_command_close ]
-        # typedef enum _Elm_Bg_Option {...} Elm_Bg_Option;
-        enum :elm_bg_option, [ :elm_bg_option_center, :elm_bg_option_scale, :elm_bg_option_stretch, :elm_bg_option_tile ]
-        # typedef enum _Elm_Icon_Type {...} Elm_Icon_Type;
-        enum :elm_icon_type, [ :elm_icon_none, :elm_icon_file, :elm_icon_standard ]
-        typedef :pointer, :elm_icon_type_p
-        # typedef enum _Elm_Icon_Lookup_Order {...} Elm_Icon_Lookup_Order;
-        enum :elm_icon_lookup_order, [ :elm_icon_lookup_fdo_theme, :elm_icon_lookup_theme_fdo, :elm_icon_lookup_fdo, :elm_icon_lookup_theme ]
-        # typedef enum _Elm_Image_Orient {...} Elm_Image_Orient;
-        enum :elm_image_orient, [ :elm_image_orient_none, 0, :elm_image_orient_0, 0, :elm_image_rotate_90, 1, :elm_image_rotate_180, 2, :elm_image_rotate_270, 3,
-            :elm_image_flip_horizontal, 4, :elm_image_flip_vertical, 5, :elm_image_flip_transpose, 6, :elm_image_flip_transverse, 7 ]
-        # typedef enum _Elm_GLView_Mode {...} Elm_GLView_Mode;
-        enum :elm_glview_mode, [ :elm_glview_alpha, 1, :elm_glview_depth, 2, :elm_glview_stencil, 4 ]
-        # typedef enum _Elm_GLView_Resize_Policy {...} Elm_GLView_Resize_Policy;
-        enum :elm_glview_resize_policy, [ :elm_glview_resize_policy_recreate, 1, :elm_glview_resize_policy_scale, 2 ]
-        # typedef enum _Elm_GLView_Render_Policy {...} Elm_GLView_Render_Policy;
-        enum :elm_glview_render_policy, [ :elm_glview_render_policy_on_demand, 1, :elm_glview_render_policy_always, 2 ]
-        # typedef enum _Elm_Scroller_Policy {...} Elm_Scroller_Policy;
-        enum :elm_scroller_policy, [ :elm_scroller_policy_auto, 0, :elm_scroller_policy_on, :elm_scroller_policy_off, :elm_scroller_policy_last ]
-        typedef :pointer, :elm_scroller_policy_p
-        # typedef enum _Elm_Clock_Digedit {...} Elm_Clock_Digedit;
-        enum :elm_clock_digedit, [ :elm_clock_none, 0, :elm_clock_hour_decimal, 1, :elm_clock_hour_unit, 1, :elm_clock_min_decimal, 1, :elm_clock_min_unit, 1,
-            :elm_clock_sec_decimal, 1, :elm_clock_sec_unit, 1, :elm_clock_all ]
-        # typedef enum _Elm_Notify_Orient {...} Elm_Notify_Orient;
-        enum :elm_notify_orient, [ :elm_notify_orient_top, :elm_notify_orient_center, :elm_notify_orient_bottom, :elm_notify_orient_left, :elm_notify_orient_right,
-            :elm_notify_orient_top_left, :elm_notify_orient_top_right, :elm_notify_orient_bottom_left, :elm_notify_orient_bottom_right, :elm_notify_orient_last ]
-        # typedef enum _Elm_Hover_Axis {...} Elm_Hover_Axis;
-        enum :elm_hover_axis, [ :elm_hover_axis_none, :elm_hover_axis_horizontal, :elm_hover_axis_vertical, :elm_hover_axis_both ]
-        # typedef enum _Elm_Gesture_Types { ELM_GESTURE_FIRST = 0, ELM_GESTURE_N_TAPS, ELM_GESTURE_N_LONG_TAPS, ELM_GESTURE_N_DOUBLE_TAPS, ELM_GESTURE_N_TRIPLE_TAPS, ELM_GESTURE_MOMENTUM, ELM_GESTURE_N_LINES, ELM_GESTURE_N_FLICKS, ELM_GESTURE_ZOOM, ELM_GESTURE_ROTATE, ELM_GESTURE_LAST } Elm_Gesture_Types
-        # FIXME
-        # typedef enum _Elm_Gesture_State { ELM_GESTURE_STATE_UNDEFINED = -1, ELM_GESTURE_STATE_START, ELM_GESTURE_STATE_MOVE, ELM_GESTURE_STATE_END, ELM_GESTURE_STATE_ABORT } Elm_Gesture_State
-        # FIXME
-        # typedef enum _Elm_Thumb_Animation_Setting {...} Elm_Thumb_Animation_Setting;
-        enum :elm_thumb_animation_setting, [ :elm_thumb_animation_start, 0, :elm_thumb_animation_loop, :elm_thumb_animation_stop, :elm_thumb_animation_last ]
-        # typedef enum _Elm_Web_Menu_Item_Type {...} Elm_Web_Menu_Item_Type;
-        enum :elm_web_menu_item_type, [ :elm_web_menu_separator, :elm_web_menu_group, :elm_web_menu_option ]
-        # typedef enum _Elm_Web_Zoom_Mode {...} Elm_Web_Zoom_Mode;
-        enum :elm_web_zoom_mode, [ :elm_web_zoom_mode_manual, 0, :elm_web_zoom_mode_auto_fit, :elm_web_zoom_mode_auto_fill, :elm_web_zoom_mode_last ]
-        # typedef enum _Elm_Toolbar_Shrink_Mode {...} Elm_Toolbar_Shrink_Mode;
-        enum :elm_toolbar_shrink_mode, [ :elm_toolbar_shrink_none, :elm_toolbar_shrink_hide, :elm_toolbar_shrink_scroll, :elm_toolbar_shrink_menu,
-            :elm_toolbar_shrink_last ]
-        # typedef enum _Elm_List_Mode {...} Elm_List_Mode;
-        enum :elm_list_mode, [ :elm_list_compress, 0, :elm_list_scroll, :elm_list_limit, :elm_list_expand, :elm_list_last ]
-        # typedef enum _Elm_Actionslider_Pos {...} Elm_Actionslider_Pos;
-        enum :elm_actionslider_pos, [ :elm_actionslider_none, 0, :elm_actionslider_left, 1, :elm_actionslider_center, 2, :elm_actionslider_right, 4, :elm_actionslider_all, 7
-            ]
-        # typedef enum _Elm_Genlist_Item_Flags {...} Elm_Genlist_Item_Flags;
-        enum :elm_genlist_item_flags, [ :elm_genlist_item_none, 0, :elm_genlist_item_subitems, :elm_genlist_item_group ]
-        # typedef enum _Elm_Genlist_Item_Field_Flags {...} Elm_Genlist_Item_Field_Flags;
-        enum :elm_genlist_item_field_flags, [ :elm_genlist_item_field_all, 0, :elm_genlist_item_field_label, :elm_genlist_item_field_content,
-            :elm_genlist_item_field_state ]
-        # typedef enum _Elm_Fileselector_Mode {...} Elm_Fileselector_Mode;
-        enum :elm_fileselector_mode, [ :elm_fileselector_list, 0, :elm_fileselector_grid, :elm_fileselector_last ]
-        # typedef enum _Elm_Photocam_Zoom_Mode {...} Elm_Photocam_Zoom_Mode;
-        enum :elm_photocam_zoom_mode, [ :elm_photocam_zoom_mode_manual, 0, :elm_photocam_zoom_mode_auto_fit, :elm_photocam_zoom_mode_auto_fill,
-            :elm_photocam_zoom_mode_auto_fit_in, :elm_photocam_zoom_mode_last ]
-        # typedef enum _Elm_Map_Zoom_Mode {...} Elm_Map_Zoom_Mode;
-        enum :elm_map_zoom_mode, [ :elm_map_zoom_mode_manual, :elm_map_zoom_mode_auto_fit, :elm_map_zoom_mode_auto_fill, :elm_map_zoom_mode_last ]
-        # typedef enum _Elm_Map_Route_Sources {...} Elm_Map_Route_Sources;
-        enum :elm_map_route_sources, [ :elm_map_route_source_yours, :elm_map_route_source_monav, :elm_map_route_source_ors, :elm_map_route_source_last ]
-        # typedef enum _Elm_Map_Name_Sources {...} Elm_Map_Name_Sources;
-        enum :elm_map_name_sources, [ :elm_map_name_source_nominatim, :elm_map_name_source_last ]
-        # typedef enum _Elm_Map_Route_Type {...} Elm_Map_Route_Type;
-        enum :elm_map_route_type, [ :elm_map_route_type_motocar, :elm_map_route_type_bicycle, :elm_map_route_type_foot, :elm_map_route_type_last ]
-        # typedef enum _Elm_Map_Route_Method {...} Elm_Map_Route_Method;
-        enum :elm_map_route_method, [ :elm_map_route_method_fastest, :elm_map_route_method_shortest, :elm_map_route_method_last ]
-        # typedef enum _Elm_Map_Name_Method {...} Elm_Map_Name_Method;
-        enum :elm_map_name_method, [ :elm_map_name_method_search, :elm_map_name_method_reverse, :elm_map_name_method_last ]
-        # typedef enum _Elm_Panel_Orient {...} Elm_Panel_Orient;
-        enum :elm_panel_orient, [ :elm_panel_orient_top, :elm_panel_orient_bottom, :elm_panel_orient_left, :elm_panel_orient_right ]
-        # typedef enum _Elm_Flip_Mode {...} Elm_Flip_Mode;
-        enum :elm_flip_mode, [ :elm_flip_rotate_y_center_axis, :elm_flip_rotate_x_center_axis, :elm_flip_rotate_xz_center_axis, :elm_flip_rotate_yz_center_axis,
-            :elm_flip_cube_left, :elm_flip_cube_right, :elm_flip_cube_up, :elm_flip_cube_down, :elm_flip_page_left, :elm_flip_page_right, :elm_flip_page_up, :elm_flip_page_down ]
-        # typedef enum _Elm_Flip_Interaction {...} Elm_Flip_Interaction;
-        enum :elm_flip_interaction, [ :elm_flip_interaction_none, :elm_flip_interaction_rotate, :elm_flip_interaction_cube, :elm_flip_interaction_page ]
-        # typedef enum _Elm_Flip_Direction {...} Elm_Flip_Direction;
-        enum :elm_flip_direction, [ :elm_flip_direction_up, :elm_flip_direction_down, :elm_flip_direction_left, :elm_flip_direction_right ]
-        # typedef enum _Elm_Calendar_Mark_Repeat {...} Elm_Calendar_Mark_Repeat;
-        enum :elm_calendar_mark_repeat, [ :elm_calendar_unique, :elm_calendar_daily, :elm_calendar_weekly, :elm_calendar_monthly, :elm_calendar_annually ]
-        # typedef enum _Elm_Ctxpopup_Direction {...} Elm_Ctxpopup_Direction;
-        enum :elm_ctxpopup_direction, [ :elm_ctxpopup_direction_down, :elm_ctxpopup_direction_right, :elm_ctxpopup_direction_left, :elm_ctxpopup_direction_up,
-            :elm_ctxpopup_direction_unknown ]
-        typedef :pointer, :elm_ctxpopup_direction_p
-        # typedef enum {...} Elm_Transit_Tween_Mode;
-        enum :elm_transit_tween_mode, [ :elm_transit_tween_mode_linear, :elm_transit_tween_mode_sinusoidal, :elm_transit_tween_mode_decelerate,
-            :elm_transit_tween_mode_accelerate ]
-        # typedef enum {...} Elm_Transit_Effect_Flip_Axis;
-        enum :elm_transit_effect_flip_axis, [ :elm_transit_effect_flip_axis_x, :elm_transit_effect_flip_axis_y ]
-        # typedef enum {...} Elm_Transit_Effect_Wipe_Dir;
-        enum :elm_transit_effect_wipe_dir, [ :elm_transit_effect_wipe_dir_left, :elm_transit_effect_wipe_dir_right, :elm_transit_effect_wipe_dir_up,
-            :elm_transit_effect_wipe_dir_down ]
-        # typedef enum {...} Elm_Transit_Effect_Wipe_Type;
-        enum :elm_transit_effect_wipe_type, [ :elm_transit_effect_wipe_type_hide, :elm_transit_effect_wipe_type_show ]
-        # typedef enum {...} Elm_Store_Item_Mapping_Type;
-        enum :elm_store_item_mapping_type, [ :elm_store_item_mapping_none, 0, :elm_store_item_mapping_label, :elm_store_item_mapping_state, :elm_store_item_mapping_icon,
-            :elm_store_item_mapping_photo, :elm_store_item_mapping_custom, :elm_store_item_mapping_last ]
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
         #
         # TYPEDEFS
         # typedef struct _Elm_Version Elm_Version;
         typedef :pointer, :elm_version
-        typedef :pointer, :elm_version_p
-        # typedef struct _Elm_Event_Policy_Changed Elm_Event_Policy_Changed;
-        typedef :pointer, :elm_event_policy_changed
-        # typedef struct _Elm_Object_Item Elm_Object_Item;
-        typedef :pointer, :elm_object_item
-        typedef :pointer, :elm_object_item_p
-        # typedef struct _Elm_Text_Class Elm_Text_Class;
-        typedef :pointer, :elm_text_class
-        # typedef struct _Elm_Font_Overlay Elm_Font_Overlay;
-        typedef :pointer, :elm_font_overlay
-        # typedef struct _Elm_Font_Properties Elm_Font_Properties;
-        typedef :pointer, :elm_font_properties
-        typedef :pointer, :elm_font_properties_p
-        # typedef struct _Elm_Theme Elm_Theme;
-        typedef :pointer, :elm_theme
-        typedef :pointer, :elm_theme_p
-        # typedef struct _Elm_Box_Transition Elm_Box_Transition;
-        typedef :pointer, :elm_box_transition
-        typedef :pointer, :elm_box_transition_p
-        # typedef struct Elm_Gen_Item Elm_Gen_Item;
-        typedef :pointer, :elm_gen_item
-        typedef :elm_gen_item, :elm_gen_item
-        typedef :pointer, :elm_gen_item_p
-        # typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class;
-        typedef :pointer, :elm_gen_item_class
-        # typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func;
-        typedef :pointer, :elm_gen_item_class_func
-        # typedef struct _Elm_Gengrid_Item_Class Elm_Gengrid_Item_Class;
-        typedef :pointer, :elm_gengrid_item_class
-        typedef :pointer, :elm_gengrid_item_class_p
-        # typedef struct _Elm_Gengrid_Item Elm_Gengrid_Item;
-        typedef :pointer, :elm_gengrid_item
-        typedef :pointer, :elm_gengrid_item_p
-        # typedef struct _Elm_Gengrid_Item_Class_Func Elm_Gengrid_Item_Class_Func;
-        typedef :pointer, :elm_gengrid_item_class_func
-        # typedef struct _Elm_Entry_Anchor_Info Elm_Entry_Anchor_Info;
-        typedef :pointer, :elm_entry_anchor_info
-        # typedef Edje_Entry_Change_Info Elm_Entry_Change_Info;
-        typedef :edje_entry_change_info, :elm_entry_change_info
-        # typedef struct _Elm_Entry_Filter_Limit_Size Elm_Entry_Filter_Limit_Size;
-        typedef :pointer, :elm_entry_filter_limit_size
-        # typedef struct _Elm_Entry_Filter_Accept_Set Elm_Entry_Filter_Accept_Set;
-        typedef :pointer, :elm_entry_filter_accept_set
-        # typedef struct _Elm_Entry_Anchorview_Info Elm_Entry_Anchorview_Info;
-        typedef :pointer, :elm_entry_anchorview_info
-        # typedef struct _Elm_Entry_Anchorblock_Info Elm_Entry_Anchorblock_Info;
-        typedef :pointer, :elm_entry_anchorblock_info
-        # typedef enum _Elm_Gesture_Types Elm_Gesture_Types;
-        typedef :pointer, :elm_gesture_types
-        # typedef enum _Elm_Gesture_State Elm_Gesture_State;
-        typedef :pointer, :elm_gesture_state
-        # typedef struct _Elm_Gesture_Taps_Info Elm_Gesture_Taps_Info;
-        typedef :pointer, :elm_gesture_taps_info
-        # typedef struct _Elm_Gesture_Momentum_Info Elm_Gesture_Momentum_Info;
-        typedef :pointer, :elm_gesture_momentum_info
-        # typedef struct _Elm_Gesture_Line_Info Elm_Gesture_Line_Info;
-        typedef :pointer, :elm_gesture_line_info
-        # typedef struct _Elm_Gesture_Zoom_Info Elm_Gesture_Zoom_Info;
-        typedef :pointer, :elm_gesture_zoom_info
-        # typedef struct _Elm_Gesture_Rotate_Info Elm_Gesture_Rotate_Info;
-        typedef :pointer, :elm_gesture_rotate_info
-        # typedef struct _Elm_Web_Frame_Load_Error Elm_Web_Frame_Load_Error;
-        typedef :pointer, :elm_web_frame_load_error
-        # typedef struct _Elm_Web_Menu_Item Elm_Web_Menu_Item;
-        typedef :pointer, :elm_web_menu_item
-        # typedef struct _Elm_Web_Menu Elm_Web_Menu;
-        typedef :pointer, :elm_web_menu
-        # typedef struct _Elm_Web_Download Elm_Web_Download;
-        typedef :pointer, :elm_web_download
-        # typedef struct _Elm_Web_Window_Features Elm_Web_Window_Features;
-        typedef :pointer, :elm_web_window_features
-        typedef :pointer, :elm_web_window_features_p
-        # typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item;
-        typedef :pointer, :elm_hoversel_item
-        typedef :pointer, :elm_hoversel_item_p
-        # typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
-        typedef :pointer, :elm_toolbar_item
-        typedef :pointer, :elm_toolbar_item_p
-        # typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State;
-        typedef :pointer, :elm_toolbar_item_state
-        typedef :pointer, :elm_toolbar_item_state_p
-        # typedef struct _Elm_Menu_Item Elm_Menu_Item;
-        typedef :pointer, :elm_menu_item
-        typedef :pointer, :elm_menu_item_p
-        # typedef struct _Elm_List_Item Elm_List_Item;
-        typedef :pointer, :elm_list_item
-        typedef :pointer, :elm_list_item_p
-        # typedef struct _Elm_Genlist_Item_Class Elm_Genlist_Item_Class;
-        typedef :pointer, :elm_genlist_item_class
-        typedef :pointer, :elm_genlist_item_class_p
-        # typedef struct _Elm_Genlist_Item Elm_Genlist_Item;
-        typedef :pointer, :elm_genlist_item
-        typedef :pointer, :elm_genlist_item_p
-        # typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func;
-        typedef :pointer, :elm_genlist_item_class_func
-        # typedef struct _Elm_Slideshow_Item_Class Elm_Slideshow_Item_Class;
-        typedef :pointer, :elm_slideshow_item_class
-        typedef :pointer, :elm_slideshow_item_class_p
-        # typedef struct _Elm_Slideshow_Item_Class_Func Elm_Slideshow_Item_Class_Func;
-        typedef :pointer, :elm_slideshow_item_class_func
-        # typedef struct _Elm_Slideshow_Item Elm_Slideshow_Item;
-        typedef :pointer, :elm_slideshow_item
-        typedef :pointer, :elm_slideshow_item_p
-        # typedef struct _Elm_Index_Item Elm_Index_Item;
-        typedef :pointer, :elm_index_item
-        typedef :pointer, :elm_index_item_p
-        # typedef struct _Elm_Map_Marker Elm_Map_Marker;
-        typedef :pointer, :elm_map_marker
-        typedef :pointer, :elm_map_marker_p
-        # typedef struct _Elm_Map_Marker_Class Elm_Map_Marker_Class;
-        typedef :pointer, :elm_map_marker_class
-        typedef :pointer, :elm_map_marker_class_p
-        # typedef struct _Elm_Map_Group_Class Elm_Map_Group_Class;
-        typedef :pointer, :elm_map_group_class
-        typedef :pointer, :elm_map_group_class_p
-        # typedef struct _Elm_Map_Route Elm_Map_Route;
-        typedef :pointer, :elm_map_route
-        typedef :pointer, :elm_map_route_p
-        # typedef struct _Elm_Map_Name Elm_Map_Name;
-        typedef :pointer, :elm_map_name
-        typedef :pointer, :elm_map_name_p
-        # typedef struct _Elm_Map_Track Elm_Map_Track;
-        typedef :pointer, :elm_map_track
-        # typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark;
-        typedef :pointer, :elm_calendar_mark
-        typedef :pointer, :elm_calendar_mark_p
-        # typedef struct _Elm_Diskselector_Item Elm_Diskselector_Item;
-        typedef :pointer, :elm_diskselector_item
-        typedef :pointer, :elm_diskselector_item_p
-        # typedef struct _Elm_Transit Elm_Transit;
-        typedef :pointer, :elm_transit
-        typedef :pointer, :elm_transit_p
-        # typedef void Elm_Transit_Effect;
-        typedef :void, :elm_transit_effect
-        typedef :pointer, :elm_transit_effect_p
-        # typedef struct _Elm_Store Elm_Store;
-        typedef :pointer, :elm_store
-        typedef :pointer, :elm_store_p
-        # typedef struct _Elm_Store_Filesystem Elm_Store_Filesystem;
-        typedef :pointer, :elm_store_filesystem
-        # typedef struct _Elm_Store_Item Elm_Store_Item;
-        typedef :pointer, :elm_store_item
-        typedef :pointer, :elm_store_item_p
-        # typedef struct _Elm_Store_Item_Filesystem Elm_Store_Item_Filesystem;
-        typedef :pointer, :elm_store_item_filesystem
-        # typedef struct _Elm_Store_Item_Info Elm_Store_Item_Info;
-        typedef :pointer, :elm_store_item_info
-        typedef :pointer, :elm_store_item_info_p
-        # typedef struct _Elm_Store_Item_Info_Filesystem Elm_Store_Item_Info_Filesystem;
-        typedef :pointer, :elm_store_item_info_filesystem
-        # typedef struct _Elm_Store_Item_Mapping Elm_Store_Item_Mapping;
-        typedef :pointer, :elm_store_item_mapping
-        # typedef struct _Elm_Store_Item_Mapping_Empty Elm_Store_Item_Mapping_Empty;
-        typedef :pointer, :elm_store_item_mapping_empty
-        # typedef struct _Elm_Store_Item_Mapping_Icon Elm_Store_Item_Mapping_Icon;
-        typedef :pointer, :elm_store_item_mapping_icon
-        # typedef struct _Elm_Store_Item_Mapping_Photo Elm_Store_Item_Mapping_Photo;
-        typedef :pointer, :elm_store_item_mapping_photo
-        # typedef struct _Elm_Store_Item_Mapping_Custom Elm_Store_Item_Mapping_Custom;
-        typedef :pointer, :elm_store_item_mapping_custom
-        # typedef struct _Elm_Segment_Item Elm_Segment_Item;
-        typedef :pointer, :elm_segment_item
-        typedef :pointer, :elm_segment_item_p
-        # typedef struct _Multibuttonentry_Item Elm_Multibuttonentry_Item;
-        typedef :pointer, :elm_multibuttonentry_item
-        typedef :pointer, :elm_multibuttonentry_item_p
-        #
-        # CALLBACKS
-        # typedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip);
-        callback :elm_tooltip_content_cb, [ :void_p, :evas_object_p, :evas_object_p ], :evas_object_p
-        # typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item);
-        callback :elm_tooltip_item_content_cb, [ :void_p, :evas_object_p, :evas_object_p, :void_p ], :evas_object_p
-        # typedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info);
-        callback :elm_event_cb, [ :void_p, :evas_object_p, :evas_object_p, :evas_callback_type, :void_p ], :eina_bool
-        # typedef void (*Elm_GLView_Func_Cb) (Evas_Object *obj);
-        callback :elm_glview_func_cb, [ :evas_object_p ], :void
-        # typedef char *(*Elm_Gen_Item_Text_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_text_get_cb, [ :void_p, :evas_object_p, :string ], :string
-        # typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_content_get_cb, [ :void_p, :evas_object_p, :string ], :evas_object_p
-        # typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_state_get_cb, [ :void_p, :evas_object_p, :string ], :eina_bool
-        # typedef void (*Elm_Gen_Item_Del_Cb) (void *data, Evas_Object *obj);
-        callback :elm_gen_item_del_cb, [ :void_p, :evas_object_p ], :void
-        # typedef char *(*Elm_Gengrid_Item_Text_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gengrid_item_text_get_cb, [ :void_p, :evas_object_p, :string ], :string
-        # typedef Evas_Object *(*Elm_Gengrid_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gengrid_item_content_get_cb, [ :void_p, :evas_object_p, :string ], :evas_object_p
-        # typedef Eina_Bool (*Elm_Gengrid_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gengrid_item_state_get_cb, [ :void_p, :evas_object_p, :string ], :eina_bool
-        # typedef void (*Elm_Gengrid_Item_Del_Cb) (void *data, Evas_Object *obj);
-        callback :elm_gengrid_item_del_cb, [ :void_p, :evas_object_p ], :void
-        # typedef void (*Elm_Entry_Filter_Cb) (void *data, Evas_Object *entry, char **text);
-        callback :elm_entry_filter_cb, [ :void_p, :evas_object_p, :string_array ], :void
-        # typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb) (void *data, void *event_info);
-        callback :elm_gesture_event_cb, [ :void_p, :void_p ], :evas_event_flags
-        # typedef Evas_Object *(*Elm_Web_Window_Open) (void *data, Evas_Object *obj, Eina_Bool js, const Elm_Web_Window_Features *window_features);
-        callback :elm_web_window_open, [ :void_p, :evas_object_p, :eina_bool, :elm_web_window_features_p ], :evas_object_p
-        # typedef Evas_Object *(*Elm_Web_Dialog_Alert) (void *data, Evas_Object *obj, const char *message);
-        callback :elm_web_dialog_alert, [ :void_p, :evas_object_p, :string ], :evas_object_p
-        # typedef Evas_Object *(*Elm_Web_Dialog_Confirm) (void *data, Evas_Object *obj, const char *message, Eina_Bool *ret);
-        callback :elm_web_dialog_confirm, [ :void_p, :evas_object_p, :string, :eina_bool_p ], :evas_object_p
-        # typedef Evas_Object *(*Elm_Web_Dialog_Prompt) (void *data, Evas_Object *obj, const char *message, const char *def_value, char **value, Eina_Bool *ret);
-        callback :elm_web_dialog_prompt, [ :void_p, :evas_object_p, :string, :string, :string_array, :eina_bool_p ], :evas_object_p
-        # typedef Evas_Object *(*Elm_Web_Dialog_File_Selector) (void *data, Evas_Object *obj, Eina_Bool allows_multiple, Eina_List *accept_types, Eina_List **selected, Eina_Bool *ret);
-        callback :elm_web_dialog_file_selector, [ :void_p, :evas_object_p, :eina_bool, :eina_list_p, :eina_list_pp, :eina_bool_p ], :evas_object_p
-        # typedef void (*Elm_Web_Console_Message) (void *data, Evas_Object *obj, const char *message, unsigned int line_number, const char *source_id);
-        callback :elm_web_console_message, [ :void_p, :evas_object_p, :string, :uint, :string ], :void
-        # 
-        # FIXME
-        # typedef char *(*Elm_Genlist_Item_Text_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_genlist_item_text_get_cb, [ :void_p, :evas_object_p, :string ], :string
-        # typedef Evas_Object *(*Elm_Genlist_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_genlist_item_content_get_cb, [ :void_p, :evas_object_p, :string ], :evas_object_p
-        # typedef Eina_Bool (*Elm_Genlist_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_genlist_item_state_get_cb, [ :void_p, :evas_object_p, :string ], :eina_bool
-        # typedef void (*Elm_Genlist_Item_Del_Cb) (void *data, Evas_Object *obj);
-        callback :elm_genlist_item_del_cb, [ :void_p, :evas_object_p ], :void
-        # typedef Evas_Object *(*SlideshowItemGetFunc) (void *data, Evas_Object *obj);
-        callback :slideshowitemgetfunc, [ :void_p, :evas_object_p ], :evas_object_p
-        # typedef void (*SlideshowItemDelFunc) (void *data, Evas_Object *obj);
-        callback :slideshowitemdelfunc, [ :void_p, :evas_object_p ], :void
-        # typedef Evas_Object *(*ElmMapMarkerGetFunc) (Evas_Object *obj, Elm_Map_Marker *marker, void *data);
-        callback :elmmapmarkergetfunc, [ :evas_object_p, :elm_map_marker_p, :void_p ], :evas_object_p
-        # typedef void (*ElmMapMarkerDelFunc) (Evas_Object *obj, Elm_Map_Marker *marker, void *data, Evas_Object *o);
-        callback :elmmapmarkerdelfunc, [ :evas_object_p, :elm_map_marker_p, :void_p, :evas_object_p ], :void
-        # typedef Evas_Object *(*ElmMapMarkerIconGetFunc) (Evas_Object *obj, Elm_Map_Marker *marker, void *data);
-        callback :elmmapmarkericongetfunc, [ :evas_object_p, :elm_map_marker_p, :void_p ], :evas_object_p
-        # typedef Evas_Object *(*ElmMapGroupIconGetFunc) (Evas_Object *obj, void *data);
-        callback :elmmapgroupicongetfunc, [ :evas_object_p, :void_p ], :evas_object_p
-        # typedef char *(*ElmMapModuleSourceFunc) (void);
-        callback :elmmapmodulesourcefunc, [  ], :string
-        # typedef int (*ElmMapModuleZoomMinFunc) (void);
-        callback :elmmapmodulezoomminfunc, [  ], :int
-        # typedef int (*ElmMapModuleZoomMaxFunc) (void);
-        callback :elmmapmodulezoommaxfunc, [  ], :int
-        # typedef char *(*ElmMapModuleUrlFunc) (Evas_Object *obj, int x, int y, int zoom);
-        callback :elmmapmoduleurlfunc, [ :evas_object_p, :int, :int, :int ], :string
-        # typedef int (*ElmMapModuleRouteSourceFunc) (void);
-        callback :elmmapmoduleroutesourcefunc, [  ], :int
-        # typedef char *(*ElmMapModuleRouteUrlFunc) (Evas_Object *obj, char *type_name, int method, double flon, double flat, double tlon, double tlat);
-        callback :elmmapmodulerouteurlfunc, [ :evas_object_p, :string, :int, :double, :double, :double, :double ], :string
-        # typedef char *(*ElmMapModuleNameUrlFunc) (Evas_Object *obj, int method, char *name, double lon, double lat);
-        callback :elmmapmodulenameurlfunc, [ :evas_object_p, :int, :string, :double, :double ], :string
-        # typedef Eina_Bool (*ElmMapModuleGeoIntoCoordFunc) (const Evas_Object *obj, int zoom, double lon, double lat, int size, int *x, int *y);
-        callback :elmmapmodulegeointocoordfunc, [ :evas_object_p, :int, :double, :double, :int, :int_p, :int_p ], :eina_bool
-        # typedef Eina_Bool (*ElmMapModuleCoordIntoGeoFunc) (const Evas_Object *obj, int zoom, int x, int y, int size, double *lon, double *lat);
-        callback :elmmapmodulecoordintogeofunc, [ :evas_object_p, :int, :int, :int, :int, :double_p, :double_p ], :eina_bool
-        # typedef void (*Elm_Transit_Effect_Transition_Cb) (Elm_Transit_Effect *effect, Elm_Transit *transit, double progress);
-        callback :elm_transit_effect_transition_cb, [ :void_p, :elm_transit_p, :double ], :void
-        # typedef void (*Elm_Transit_Effect_End_Cb) (Elm_Transit_Effect *effect, Elm_Transit *transit);
-        callback :elm_transit_effect_end_cb, [ :void_p, :elm_transit_p ], :void
-        # typedef void (*Elm_Transit_Del_Cb) (void *data, Elm_Transit *transit);
-        callback :elm_transit_del_cb, [ :void_p, :elm_transit_p ], :void
-        # typedef Eina_Bool (*Elm_Store_Item_List_Cb) (void *data, Elm_Store_Item_Info *info);
-        callback :elm_store_item_list_cb, [ :void_p, :elm_store_item_info_p ], :eina_bool
-        # typedef void (*Elm_Store_Item_Fetch_Cb) (void *data, Elm_Store_Item *sti);
-        callback :elm_store_item_fetch_cb, [ :void_p, :elm_store_item_p ], :void
-        # typedef void (*Elm_Store_Item_Unfetch_Cb) (void *data, Elm_Store_Item *sti);
-        callback :elm_store_item_unfetch_cb, [ :void_p, :elm_store_item_p ], :void
-        # typedef void *(*Elm_Store_Item_Mapping_Cb) (void *data, Elm_Store_Item *sti, const char *part);
-        callback :elm_store_item_mapping_cb, [ :void_p, :elm_store_item_p, :string ], :void_p
-        # void(*transition_end_cb)(void *data)
-        callback :elm_box_transition_end_cb, [ :void_p ], :void
-        # typedef Eina_Bool (*Elm_Multibuttonentry_Item_Filter_callback) (Evas_Object *obj, const char *item_label, void *item_data, void *data);
-        callback :elm_multibuttonentry_item_filter_callback, [ :evas_object_p, :string, :void_p, :void_p ], :eina_bool
         #
         # VARIABLES
         # EAPI extern Elm_Version *elm_version;
-        attach_variable :elm_version, :elm_version_p
-        # EAPI extern int ELM_ECORE_EVENT_ETHUMB_CONNECT;
-        attach_variable :ELM_ECORE_EVENT_ETHUMB_CONNECT, :int
-        # EAPI extern int ELM_EVENT_CONFIG_ALL_CHANGED;
-        attach_variable :ELM_EVENT_CONFIG_ALL_CHANGED, :int
-        # EAPI extern int ELM_EVENT_POLICY_CHANGED;
-        attach_variable :ELM_EVENT_POLICY_CHANGED, :int
+        attach_variable :elm_version, :elm_version
         #
         # FUNCTIONS
         fcts = [
-        # EAPI int elm_init(int argc, char **argv);
-        [ :elm_init, [ :int, :string_array ], :int ],
-        # EAPI int elm_shutdown(void);
-        [ :elm_shutdown, [  ], :int ],
-        # EAPI void elm_run(void);
-        [ :elm_run, [  ], :void ],
-        # EAPI void elm_exit(void);
-        [ :elm_exit, [  ], :void ],
-        # EAPI void elm_app_info_set(void *mainfunc, const char *dom, const char *checkfile);
-        [ :elm_app_info_set, [ :void_p, :string, :string ], :void ],
-        # EAPI void elm_app_compile_bin_dir_set(const char *dir);
-        [ :elm_app_compile_bin_dir_set, [ :string ], :void ],
-        # EAPI void elm_app_compile_lib_dir_set(const char *dir);
-        [ :elm_app_compile_lib_dir_set, [ :string ], :void ],
-        # EAPI void elm_app_compile_data_dir_set(const char *dir);
-        [ :elm_app_compile_data_dir_set, [ :string ], :void ],
-        # EAPI void elm_app_compile_locale_set(const char *dir);
-        [ :elm_app_compile_locale_set, [ :string ], :void ],
-        # EAPI const char *elm_app_prefix_dir_get(void);
-        [ :elm_app_prefix_dir_get, [  ], :string ],
-        # EAPI const char *elm_app_bin_dir_get(void);
-        [ :elm_app_bin_dir_get, [  ], :string ],
-        # EAPI const char *elm_app_lib_dir_get(void);
-        [ :elm_app_lib_dir_get, [  ], :string ],
-        # EAPI const char *elm_app_data_dir_get(void);
-        [ :elm_app_data_dir_get, [  ], :string ],
-        # EAPI const char *elm_app_locale_dir_get(void);
-        [ :elm_app_locale_dir_get, [  ], :string ],
-        # EAPI void elm_quicklaunch_mode_set(Eina_Bool ql_on);
-        [ :elm_quicklaunch_mode_set, [ :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_quicklaunch_mode_get(void);
-        [ :elm_quicklaunch_mode_get, [  ], :eina_bool ],
-        # EAPI int elm_quicklaunch_init(int argc, char **argv);
-        [ :elm_quicklaunch_init, [ :int, :string_array ], :int ],
-        # EAPI int elm_quicklaunch_sub_init(int argc, char **argv);
-        [ :elm_quicklaunch_sub_init, [ :int, :string_array ], :int ],
-        # EAPI int elm_quicklaunch_sub_shutdown(void);
-        [ :elm_quicklaunch_sub_shutdown, [  ], :int ],
-        # EAPI int elm_quicklaunch_shutdown(void);
-        [ :elm_quicklaunch_shutdown, [  ], :int ],
-        # EAPI void elm_quicklaunch_seed(void);
-        [ :elm_quicklaunch_seed, [  ], :void ],
-        # EAPI Eina_Bool elm_quicklaunch_prepare(int argc, char **argv);
-        [ :elm_quicklaunch_prepare, [ :int, :string_array ], :eina_bool ],
-        # EAPI Eina_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
-        # FIXME
-        # EAPI void elm_quicklaunch_cleanup(void);
-        [ :elm_quicklaunch_cleanup, [  ], :void ],
-        # EAPI int elm_quicklaunch_fallback(int argc, char **argv);
-        [ :elm_quicklaunch_fallback, [ :int, :string_array ], :int ],
-        # EAPI char *elm_quicklaunch_exe_path_get(const char *exe);
-        [ :elm_quicklaunch_exe_path_get, [ :string ], :string ],
-        # EAPI Eina_Bool elm_need_efreet(void);
-        [ :elm_need_efreet, [  ], :eina_bool ],
-        # EAPI Eina_Bool elm_need_e_dbus(void);
-        [ :elm_need_e_dbus, [  ], :eina_bool ],
-        # EAPI Eina_Bool elm_need_ethumb(void);
-        [ :elm_need_ethumb, [  ], :eina_bool ],
-        # EAPI Eina_Bool elm_need_web(void);
-        [ :elm_need_web, [  ], :eina_bool ],
-        # EAPI Eina_Bool elm_policy_set(unsigned int policy, int value);
-        [ :elm_policy_set, [ :uint, :int ], :eina_bool ],
-        # EAPI int elm_policy_get(unsigned int policy);
-        [ :elm_policy_get, [ :uint ], :int ],
-        # EAPI void elm_language_set(const char *lang);
-        [ :elm_language_set, [ :string ], :void ],
-        # EAPI void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label);
-        [ :elm_object_part_text_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI const char *elm_object_part_text_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_part_text_get, [ :evas_object_p, :string ], :string ],
-        # EAPI void elm_object_domain_translatable_text_part_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
-        [ :elm_object_domain_translatable_text_part_set, [ :evas_object_p, :string, :string, :string ], :void ],
-        # EAPI const char *elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_translatable_text_part_get, [ :evas_object_p, :string ], :string ],
-        # EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content);
-        [ :elm_object_part_content_set, [ :evas_object_p, :string, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_part_content_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part);
-        [ :elm_object_part_content_unset, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt);
-        [ :elm_object_access_info_set, [ :evas_object_p, :string ], :void ],
-        # EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it);
-        [ :elm_object_item_object_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
-        [ :elm_object_item_part_content_set, [ :elm_object_item_p, :string, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_content_part_get, [ :elm_object_item_p, :string ], :evas_object_p ],
-        # EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_part_content_get, [ :elm_object_item_p, :string ], :evas_object_p ],
-        # EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_part_content_unset, [ :elm_object_item_p, :string ], :evas_object_p ],
-        # EAPI void elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label);
-        [ :elm_object_item_part_text_set, [ :elm_object_item_p, :string, :string ], :void ],
-        # EAPI const char *elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_part_text_get, [ :elm_object_item_p, :string ], :string ],
-        # EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt);
-        [ :elm_object_item_access_info_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI void *elm_object_item_data_get(const Elm_Object_Item *it);
-        [ :elm_object_item_data_get, [ :elm_object_item_p ], :void_p ],
-        # EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data);
-        [ :elm_object_item_data_set, [ :elm_object_item_p, :void_p ], :void ],
-        # EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source);
-        [ :elm_object_item_signal_emit, [ :elm_object_item_p, :string, :string ], :void ],
-        # EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
-        [ :elm_object_item_disabled_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it);
-        [ :elm_object_item_disabled_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_all_flush(void);
-        [ :elm_all_flush, [  ], :void ],
-        # EAPI int elm_cache_flush_interval_get(void);
-        [ :elm_cache_flush_interval_get, [  ], :int ],
-        # EAPI void elm_cache_flush_interval_set(int size);
-        [ :elm_cache_flush_interval_set, [ :int ], :void ],
-        # EAPI void elm_cache_flush_interval_all_set(int size);
-        [ :elm_cache_flush_interval_all_set, [ :int ], :void ],
-        # EAPI Eina_Bool elm_cache_flush_enabled_get(void);
-        [ :elm_cache_flush_enabled_get, [  ], :eina_bool ],
-        # EAPI void elm_cache_flush_enabled_set(Eina_Bool enabled);
-        [ :elm_cache_flush_enabled_set, [ :eina_bool ], :void ],
-        # EAPI void elm_cache_flush_enabled_all_set(Eina_Bool enabled);
-        [ :elm_cache_flush_enabled_all_set, [ :eina_bool ], :void ],
-        # EAPI int elm_font_cache_get(void);
-        [ :elm_font_cache_get, [  ], :int ],
-        # EAPI void elm_font_cache_set(int size);
-        [ :elm_font_cache_set, [ :int ], :void ],
-        # EAPI void elm_font_cache_all_set(int size);
-        [ :elm_font_cache_all_set, [ :int ], :void ],
-        # EAPI int elm_image_cache_get(void);
-        [ :elm_image_cache_get, [  ], :int ],
-        # EAPI void elm_image_cache_set(int size);
-        [ :elm_image_cache_set, [ :int ], :void ],
-        # EAPI void elm_image_cache_all_set(int size);
-        [ :elm_image_cache_all_set, [ :int ], :void ],
-        # EAPI int elm_edje_file_cache_get(void);
-        [ :elm_edje_file_cache_get, [  ], :int ],
-        # EAPI void elm_edje_file_cache_set(int size);
-        [ :elm_edje_file_cache_set, [ :int ], :void ],
-        # EAPI void elm_edje_file_cache_all_set(int size);
-        [ :elm_edje_file_cache_all_set, [ :int ], :void ],
-        # EAPI int elm_edje_collection_cache_get(void);
-        [ :elm_edje_collection_cache_get, [  ], :int ],
-        # EAPI void elm_edje_collection_cache_set(int size);
-        [ :elm_edje_collection_cache_set, [ :int ], :void ],
-        # EAPI void elm_edje_collection_cache_all_set(int size);
-        [ :elm_edje_collection_cache_all_set, [ :int ], :void ],
-        # EAPI double elm_scale_get(void);
-        [ :elm_scale_get, [  ], :double ],
-        # EAPI void elm_scale_set(double scale);
-        [ :elm_scale_set, [ :double ], :void ],
-        # EAPI void elm_scale_all_set(double scale);
-        [ :elm_scale_all_set, [ :double ], :void ],
-        # EAPI void elm_object_scale_set(Evas_Object *obj, double scale);
-        [ :elm_object_scale_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_object_scale_get(const Evas_Object *obj);
-        [ :elm_object_scale_get, [ :evas_object_p ], :double ],
-        # EAPI Eina_Bool elm_password_show_last_get(void);
-        [ :elm_password_show_last_get, [  ], :eina_bool ],
-        # EAPI void elm_password_show_last_set(Eina_Bool password_show_last);
-        [ :elm_password_show_last_set, [ :eina_bool ], :void ],
-        # EAPI double elm_password_show_last_timeout_get(void);
-        [ :elm_password_show_last_timeout_get, [  ], :double ],
-        # EAPI void elm_password_show_last_timeout_set(double password_show_last_timeout);
-        [ :elm_password_show_last_timeout_set, [ :double ], :void ],
-        # EAPI Eina_Bool elm_mirrored_get(void);
-        [ :elm_mirrored_get, [  ], :eina_bool ],
-        # EAPI void elm_mirrored_set(Eina_Bool mirrored);
-        [ :elm_mirrored_set, [ :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj);
-        [ :elm_object_mirrored_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
-        [ :elm_object_mirrored_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_mirrored_automatic_get(const Evas_Object *obj);
-        [ :elm_object_mirrored_automatic_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic);
-        [ :elm_object_mirrored_automatic_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_object_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_object_style_get(const Evas_Object *obj);
-        [ :elm_object_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_object_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_object_disabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj);
-        [ :elm_object_disabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj);
-        [ :elm_object_widget_check, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_object_parent_widget_get(const Evas_Object *obj);
-        [ :elm_object_parent_widget_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_object_top_widget_get(const Evas_Object *obj);
-        [ :elm_object_top_widget_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char *elm_object_widget_type_get(const Evas_Object *obj);
-        [ :elm_object_widget_type_get, [ :evas_object_p ], :string ],
-        # EAPI Eina_Bool elm_config_save(void);
-        [ :elm_config_save, [  ], :eina_bool ],
-        # EAPI void elm_config_reload(void);
-        [ :elm_config_reload, [  ], :void ],
-        # EAPI const char *elm_profile_current_get(void);
-        [ :elm_profile_current_get, [  ], :string ],
-        # EAPI const char *elm_profile_dir_get(const char *profile, Eina_Bool is_user);
-        [ :elm_profile_dir_get, [ :string, :eina_bool ], :string ],
-        # EAPI void elm_profile_dir_free(const char *p_dir);
-        [ :elm_profile_dir_free, [ :string ], :void ],
-        # EAPI Eina_List *elm_profile_list_get(void);
-        [ :elm_profile_list_get, [  ], :eina_list_p ],
-        # EAPI void elm_profile_list_free(Eina_List *l);
-        [ :elm_profile_list_free, [ :eina_list_p ], :void ],
-        # EAPI void elm_profile_set(const char *profile);
-        [ :elm_profile_set, [ :string ], :void ],
-        # EAPI void elm_profile_all_set(const char *profile);
-        [ :elm_profile_all_set, [ :string ], :void ],
-        # EAPI const char *elm_engine_current_get(void);
-        [ :elm_engine_current_get, [  ], :string ],
-        # EAPI void elm_engine_set(const char *engine);
-        [ :elm_engine_set, [ :string ], :void ],
-        # EAPI const Eina_List *elm_text_classes_list_get(void);
-        [ :elm_text_classes_list_get, [  ], :eina_list_p ],
-        # EAPI void elm_text_classes_list_free(const Eina_List *list);
-        [ :elm_text_classes_list_free, [ :eina_list_p ], :void ],
-        # EAPI const Eina_List *elm_font_overlay_list_get(void);
-        [ :elm_font_overlay_list_get, [  ], :eina_list_p ],
-        # EAPI void elm_font_overlay_set(const char *text_class, const char *font, Evas_Font_Size size);
-        [ :elm_font_overlay_set, [ :string, :string, :int ], :void ],
-        # EAPI void elm_font_overlay_unset(const char *text_class);
-        [ :elm_font_overlay_unset, [ :string ], :void ],
-        # EAPI void elm_font_overlay_apply(void);
-        [ :elm_font_overlay_apply, [  ], :void ],
-        # EAPI void elm_font_overlay_all_apply(void);
-        [ :elm_font_overlay_all_apply, [  ], :void ],
-        # EAPI Elm_Font_Properties *elm_font_properties_get(const char *font);
-        [ :elm_font_properties_get, [ :string ], :elm_font_properties_p ],
-        # EAPI void elm_font_properties_free(Elm_Font_Properties *efp);
-        [ :elm_font_properties_free, [ :elm_font_properties_p ], :void ],
-        # EAPI const char *elm_font_fontconfig_name_get(const char *name, const char *style);
-        [ :elm_font_fontconfig_name_get, [ :string, :string ], :string ],
-        # EAPI void elm_font_fontconfig_name_free(const char *name);
-        [ :elm_font_fontconfig_name_free, [ :string ], :void ],
-        # EAPI Eina_Hash *elm_font_available_hash_add(Eina_List *list);
-        [ :elm_font_available_hash_add, [ :eina_list_p ], :eina_hash_p ],
-        # EAPI void elm_font_available_hash_del(Eina_Hash *hash);
-        [ :elm_font_available_hash_del, [ :eina_hash_p ], :void ],
-        # EAPI Evas_Coord elm_finger_size_get(void);
-        [ :elm_finger_size_get, [  ], :int ],
-        # EAPI void elm_finger_size_set(Evas_Coord size);
-        [ :elm_finger_size_set, [ :int ], :void ],
-        # EAPI void elm_finger_size_all_set(Evas_Coord size);
-        [ :elm_finger_size_all_set, [ :int ], :void ],
-        # EAPI Eina_Bool elm_focus_highlight_enabled_get(void);
-        [ :elm_focus_highlight_enabled_get, [  ], :eina_bool ],
-        # EAPI void elm_focus_highlight_enabled_set(Eina_Bool enable);
-        [ :elm_focus_highlight_enabled_set, [ :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_focus_highlight_animate_get(void);
-        [ :elm_focus_highlight_animate_get, [  ], :eina_bool ],
-        # EAPI void elm_focus_highlight_animate_set(Eina_Bool animate);
-        [ :elm_focus_highlight_animate_set, [ :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj);
-        [ :elm_object_focus_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus);
-        [ :elm_object_focus_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_object_focus_allow_set(Evas_Object *obj, Eina_Bool enable);
-        [ :elm_object_focus_allow_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_focus_allow_get(const Evas_Object *obj);
-        [ :elm_object_focus_allow_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_focus_custom_chain_set(Evas_Object *obj, Eina_List *objs);
-        [ :elm_object_focus_custom_chain_set, [ :evas_object_p, :eina_list_p ], :void ],
-        # EAPI void elm_object_focus_custom_chain_unset(Evas_Object *obj);
-        [ :elm_object_focus_custom_chain_unset, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_object_focus_custom_chain_get(const Evas_Object *obj);
-        [ :elm_object_focus_custom_chain_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_object_focus_custom_chain_append(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
-        [ :elm_object_focus_custom_chain_append, [ :evas_object_p, :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
-        [ :elm_object_focus_custom_chain_prepend, [ :evas_object_p, :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir);
-        [ :elm_object_focus_cycle, [ :evas_object_p, :elm_focus_direction ], :void ],
-        # EAPI void elm_object_focus_direction_go(Evas_Object *obj, int x, int y);
-        [ :elm_object_focus_direction_go, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_object_tree_unfocusable_set(Evas_Object *obj, Eina_Bool tree_unfocusable);
-        [ :elm_object_tree_unfocusable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_tree_unfocusable_get(const Evas_Object *obj);
-        [ :elm_object_tree_unfocusable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_scroll_bounce_enabled_get(void);
-        [ :elm_scroll_bounce_enabled_get, [  ], :eina_bool ],
-        # EAPI void elm_scroll_bounce_enabled_set(Eina_Bool enabled);
-        [ :elm_scroll_bounce_enabled_set, [ :eina_bool ], :void ],
-        # EAPI void elm_scroll_bounce_enabled_all_set(Eina_Bool enabled);
-        [ :elm_scroll_bounce_enabled_all_set, [ :eina_bool ], :void ],
-        # EAPI double elm_scroll_bounce_friction_get(void);
-        [ :elm_scroll_bounce_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_bounce_friction_set(double friction);
-        [ :elm_scroll_bounce_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_bounce_friction_all_set(double friction);
-        [ :elm_scroll_bounce_friction_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_page_scroll_friction_get(void);
-        [ :elm_scroll_page_scroll_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_page_scroll_friction_set(double friction);
-        [ :elm_scroll_page_scroll_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_page_scroll_friction_all_set(double friction);
-        [ :elm_scroll_page_scroll_friction_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_bring_in_scroll_friction_get(void);
-        [ :elm_scroll_bring_in_scroll_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_bring_in_scroll_friction_set(double friction);
-        [ :elm_scroll_bring_in_scroll_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_bring_in_scroll_friction_all_set(double friction);
-        [ :elm_scroll_bring_in_scroll_friction_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_zoom_friction_get(void);
-        [ :elm_scroll_zoom_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_zoom_friction_set(double friction);
-        [ :elm_scroll_zoom_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_zoom_friction_all_set(double friction);
-        [ :elm_scroll_zoom_friction_all_set, [ :double ], :void ],
-        # EAPI Eina_Bool elm_scroll_thumbscroll_enabled_get(void);
-        [ :elm_scroll_thumbscroll_enabled_get, [  ], :eina_bool ],
-        # EAPI void elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled);
-        [ :elm_scroll_thumbscroll_enabled_set, [ :eina_bool ], :void ],
-        # EAPI void elm_scroll_thumbscroll_enabled_all_set(Eina_Bool enabled);
-        [ :elm_scroll_thumbscroll_enabled_all_set, [ :eina_bool ], :void ],
-        # EAPI unsigned int elm_scroll_thumbscroll_threshold_get(void);
-        [ :elm_scroll_thumbscroll_threshold_get, [  ], :uint ],
-        # EAPI void elm_scroll_thumbscroll_threshold_set(unsigned int threshold);
-        [ :elm_scroll_thumbscroll_threshold_set, [ :uint ], :void ],
-        # EAPI void elm_scroll_thumbscroll_threshold_all_set(unsigned int threshold);
-        [ :elm_scroll_thumbscroll_threshold_all_set, [ :uint ], :void ],
-        # EAPI double elm_scroll_thumbscroll_momentum_threshold_get(void);
-        [ :elm_scroll_thumbscroll_momentum_threshold_get, [  ], :double ],
-        # EAPI void elm_scroll_thumbscroll_momentum_threshold_set(double threshold);
-        [ :elm_scroll_thumbscroll_momentum_threshold_set, [ :double ], :void ],
-        # EAPI void elm_scroll_thumbscroll_momentum_threshold_all_set(double threshold);
-        [ :elm_scroll_thumbscroll_momentum_threshold_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_thumbscroll_friction_get(void);
-        [ :elm_scroll_thumbscroll_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_thumbscroll_friction_set(double friction);
-        [ :elm_scroll_thumbscroll_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_thumbscroll_friction_all_set(double friction);
-        [ :elm_scroll_thumbscroll_friction_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_thumbscroll_border_friction_get(void);
-        [ :elm_scroll_thumbscroll_border_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_thumbscroll_border_friction_set(double friction);
-        [ :elm_scroll_thumbscroll_border_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_thumbscroll_border_friction_all_set(double friction);
-        [ :elm_scroll_thumbscroll_border_friction_all_set, [ :double ], :void ],
-        # EAPI double elm_scroll_thumbscroll_sensitivity_friction_get(void);
-        [ :elm_scroll_thumbscroll_sensitivity_friction_get, [  ], :double ],
-        # EAPI void elm_scroll_thumbscroll_sensitivity_friction_set(double friction);
-        [ :elm_scroll_thumbscroll_sensitivity_friction_set, [ :double ], :void ],
-        # EAPI void elm_scroll_thumbscroll_sensitivity_friction_all_set(double friction);
-        [ :elm_scroll_thumbscroll_sensitivity_friction_all_set, [ :double ], :void ],
-        # EAPI void elm_object_scroll_hold_push(Evas_Object *obj);
-        [ :elm_object_scroll_hold_push, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_scroll_hold_pop(Evas_Object *obj);
-        [ :elm_object_scroll_hold_pop, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_scroll_freeze_push(Evas_Object *obj);
-        [ :elm_object_scroll_freeze_push, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_scroll_freeze_pop(Evas_Object *obj);
-        [ :elm_object_scroll_freeze_pop, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_scroll_lock_x_set(Evas_Object *obj, Eina_Bool lock);
-        [ :elm_object_scroll_lock_x_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_object_scroll_lock_y_set(Evas_Object *obj, Eina_Bool lock);
-        [ :elm_object_scroll_lock_y_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_scroll_lock_x_get(const Evas_Object *obj);
-        [ :elm_object_scroll_lock_x_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_object_scroll_lock_y_get(const Evas_Object *obj);
-        [ :elm_object_scroll_lock_y_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_signal_emit(Evas_Object *obj, const char *emission, const char *source);
-        [ :elm_object_signal_emit, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :elm_object_signal_callback_add, [ :evas_object_p, :string, :string, :edje_signal_cb, :void_p ], :void ],
-        # EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
-        [ :elm_object_signal_callback_del, [ :evas_object_p, :string, :string, :edje_signal_cb ], :void_p ],
-        # EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
-        [ :elm_object_event_callback_add, [ :evas_object_p, :elm_event_cb, :void_p ], :void ],
-        # EAPI void *elm_object_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data);
-        [ :elm_object_event_callback_del, [ :evas_object_p, :elm_event_cb, :void_p ], :void_p ],
-        # EAPI void elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, Evas_Coord *h);
-        [ :elm_coords_finger_size_adjust, [ :int, :int_p, :int, :int_p ], :void ],
-        # EAPI double elm_longpress_timeout_get(void);
-        [ :elm_longpress_timeout_get, [  ], :double ],
-        # EAPI void elm_longpress_timeout_set(double longpress_timeout);
-        [ :elm_longpress_timeout_set, [ :double ], :void ],
-        # EAPI void elm_object_tree_dump(const Evas_Object *top);
-        [ :elm_object_tree_dump, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_tree_dot_dump(const Evas_Object *top, const char *file);
-        [ :elm_object_tree_dot_dump, [ :evas_object_p, :string ], :void ],
-        # EAPI Elm_Theme *elm_theme_new(void);
-        [ :elm_theme_new, [  ], :elm_theme_p ],
-        # EAPI void elm_theme_free(Elm_Theme *th);
-        [ :elm_theme_free, [ :elm_theme_p ], :void ],
-        # EAPI void elm_theme_copy(Elm_Theme *th, Elm_Theme *thdst);
-        [ :elm_theme_copy, [ :elm_theme_p, :elm_theme_p ], :void ],
-        # EAPI void elm_theme_ref_set(Elm_Theme *th, Elm_Theme *thref);
-        [ :elm_theme_ref_set, [ :elm_theme_p, :elm_theme_p ], :void ],
-        # EAPI Elm_Theme *elm_theme_ref_get(Elm_Theme *th);
-        [ :elm_theme_ref_get, [ :elm_theme_p ], :elm_theme_p ],
-        # EAPI Elm_Theme *elm_theme_default_get(void);
-        [ :elm_theme_default_get, [  ], :elm_theme_p ],
-        # EAPI void elm_theme_overlay_add(Elm_Theme *th, const char *item);
-        [ :elm_theme_overlay_add, [ :elm_theme_p, :string ], :void ],
-        # EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item);
-        [ :elm_theme_overlay_del, [ :elm_theme_p, :string ], :void ],
-        # EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item);
-        [ :elm_theme_extension_add, [ :elm_theme_p, :string ], :void ],
-        # EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item);
-        [ :elm_theme_extension_del, [ :elm_theme_p, :string ], :void ],
-        # EAPI void elm_theme_set(Elm_Theme *th, const char *theme);
-        [ :elm_theme_set, [ :elm_theme_p, :string ], :void ],
-        # EAPI const char *elm_theme_get(Elm_Theme *th);
-        [ :elm_theme_get, [ :elm_theme_p ], :string ],
-        # EAPI const Eina_List *elm_theme_list_get(const Elm_Theme *th);
-        [ :elm_theme_list_get, [ :elm_theme_p ], :eina_list_p ],
-        # EAPI char *elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path);
-        [ :elm_theme_list_item_path_get, [ :string, :eina_bool_p ], :string ],
-        # EAPI void elm_theme_flush(Elm_Theme *th);
-        [ :elm_theme_flush, [ :elm_theme_p ], :void ],
-        # EAPI void elm_theme_full_flush(void);
-        [ :elm_theme_full_flush, [  ], :void ],
-        # EAPI void elm_theme_all_set(const char *theme);
-        [ :elm_theme_all_set, [ :string ], :void ],
-        # EAPI Eina_List *elm_theme_name_available_list_new(void);
-        [ :elm_theme_name_available_list_new, [  ], :eina_list_p ],
-        # EAPI void elm_theme_name_available_list_free(Eina_List *list);
-        [ :elm_theme_name_available_list_free, [ :eina_list_p ], :void ],
-        # EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th);
-        [ :elm_object_theme_set, [ :evas_object_p, :elm_theme_p ], :void ],
-        # EAPI Elm_Theme *elm_object_theme_get(const Evas_Object *obj);
-        [ :elm_object_theme_get, [ :evas_object_p ], :elm_theme_p ],
-        # EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key);
-        [ :elm_theme_data_get, [ :elm_theme_p, :string ], :string ],
-        # EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
-        [ :elm_win_add, [ :evas_object_p, :string, :elm_win_type ], :evas_object_p ],
-        # EAPI Evas_Object *elm_win_util_standard_add(const char *name, const char *title);
-        [ :elm_win_util_standard_add, [ :string, :string ], :evas_object_p ],
-        # EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_win_resize_object_add, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_win_resize_object_del, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_win_title_set(Evas_Object *obj, const char *title);
-        [ :elm_win_title_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_win_title_get(const Evas_Object *obj);
-        [ :elm_win_title_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
-        [ :elm_win_autodel_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
-        [ :elm_win_autodel_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_activate(Evas_Object *obj);
-        [ :elm_win_activate, [ :evas_object_p ], :void ],
-        # EAPI void elm_win_lower(Evas_Object *obj);
-        [ :elm_win_lower, [ :evas_object_p ], :void ],
-        # EAPI void elm_win_raise(Evas_Object *obj);
-        [ :elm_win_raise, [ :evas_object_p ], :void ],
-        # EAPI void elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v);
-        [ :elm_win_center, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
-        [ :elm_win_borderless_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_borderless_get(const Evas_Object *obj);
-        [ :elm_win_borderless_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped);
-        [ :elm_win_shaped_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_shaped_get(const Evas_Object *obj);
-        [ :elm_win_shaped_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha);
-        [ :elm_win_alpha_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_transparent_get(const Evas_Object *obj);
-        [ :elm_win_transparent_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent);
-        [ :elm_win_transparent_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_alpha_get(const Evas_Object *obj);
-        [ :elm_win_alpha_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_override_set(Evas_Object *obj, Eina_Bool override);
-        [ :elm_win_override_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_override_get(const Evas_Object *obj);
-        [ :elm_win_override_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
-        [ :elm_win_fullscreen_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_fullscreen_get(const Evas_Object *obj);
-        [ :elm_win_fullscreen_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
-        [ :elm_win_maximized_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_maximized_get(const Evas_Object *obj);
-        [ :elm_win_maximized_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
-        [ :elm_win_iconified_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_iconified_get(const Evas_Object *obj);
-        [ :elm_win_iconified_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_layer_set(Evas_Object *obj, int layer);
-        [ :elm_win_layer_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_win_layer_get(const Evas_Object *obj);
-        [ :elm_win_layer_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_win_rotation_set(Evas_Object *obj, int rotation);
-        [ :elm_win_rotation_set, [ :evas_object_p, :int ], :void ],
-        # EAPI void elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation);
-        [ :elm_win_rotation_with_resize_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_win_rotation_get(const Evas_Object *obj);
-        [ :elm_win_rotation_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
-        [ :elm_win_sticky_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_sticky_get(const Evas_Object *obj);
-        [ :elm_win_sticky_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant);
-        [ :elm_win_conformant_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_conformant_get(const Evas_Object *obj);
-        [ :elm_win_conformant_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel);
-        [ :elm_win_quickpanel_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_quickpanel_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority);
-        [ :elm_win_quickpanel_priority_major_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_win_quickpanel_priority_major_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_priority_major_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority);
-        [ :elm_win_quickpanel_priority_minor_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_win_quickpanel_priority_minor_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_priority_minor_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_win_quickpanel_zone_set(Evas_Object *obj, int zone);
-        [ :elm_win_quickpanel_zone_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_win_quickpanel_zone_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_zone_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip);
-        [ :elm_win_prop_focus_skip_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params);
-        [ :elm_win_illume_command_send, [ :evas_object_p, :elm_illume_command, :void_p ], :void ],
-        # EAPI Evas_Object *elm_win_inlined_image_object_get(Evas_Object *obj);
-        [ :elm_win_inlined_image_object_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_win_focus_get(const Evas_Object *obj);
-        [ :elm_win_focus_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain);
-        [ :elm_win_screen_constrain_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_screen_constrain_get(Evas_Object *obj);
-        [ :elm_win_screen_constrain_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_screen_size_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :elm_win_screen_size_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_win_focus_highlight_enabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_focus_highlight_enabled_get(const Evas_Object *obj);
-        [ :elm_win_focus_highlight_enabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style);
-        [ :elm_win_focus_highlight_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_win_focus_highlight_style_get(const Evas_Object *obj);
-        [ :elm_win_focus_highlight_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode);
-        [ :elm_win_keyboard_mode_set, [ :evas_object_p, :elm_win_keyboard_mode ], :void ],
-        # EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Evas_Object *obj);
-        [ :elm_win_keyboard_mode_get, [ :evas_object_p ], :elm_win_keyboard_mode ],
-        # EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
-        [ :elm_win_keyboard_win_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_win_keyboard_win_get(const Evas_Object *obj);
-        [ :elm_win_keyboard_win_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y);
-        [ :elm_win_screen_position_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_win_inwin_add(Evas_Object *obj);
-        [ :elm_win_inwin_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_win_inwin_activate(Evas_Object *obj);
-        [ :elm_win_inwin_activate, [ :evas_object_p ], :void ],
-        # EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content);
-        [ :elm_win_inwin_content_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
-        [ :elm_win_inwin_content_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
-        [ :elm_win_inwin_content_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
-        [ :elm_win_xwindow_get, [ :evas_object_p ], :uint ],
-        # EAPI Evas_Object *elm_bg_add(Evas_Object *parent);
-        [ :elm_bg_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_bg_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_bg_file_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_bg_file_get(const Evas_Object *obj, const char **file, const char **group);
-        [ :elm_bg_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option);
-        [ :elm_bg_option_set, [ :evas_object_p, :elm_bg_option ], :void ],
-        # EAPI Elm_Bg_Option elm_bg_option_get(const Evas_Object *obj);
-        [ :elm_bg_option_get, [ :evas_object_p ], :elm_bg_option ],
-        # EAPI void elm_bg_color_set(Evas_Object *obj, int r, int g, int b);
-        [ :elm_bg_color_set, [ :evas_object_p, :int, :int, :int ], :void ],
-        # EAPI void elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b);
-        [ :elm_bg_color_get, [ :evas_object_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_bg_load_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI Evas_Object *elm_icon_add(Evas_Object *parent);
-        [ :elm_icon_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_icon_file_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI Eina_Bool elm_icon_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key);
-        [ :elm_icon_memfile_set, [ :evas_object_p, :void_p, :ulong, :string, :string ], :eina_bool ],
-        # EAPI void elm_icon_file_get(const Evas_Object *obj, const char **file, const char **group);
-        [ :elm_icon_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI void elm_icon_thumb_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_icon_thumb_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI Eina_Bool elm_icon_standard_set(Evas_Object *obj, const char *name);
-        [ :elm_icon_standard_set, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI const char *elm_icon_standard_get(const Evas_Object *obj);
-        [ :elm_icon_standard_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_icon_smooth_set(Evas_Object *obj, Eina_Bool smooth);
-        [ :elm_icon_smooth_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_smooth_get(const Evas_Object *obj);
-        [ :elm_icon_smooth_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_icon_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
-        [ :elm_icon_no_scale_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_no_scale_get(const Evas_Object *obj);
-        [ :elm_icon_no_scale_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
-        [ :elm_icon_scale_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_icon_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
-        [ :elm_icon_scale_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_icon_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :elm_icon_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
-        [ :elm_icon_fill_outside_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_fill_outside_get(const Evas_Object *obj);
-        [ :elm_icon_fill_outside_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_icon_prescale_set(Evas_Object *obj, int size);
-        [ :elm_icon_prescale_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_icon_prescale_get(const Evas_Object *obj);
-        [ :elm_icon_prescale_get, [ :evas_object_p ], :int ],
-        # EAPI Evas_Object *elm_icon_object_get(Evas_Object *obj);
-        [ :elm_icon_object_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
-        [ :elm_icon_order_lookup_set, [ :evas_object_p, :elm_icon_lookup_order ], :void ],
-        # EAPI Elm_Icon_Lookup_Order elm_icon_order_lookup_get(const Evas_Object *obj);
-        [ :elm_icon_order_lookup_get, [ :evas_object_p ], :elm_icon_lookup_order ],
-        # EAPI void elm_icon_preload_set(Evas_Object *obj, Eina_Bool disable);
-        [ :elm_icon_preload_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_animated_available_get(const Evas_Object *obj);
-        [ :elm_icon_animated_available_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_icon_animated_set(Evas_Object *obj, Eina_Bool animated);
-        [ :elm_icon_animated_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_animated_get(const Evas_Object *obj);
-        [ :elm_icon_animated_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_icon_animated_play_set(Evas_Object *obj, Eina_Bool play);
-        [ :elm_icon_animated_play_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_icon_animated_play_get(const Evas_Object *obj);
-        [ :elm_icon_animated_play_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_image_add(Evas_Object *parent);
-        [ :elm_image_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_image_file_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI void elm_image_file_get(const Evas_Object *obj, const char **file, const char **group);
-        [ :elm_image_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI void elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth);
-        [ :elm_image_smooth_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_image_smooth_get(const Evas_Object *obj);
-        [ :elm_image_smooth_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_image_object_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :elm_image_object_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
-        [ :elm_image_no_scale_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_image_no_scale_get(const Evas_Object *obj);
-        [ :elm_image_no_scale_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
-        [ :elm_image_scale_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_image_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
-        [ :elm_image_scale_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
-        [ :elm_image_fill_outside_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
-        [ :elm_image_fill_outside_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
-        [ :elm_image_prescale_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_image_prescale_get(const Evas_Object *obj);
-        [ :elm_image_prescale_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient);
-        [ :elm_image_orient_set, [ :evas_object_p, :elm_image_orient ], :void ],
-        # EAPI Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj);
-        [ :elm_image_orient_get, [ :evas_object_p ], :elm_image_orient ],
-        # EAPI void elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
-        [ :elm_image_editable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_image_editable_get(const Evas_Object *obj);
-        [ :elm_image_editable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_image_object_get(const Evas_Object *obj);
-        [ :elm_image_object_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_image_aspect_ratio_retained_set(Evas_Object *obj, Eina_Bool retained);
-        [ :elm_image_aspect_ratio_retained_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_image_aspect_ratio_retained_get(const Evas_Object *obj);
-        [ :elm_image_aspect_ratio_retained_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_glview_add(Evas_Object *parent);
-        [ :elm_glview_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height);
-        [ :elm_glview_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
-        [ :elm_glview_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_GL_API *elm_glview_gl_api_get(const Evas_Object *obj);
-        [ :elm_glview_gl_api_get, [ :evas_object_p ], :evas_gl_api_p ],
-        # EAPI Eina_Bool elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode);
-        [ :elm_glview_mode_set, [ :evas_object_p, :elm_glview_mode ], :eina_bool ],
-        # EAPI Eina_Bool elm_glview_resize_policy_set(Evas_Object *obj, Elm_GLView_Resize_Policy policy);
-        [ :elm_glview_resize_policy_set, [ :evas_object_p, :elm_glview_resize_policy ], :eina_bool ],
-        # EAPI Eina_Bool elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Render_Policy policy);
-        [ :elm_glview_render_policy_set, [ :evas_object_p, :elm_glview_render_policy ], :eina_bool ],
-        # EAPI void elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_init_func_set, [ :evas_object_p, :elm_glview_func_cb ], :void ],
-        # EAPI void elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_del_func_set, [ :evas_object_p, :elm_glview_func_cb ], :void ],
-        # EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_resize_func_set, [ :evas_object_p, :elm_glview_func_cb ], :void ],
-        # EAPI void elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_render_func_set, [ :evas_object_p, :elm_glview_func_cb ], :void ],
-        # EAPI void elm_glview_changed_set(Evas_Object *obj);
-        [ :elm_glview_changed_set, [ :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_box_add(Evas_Object *parent);
-        [ :elm_box_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_box_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_box_horizontal_get(const Evas_Object *obj);
-        [ :elm_box_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_box_homogeneous_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj);
-        [ :elm_box_homogeneous_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_pack_start, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_pack_end, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
-        [ :elm_box_pack_before, [ :evas_object_p, :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_box_pack_after(Evas_Object *obj, Evas_Object *subobj, Evas_Object *after);
-        [ :elm_box_pack_after, [ :evas_object_p, :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_box_clear(Evas_Object *obj);
-        [ :elm_box_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_box_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_unpack, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_box_unpack_all(Evas_Object *obj);
-        [ :elm_box_unpack_all, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_box_children_get(const Evas_Object *obj);
-        [ :elm_box_children_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_box_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :elm_box_padding_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_box_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :elm_box_padding_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_box_align_set(Evas_Object *obj, double horizontal, double vertical);
-        [ :elm_box_align_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_box_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
-        [ :elm_box_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_box_recalculate(Evas_Object *obj);
-        [ :elm_box_recalculate, [ :evas_object_p ], :void ],
-        # EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        [ :elm_box_layout_set, [ :evas_object_p, :evas_object_box_layout, :void_p, :evas_free_data_cb ], :void ],
-        # EAPI void elm_box_layout_transition(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
-        [ :elm_box_layout_transition, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
-        # EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, void(*start_layout_free_data)(void *data), Evas_Object_Box_Layout end_layout, void *end_layout_data, void(*end_layout_free_data)(void *data), void(*transition_end_cb)(void *data), void *transition_end_data);
-        [ :elm_box_transition_new, [ :double, :evas_object_box_layout, :void_p, :evas_free_data_cb, :evas_object_box_layout, :void_p, :evas_free_data_cb, :elm_box_transition_end_cb, :void_p ], :elm_box_transition_p ],
-        # EAPI void elm_box_transition_free(void *data);
-        [ :elm_box_transition_free, [ :void_p ], :void ],
-        # EAPI Evas_Object *elm_button_add(Evas_Object *parent);
-        [ :elm_button_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on);
-        [ :elm_button_autorepeat_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t);
-        [ :elm_button_autorepeat_initial_timeout_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_button_autorepeat_initial_timeout_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_initial_timeout_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t);
-        [ :elm_button_autorepeat_gap_timeout_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_gap_timeout_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent);
-        [ :elm_fileselector_button_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_fileselector_button_icon_set(Evas_Object *obj, Evas_Object *icon);
-        [ :elm_fileselector_button_icon_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_fileselector_button_icon_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_icon_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_fileselector_button_icon_unset(Evas_Object *obj);
-        [ :elm_fileselector_button_icon_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_fileselector_button_window_title_set(Evas_Object *obj, const char *title);
-        [ :elm_fileselector_button_window_title_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_button_window_title_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_window_title_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_fileselector_button_window_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height);
-        [ :elm_fileselector_button_window_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_fileselector_button_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
-        [ :elm_fileselector_button_window_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_fileselector_button_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_button_path_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_button_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_path_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_expandable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_button_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_expandable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_folder_only_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_button_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_folder_only_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_is_save_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_button_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_is_save_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_button_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_inwin_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_button_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_inwin_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_fileselector_entry_add(Evas_Object *parent);
-        [ :elm_fileselector_entry_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon);
-        [ :elm_fileselector_entry_button_icon_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_fileselector_entry_button_icon_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_button_icon_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_fileselector_entry_button_icon_unset(Evas_Object *obj);
-        [ :elm_fileselector_entry_button_icon_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_fileselector_entry_window_title_set(Evas_Object *obj, const char *title);
-        [ :elm_fileselector_entry_window_title_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_entry_window_title_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_window_title_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_fileselector_entry_window_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height);
-        [ :elm_fileselector_entry_window_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_fileselector_entry_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
-        [ :elm_fileselector_entry_window_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_fileselector_entry_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_entry_path_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_entry_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_path_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_expandable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_entry_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_expandable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_folder_only_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_entry_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_folder_only_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_is_save_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_entry_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_is_save_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_entry_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_inwin_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_inwin_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_entry_selected_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_entry_selected_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_selected_get, [ :evas_object_p ], :string ],
-        # EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
-        [ :elm_scroller_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_scroller_custom_widget_base_theme_set(Evas_Object *obj, const char *widget, const char *base);
-        [ :elm_scroller_custom_widget_base_theme_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
-        [ :elm_scroller_content_min_limit, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_scroller_region_show, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-        [ :elm_scroller_policy_set, [ :evas_object_p, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
-        [ :elm_scroller_policy_get, [ :evas_object_p, :elm_scroller_policy_p, :elm_scroller_policy_p ], :void ],
-        # EAPI void elm_scroller_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_scroller_region_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_scroller_child_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_scroller_child_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_scroller_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_scroller_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_scroller_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
-        [ :elm_scroller_page_relative_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
-        [ :elm_scroller_page_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_scroller_current_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_scroller_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_scroller_last_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_scroller_page_show(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_scroller_page_show, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_scroller_page_bring_in(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_scroller_page_bring_in, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_scroller_region_bring_in, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation);
-        [ :elm_scroller_propagate_events_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj);
-        [ :elm_scroller_propagate_events_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y);
-        [ :elm_scroller_gravity_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y);
-        [ :elm_scroller_gravity_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI Evas_Object *elm_label_add(Evas_Object *parent);
-        [ :elm_label_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_label_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
-        [ :elm_label_line_wrap_set, [ :evas_object_p, :elm_wrap_type ], :void ],
-        # EAPI Elm_Wrap_Type elm_label_line_wrap_get(const Evas_Object *obj);
-        [ :elm_label_line_wrap_get, [ :evas_object_p ], :elm_wrap_type ],
-        # EAPI void elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w);
-        [ :elm_label_wrap_width_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Evas_Coord elm_label_wrap_width_get(const Evas_Object *obj);
-        [ :elm_label_wrap_width_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_label_wrap_height_set(Evas_Object *obj, Evas_Coord h);
-        [ :elm_label_wrap_height_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Evas_Coord elm_label_wrap_height_get(const Evas_Object *obj);
-        [ :elm_label_wrap_height_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_label_fontsize_set(Evas_Object *obj, int fontsize);
-        [ :elm_label_fontsize_set, [ :evas_object_p, :int ], :void ],
-        # EAPI void elm_label_text_color_set(Evas_Object *obj, unsigned int r, unsigned int g, unsigned int b, unsigned int a);
-        [ :elm_label_text_color_set, [ :evas_object_p, :uint, :uint, :uint, :uint ], :void ],
-        # EAPI void elm_label_text_align_set(Evas_Object *obj, const char *alignmode);
-        [ :elm_label_text_align_set, [ :evas_object_p, :string ], :void ],
-        # EAPI void elm_label_background_color_set(Evas_Object *obj, unsigned int r, unsigned int g, unsigned int b, unsigned int a);
-        [ :elm_label_background_color_set, [ :evas_object_p, :uint, :uint, :uint, :uint ], :void ],
-        # EAPI void elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis);
-        [ :elm_label_ellipsis_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_label_slide_set(Evas_Object *obj, Eina_Bool slide);
-        [ :elm_label_slide_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_label_slide_get(Evas_Object *obj);
-        [ :elm_label_slide_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_label_slide_duration_set(Evas_Object *obj, double duration);
-        [ :elm_label_slide_duration_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_label_slide_duration_get(Evas_Object *obj);
-        [ :elm_label_slide_duration_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_frame_add(Evas_Object *parent);
-        [ :elm_frame_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_table_add(Evas_Object *parent);
-        [ :elm_table_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_table_homogeneous_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj);
-        [ :elm_table_homogeneous_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :elm_table_padding_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_table_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :elm_table_padding_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_table_pack, [ :evas_object_p, :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_table_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_table_unpack, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_table_clear(Evas_Object *obj, Eina_Bool clear);
-        [ :elm_table_clear, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_table_pack_set(Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_table_pack_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_table_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h);
-        [ :elm_table_pack_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent);
-        [ :elm_gengrid_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_gengrid_item_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_gengrid_item_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gengrid_group_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_gengrid_group_item_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gengrid_group_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_gengrid_group_item_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x, double align_y);
-        [ :elm_gengrid_align_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_gengrid_align_get(const Evas_Object *obj, double *align_x, double *align_y);
-        [ :elm_gengrid_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_gengrid_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
-        [ :elm_gengrid_reorder_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_reorder_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_reorder_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_append, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :evas_smart_cb, :void_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_prepend, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :evas_smart_cb, :void_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_insert_before, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :elm_gengrid_item_p, :evas_smart_cb, :void_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_insert_after, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :elm_gengrid_item_p, :evas_smart_cb, :void_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_sorted_insert, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :eina_compare_cb, :evas_smart_cb, :void_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_direct_sorted_insert, [ :evas_object_p, :elm_gengrid_item_class_p, :void_p, :eina_compare_cb, :evas_smart_cb, :void_p ], :elm_gengrid_item_p
-            ],
-        # EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
-        [ :elm_gengrid_always_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_always_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
-        [ :elm_gengrid_no_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_no_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_gengrid_multi_select_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj);
-        [ :elm_gengrid_multi_select_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_gengrid_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_gengrid_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
-        [ :elm_gengrid_page_relative_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel);
-        [ :elm_gengrid_page_relative_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
-        [ :elm_gengrid_page_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_gengrid_current_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_gengrid_last_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_gengrid_page_show, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_gengrid_page_bring_in, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool setting);
-        [ :elm_gengrid_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj);
-        [ :elm_gengrid_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_first_item_get, [ :evas_object_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_last_item_get, [ :evas_object_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_next_get, [ :elm_gengrid_item_p ], :elm_gengrid_item_p ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_prev_get, [ :elm_gengrid_item_p ], :elm_gengrid_item_p ],
-        # EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_gengrid_get, [ :elm_gengrid_item_p ], :evas_object_p ],
-        # EAPI void elm_gengrid_item_del(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_del, [ :elm_gengrid_item_p ], :void ],
-        # EAPI void elm_gengrid_item_update(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_update, [ :elm_gengrid_item_p ], :void ],
-        # EAPI const Elm_Gengrid_Item_Class *elm_gengrid_item_item_class_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_item_class_get, [ :elm_gengrid_item_p ], :elm_gengrid_item_class_p ],
-        # EAPI void elm_gengrid_item_item_class_set(Elm_Gengrid_Item *item, const Elm_Gengrid_Item_Class *gic);
-        [ :elm_gengrid_item_item_class_set, [ :elm_gengrid_item_p, :elm_gengrid_item_class_p ], :void ],
-        # EAPI void *elm_gengrid_item_data_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_data_get, [ :elm_gengrid_item_p ], :void_p ],
-        # EAPI void elm_gengrid_item_data_set(Elm_Gengrid_Item *item, const void *data);
-        [ :elm_gengrid_item_data_set, [ :elm_gengrid_item_p, :void_p ], :void ],
-        # EAPI void elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y);
-        [ :elm_gengrid_item_pos_get, [ :elm_gengrid_item_p, :uint_p, :uint_p ], :void ],
-        # EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected);
-        [ :elm_gengrid_item_selected_set, [ :elm_gengrid_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_selected_get, [ :elm_gengrid_item_p ], :eina_bool ],
-        # EAPI const Evas_Object *elm_gengrid_item_object_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_object_get, [ :elm_gengrid_item_p ], :evas_object_p ],
-        # EAPI void elm_gengrid_item_show(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_show, [ :elm_gengrid_item_p ], :void ],
-        # EAPI void elm_gengrid_item_bring_in(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_bring_in, [ :elm_gengrid_item_p ], :void ],
-        # EAPI void elm_gengrid_item_disabled_set(Elm_Gengrid_Item *item, Eina_Bool disabled);
-        [ :elm_gengrid_item_disabled_set, [ :elm_gengrid_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_item_disabled_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_disabled_get, [ :elm_gengrid_item_p ], :eina_bool ],
-        # EAPI void elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *item, const char *text);
-        [ :elm_gengrid_item_tooltip_text_set, [ :elm_gengrid_item_p, :string ], :void ],
-        # EAPI void elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_gengrid_item_tooltip_content_cb_set, [ :elm_gengrid_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_tooltip_unset, [ :elm_gengrid_item_p ], :void ],
-        # EAPI void elm_gengrid_item_tooltip_style_set(Elm_Gengrid_Item *item, const char *style);
-        [ :elm_gengrid_item_tooltip_style_set, [ :elm_gengrid_item_p, :string ], :void ],
-        # EAPI const char *elm_gengrid_item_tooltip_style_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_tooltip_style_get, [ :elm_gengrid_item_p ], :string ],
-        # EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Gengrid_Item *item, Eina_Bool disable);
-        [ :elm_gengrid_item_tooltip_window_mode_set, [ :elm_gengrid_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_tooltip_window_mode_get, [ :elm_gengrid_item_p ], :eina_bool ],
-        # EAPI void elm_gengrid_item_cursor_set(Elm_Gengrid_Item *item, const char *cursor);
-        [ :elm_gengrid_item_cursor_set, [ :elm_gengrid_item_p, :string ], :void ],
-        # EAPI const char *elm_gengrid_item_cursor_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_cursor_get, [ :elm_gengrid_item_p ], :string ],
-        # EAPI void elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_cursor_unset, [ :elm_gengrid_item_p ], :void ],
-        # EAPI void elm_gengrid_item_cursor_style_set(Elm_Gengrid_Item *item, const char *style);
-        [ :elm_gengrid_item_cursor_style_set, [ :elm_gengrid_item_p, :string ], :void ],
-        # EAPI const char *elm_gengrid_item_cursor_style_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_cursor_style_get, [ :elm_gengrid_item_p ], :string ],
-        # EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *item, Eina_Bool engine_only);
-        [ :elm_gengrid_item_cursor_engine_only_set, [ :elm_gengrid_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_cursor_engine_only_get, [ :elm_gengrid_item_p ], :eina_bool ],
-        # EAPI void elm_gengrid_clear(Evas_Object *obj);
-        [ :elm_gengrid_clear, [ :evas_object_p ], :void ],
-        # EAPI Elm_Gengrid_Item *elm_gengrid_selected_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_selected_item_get, [ :evas_object_p ], :elm_gengrid_item_p ],
-        # EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj);
-        [ :elm_gengrid_selected_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
-        [ :elm_clock_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
-        [ :elm_clock_time_set, [ :evas_object_p, :int, :int, :int ], :void ],
-        # EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec);
-        [ :elm_clock_time_get, [ :evas_object_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit);
-        [ :elm_clock_edit_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_clock_edit_get(const Evas_Object *obj);
-        [ :elm_clock_edit_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit);
-        [ :elm_clock_digit_edit_set, [ :evas_object_p, :elm_clock_digedit ], :void ],
-        # EAPI Elm_Clock_Digedit elm_clock_digit_edit_get(const Evas_Object *obj);
-        [ :elm_clock_digit_edit_get, [ :evas_object_p ], :elm_clock_digedit ],
-        # EAPI void elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm);
-        [ :elm_clock_show_am_pm_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_clock_show_am_pm_get(const Evas_Object *obj);
-        [ :elm_clock_show_am_pm_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds);
-        [ :elm_clock_show_seconds_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_clock_show_seconds_get(const Evas_Object *obj);
-        [ :elm_clock_show_seconds_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_clock_interval_set(Evas_Object *obj, double interval);
-        [ :elm_clock_interval_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_clock_interval_get(const Evas_Object *obj);
-        [ :elm_clock_interval_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
-        [ :elm_layout_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_layout_file_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
-        [ :elm_layout_theme_set, [ :evas_object_p, :string, :string, :string ], :eina_bool ],
-        # EAPI void elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_append, [ :evas_object_p, :string, :evas_object_p ], :void ],
-        # EAPI void elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_prepend, [ :evas_object_p, :string, :evas_object_p ], :void ],
-        # EAPI void elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
-        [ :elm_layout_box_insert_before, [ :evas_object_p, :string, :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
-        [ :elm_layout_box_insert_at, [ :evas_object_p, :string, :evas_object_p, :uint ], :void ],
-        # EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_remove, [ :evas_object_p, :string, :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :elm_layout_box_remove_all, [ :evas_object_p, :string, :eina_bool ], :void ],
-        # EAPI void elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :elm_layout_table_pack, [ :evas_object_p, :string, :evas_object_p, :ushort, :ushort, :ushort, :ushort ], :void ],
-        # EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj);
-        [ :elm_layout_table_unpack, [ :evas_object_p, :string, :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :elm_layout_table_clear, [ :evas_object_p, :string, :eina_bool ], :void ],
-        # EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
-        [ :elm_layout_edje_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char *elm_layout_data_get(const Evas_Object *obj, const char *key);
-        [ :elm_layout_data_get, [ :evas_object_p, :string ], :string ],
-        # EAPI void elm_layout_sizing_eval(Evas_Object *obj);
-        [ :elm_layout_sizing_eval, [ :evas_object_p ], :void ],
-        # EAPI Eina_Bool elm_layout_part_cursor_set(Evas_Object *obj, const char *part_name, const char *cursor);
-        [ :elm_layout_part_cursor_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI const char *elm_layout_part_cursor_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_get, [ :evas_object_p, :string ], :string ],
-        # EAPI void elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_unset, [ :evas_object_p, :string ], :void ],
-        # EAPI Eina_Bool elm_layout_part_cursor_style_set(Evas_Object *obj, const char *part_name, const char *style);
-        [ :elm_layout_part_cursor_style_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_style_get, [ :evas_object_p, :string ], :string ],
-        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_set(Evas_Object *obj, const char *part_name, Eina_Bool engine_only);
-        [ :elm_layout_part_cursor_engine_only_set, [ :evas_object_p, :string, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_engine_only_get, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI Evas_Object *elm_notify_add(Evas_Object *parent);
-        [ :elm_notify_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_notify_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj);
-        [ :elm_notify_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient);
-        [ :elm_notify_orient_set, [ :evas_object_p, :elm_notify_orient ], :void ],
-        # EAPI Elm_Notify_Orient elm_notify_orient_get(const Evas_Object *obj);
-        [ :elm_notify_orient_get, [ :evas_object_p ], :elm_notify_orient ],
-        # EAPI void elm_notify_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_notify_timeout_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_notify_timeout_get(const Evas_Object *obj);
-        [ :elm_notify_timeout_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat);
-        [ :elm_notify_repeat_events_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_notify_repeat_events_get(const Evas_Object *obj);
-        [ :elm_notify_repeat_events_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
-        [ :elm_hover_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
-        [ :elm_hover_target_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_hover_target_get(const Evas_Object *obj);
-        [ :elm_hover_target_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_hover_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_hover_parent_get(const Evas_Object *obj);
-        [ :elm_hover_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
-        [ :elm_hover_content_set, [ :evas_object_p, :string, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_hover_content_get(const Evas_Object *obj, const char *swallow);
-        [ :elm_hover_content_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI Evas_Object *elm_hover_content_unset(Evas_Object *obj, const char *swallow);
-        [ :elm_hover_content_unset, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI const char *elm_hover_best_content_location_get(const Evas_Object *obj, Elm_Hover_Axis pref_axis);
-        [ :elm_hover_best_content_location_get, [ :evas_object_p, :elm_hover_axis ], :string ],
-        # EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
-        [ :elm_entry_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
-        [ :elm_entry_single_line_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_single_line_get(const Evas_Object *obj);
-        [ :elm_entry_single_line_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password);
-        [ :elm_entry_password_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj);
-        [ :elm_entry_password_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
-        [ :elm_entry_entry_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_append, [ :evas_object_p, :string ], :void ],
-        # EAPI Eina_Bool elm_entry_is_empty(const Evas_Object *obj);
-        [ :elm_entry_is_empty, [ :evas_object_p ], :eina_bool ],
-        # EAPI const char *elm_entry_selection_get(const Evas_Object *obj);
-        [ :elm_entry_selection_get, [ :evas_object_p ], :string ],
-        # EAPI const Evas_Object *elm_entry_textblock_get(const Evas_Object *obj);
-        [ :elm_entry_textblock_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_entry_calc_force(const Evas_Object *obj);
-        [ :elm_entry_calc_force, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_insert, [ :evas_object_p, :string ], :void ],
-        # EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
-        [ :elm_entry_line_wrap_set, [ :evas_object_p, :elm_wrap_type ], :void ],
-        # EAPI Elm_Wrap_Type elm_entry_line_wrap_get(const Evas_Object *obj);
-        [ :elm_entry_line_wrap_get, [ :evas_object_p ], :elm_wrap_type ],
-        # EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable);
-        [ :elm_entry_editable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj);
-        [ :elm_entry_editable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_select_none(Evas_Object *obj);
-        [ :elm_entry_select_none, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_select_all(Evas_Object *obj);
-        [ :elm_entry_select_all, [ :evas_object_p ], :void ],
-        # EAPI Eina_Bool elm_entry_cursor_next(Evas_Object *obj);
-        [ :elm_entry_cursor_next, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_entry_cursor_prev(Evas_Object *obj);
-        [ :elm_entry_cursor_prev, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_entry_cursor_up(Evas_Object *obj);
-        [ :elm_entry_cursor_up, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_entry_cursor_down(Evas_Object *obj);
-        [ :elm_entry_cursor_down, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_cursor_begin_set(Evas_Object *obj);
-        [ :elm_entry_cursor_begin_set, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_cursor_end_set(Evas_Object *obj);
-        [ :elm_entry_cursor_end_set, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_cursor_line_begin_set(Evas_Object *obj);
-        [ :elm_entry_cursor_line_begin_set, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_cursor_line_end_set(Evas_Object *obj);
-        [ :elm_entry_cursor_line_end_set, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_cursor_selection_begin(Evas_Object *obj);
-        [ :elm_entry_cursor_selection_begin, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_cursor_selection_end(Evas_Object *obj);
-        [ :elm_entry_cursor_selection_end, [ :evas_object_p ], :void ],
-        # EAPI Eina_Bool elm_entry_cursor_is_format_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_is_format_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_entry_cursor_is_visible_format_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_is_visible_format_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI const char *elm_entry_cursor_content_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_content_get, [ :evas_object_p ], :string ],
-        # EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_entry_cursor_geometry_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
-        # EAPI void elm_entry_cursor_pos_set(Evas_Object *obj, int pos);
-        [ :elm_entry_cursor_pos_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_entry_cursor_pos_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_pos_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_entry_selection_cut(Evas_Object *obj);
-        [ :elm_entry_selection_cut, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_selection_copy(Evas_Object *obj);
-        [ :elm_entry_selection_copy, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_selection_paste(Evas_Object *obj);
-        [ :elm_entry_selection_paste, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_context_menu_clear(Evas_Object *obj);
-        [ :elm_entry_context_menu_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
-        [ :elm_entry_context_menu_item_add, [ :evas_object_p, :string, :string, :elm_icon_type, :evas_smart_cb, :void_p ], :void ],
-        # EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_entry_context_menu_disabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj);
-        [ :elm_entry_context_menu_disabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *entry, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_entry_text_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_text_filter_append, [ :evas_object_p, :elm_entry_filter_cb, :void_p ], :void ],
-        # EAPI void elm_entry_text_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_text_filter_prepend, [ :evas_object_p, :elm_entry_filter_cb, :void_p ], :void ],
-        # EAPI void elm_entry_text_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_text_filter_remove, [ :evas_object_p, :elm_entry_filter_cb, :void_p ], :void ],
-        # EAPI char *elm_entry_markup_to_utf8(const char *s);
-        [ :elm_entry_markup_to_utf8, [ :string ], :string ],
-        # EAPI char *elm_entry_utf8_to_markup(const char *s);
-        [ :elm_entry_utf8_to_markup, [ :string ], :string ],
-        # EAPI void elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format);
-        [ :elm_entry_file_set, [ :evas_object_p, :string, :elm_text_format ], :void ],
-        # EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format);
-        [ :elm_entry_file_get, [ :evas_object_p, :string_array, :elm_text_format_p ], :void ],
-        # EAPI void elm_entry_file_save(Evas_Object *obj);
-        [ :elm_entry_file_save, [ :evas_object_p ], :void ],
-        # EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave);
-        [ :elm_entry_autosave_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj);
-        [ :elm_entry_autosave_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly);
-        [ :elm_entry_cnp_textonly_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_cnp_textonly_get(const Evas_Object *obj);
-        [ :elm_entry_cnp_textonly_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll);
-        [ :elm_entry_scrollable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj);
-        [ :elm_entry_scrollable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon);
-        [ :elm_entry_icon_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_entry_icon_get(const Evas_Object *obj);
-        [ :elm_entry_icon_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_entry_icon_unset(Evas_Object *obj);
-        [ :elm_entry_icon_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting);
-        [ :elm_entry_icon_visible_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_entry_end_set(Evas_Object *obj, Evas_Object *end);
-        [ :elm_entry_end_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_entry_end_get(const Evas_Object *obj);
-        [ :elm_entry_end_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_entry_end_unset(Evas_Object *obj);
-        [ :elm_entry_end_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting);
-        [ :elm_entry_end_visible_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
-        [ :elm_entry_scrollbar_policy_set, [ :evas_object_p, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_entry_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_entry_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text);
-        [ :elm_entry_filter_limit_size, [ :void_p, :evas_object_p, :string_array ], :void ],
-        # EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
-        [ :elm_entry_filter_accept_set, [ :void_p, :evas_object_p, :string_array ], :void ],
-        # EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
-        [ :elm_entry_input_panel_layout_set, [ :evas_object_p, :elm_input_panel_layout ], :void ],
-        # EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj);
-        [ :elm_entry_input_panel_layout_get, [ :evas_object_p ], :elm_input_panel_layout ],
-        # EAPI void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type);
-        [ :elm_entry_autocapital_type_set, [ :evas_object_p, :elm_autocapital_type ], :void ],
-        # EAPI Elm_Autocapital_Type elm_entry_autocapital_type_get(Evas_Object *obj);
-        [ :elm_entry_autocapital_type_get, [ :evas_object_p ], :elm_autocapital_type ],
-        # EAPI void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_entry_input_panel_enabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent);
-        [ :elm_anchorview_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_anchorview_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_anchorview_hover_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_anchorview_hover_parent_get(const Evas_Object *obj);
-        [ :elm_anchorview_hover_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_anchorview_hover_style_set(Evas_Object *obj, const char *style);
-        [ :elm_anchorview_hover_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_anchorview_hover_style_get(const Evas_Object *obj);
-        [ :elm_anchorview_hover_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_anchorview_hover_end(Evas_Object *obj);
-        [ :elm_anchorview_hover_end, [ :evas_object_p ], :void ],
-        # EAPI void elm_anchorview_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_anchorview_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_anchorview_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_anchorview_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_anchorview_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_anchorview_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_anchorview_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
-        # FIXME
-        # EAPI Evas_Object *elm_anchorblock_add(Evas_Object *parent);
-        [ :elm_anchorblock_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_anchorblock_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_anchorblock_hover_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_anchorblock_hover_parent_get(const Evas_Object *obj);
-        [ :elm_anchorblock_hover_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_anchorblock_hover_style_set(Evas_Object *obj, const char *style);
-        [ :elm_anchorblock_hover_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_anchorblock_hover_style_get(const Evas_Object *obj);
-        [ :elm_anchorblock_hover_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_anchorblock_hover_end(Evas_Object *obj);
-        [ :elm_anchorblock_hover_end, [ :evas_object_p ], :void ],
-        # EAPI void elm_anchorblock_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_anchorblock_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
-        # FIXME
-        # EAPI void elm_anchorblock_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
-        # FIXME
-        # EAPI Evas_Object *elm_bubble_add(Evas_Object *parent);
-        [ :elm_bubble_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_bubble_corner_set(Evas_Object *obj, const char *corner);
-        [ :elm_bubble_corner_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_bubble_corner_get(const Evas_Object *obj);
-        [ :elm_bubble_corner_get, [ :evas_object_p ], :string ],
-        # EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
-        [ :elm_photo_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file);
-        [ :elm_photo_file_set, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI void elm_photo_thumb_set(const Evas_Object *obj, const char *file, const char *group);
-        [ :elm_photo_thumb_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_photo_size_set(Evas_Object *obj, int size);
-        [ :elm_photo_size_set, [ :evas_object_p, :int ], :void ],
-        # EAPI void elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill);
-        [ :elm_photo_fill_inside_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
-        [ :elm_photo_editable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data);
-        [ :elm_gesture_layer_cb_set, [ :evas_object_p, :elm_gesture_types, :elm_gesture_state, :elm_gesture_event_cb, :void_p ], :void ],
-        # EAPI Eina_Bool elm_gesture_layer_hold_events_get(Evas_Object *obj);
-        [ :elm_gesture_layer_hold_events_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool r);
-        [ :elm_gesture_layer_hold_events_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double s);
-        [ :elm_gesture_layer_zoom_step_set, [ :evas_object_p, :double ], :void ],
-        # EAPI void elm_gesture_layer_rotate_step_set(Evas_Object *obj, double s);
-        [ :elm_gesture_layer_rotate_step_set, [ :evas_object_p, :double ], :void ],
-        # EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *t);
-        [ :elm_gesture_layer_attach, [ :evas_object_p, :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_gesture_layer_add(Evas_Object *parent);
-        [ :elm_gesture_layer_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_thumb_add(Evas_Object *parent);
-        [ :elm_thumb_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_thumb_reload(Evas_Object *obj);
-        [ :elm_thumb_reload, [ :evas_object_p ], :void ],
-        # EAPI void elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key);
-        [ :elm_thumb_file_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_thumb_file_get(const Evas_Object *obj, const char **file, const char **key);
-        [ :elm_thumb_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI void elm_thumb_path_get(const Evas_Object *obj, const char **file, const char **key);
-        [ :elm_thumb_path_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI void elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting s);
-        [ :elm_thumb_animate_set, [ :evas_object_p, :elm_thumb_animation_setting ], :void ],
-        # EAPI Elm_Thumb_Animation_Setting elm_thumb_animate_get(const Evas_Object *obj);
-        [ :elm_thumb_animate_get, [ :evas_object_p ], :elm_thumb_animation_setting ],
-        # EAPI void *elm_thumb_ethumb_client_get(void);
-        [ :elm_thumb_ethumb_client_get, [  ], :void_p ],
-        # EAPI Eina_Bool elm_thumb_ethumb_client_connected(void);
-        [ :elm_thumb_ethumb_client_connected, [  ], :eina_bool ],
-        # EAPI Eina_Bool elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit);
-        [ :elm_thumb_editable_set, [ :evas_object_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_thumb_editable_get(const Evas_Object *obj);
-        [ :elm_thumb_editable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_web_add(Evas_Object *parent);
-        [ :elm_web_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_web_webkit_view_get(const Evas_Object *obj);
-        [ :elm_web_webkit_view_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_web_window_create_hook_set(Evas_Object *obj, Elm_Web_Window_Open func, void *data);
-        [ :elm_web_window_create_hook_set, [ :evas_object_p, :elm_web_window_open, :void_p ], :void ],
-        # EAPI void elm_web_dialog_alert_hook_set(Evas_Object *obj, Elm_Web_Dialog_Alert func, void *data);
-        [ :elm_web_dialog_alert_hook_set, [ :evas_object_p, :elm_web_dialog_alert, :void_p ], :void ],
-        # EAPI void elm_web_dialog_confirm_hook_set(Evas_Object *obj, Elm_Web_Dialog_Confirm func, void *data);
-        [ :elm_web_dialog_confirm_hook_set, [ :evas_object_p, :elm_web_dialog_confirm, :void_p ], :void ],
-        # EAPI void elm_web_dialog_prompt_hook_set(Evas_Object *obj, Elm_Web_Dialog_Prompt func, void *data);
-        [ :elm_web_dialog_prompt_hook_set, [ :evas_object_p, :elm_web_dialog_prompt, :void_p ], :void ],
-        # EAPI void elm_web_dialog_file_selector_hook_set(Evas_Object *obj, Elm_Web_Dialog_File_Selector func, void *data);
-        [ :elm_web_dialog_file_selector_hook_set, [ :evas_object_p, :elm_web_dialog_file_selector, :void_p ], :void ],
-        # EAPI void elm_web_console_message_hook_set(Evas_Object *obj, Elm_Web_Console_Message func, void *data);
-        [ :elm_web_console_message_hook_set, [ :evas_object_p, :elm_web_console_message, :void_p ], :void ],
-        # EAPI Eina_Bool elm_web_tab_propagate_get(const Evas_Object *obj);
-        [ :elm_web_tab_propagate_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_web_tab_propagate_set(Evas_Object *obj, Eina_Bool propagate);
-        [ :elm_web_tab_propagate_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_web_uri_set(Evas_Object *obj, const char *uri);
-        [ :elm_web_uri_set, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI const char *elm_web_uri_get(const Evas_Object *obj);
-        [ :elm_web_uri_get, [ :evas_object_p ], :string ],
-        # EAPI const char *elm_web_title_get(const Evas_Object *obj);
-        [ :elm_web_title_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_web_bg_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :elm_web_bg_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_web_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :elm_web_bg_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_web_popup_selected_set(Evas_Object *obj, int index);
-        [ :elm_web_popup_selected_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Eina_Bool elm_web_popup_destroy(Evas_Object *obj);
-        [ :elm_web_popup_destroy, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_text_search(const Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap);
-        [ :elm_web_text_search, [ :evas_object_p, :string, :eina_bool, :eina_bool, :eina_bool ], :eina_bool ],
-        # EAPI unsigned int elm_web_text_matches_mark(Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit);
-        [ :elm_web_text_matches_mark, [ :evas_object_p, :string, :eina_bool, :eina_bool, :uint ], :uint ],
-        # EAPI Eina_Bool elm_web_text_matches_unmark_all(Evas_Object *obj);
-        [ :elm_web_text_matches_unmark_all, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_text_matches_highlight_set(Evas_Object *obj, Eina_Bool highlight);
-        [ :elm_web_text_matches_highlight_set, [ :evas_object_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_text_matches_highlight_get(const Evas_Object *obj);
-        [ :elm_web_text_matches_highlight_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI double elm_web_load_progress_get(const Evas_Object *obj);
-        [ :elm_web_load_progress_get, [ :evas_object_p ], :double ],
-        # EAPI Eina_Bool elm_web_stop(Evas_Object *obj);
-        [ :elm_web_stop, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_reload(Evas_Object *obj);
-        [ :elm_web_reload, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_reload_full(Evas_Object *obj);
-        [ :elm_web_reload_full, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_back(Evas_Object *obj);
-        [ :elm_web_back, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_forward(Evas_Object *obj);
-        [ :elm_web_forward, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_navigate(Evas_Object *obj, int steps);
-        [ :elm_web_navigate, [ :evas_object_p, :int ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_back_possible(Evas_Object *obj);
-        [ :elm_web_back_possible, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_forward_possible(Evas_Object *obj);
-        [ :elm_web_forward_possible, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_navigate_possible(Evas_Object *obj, int steps);
-        [ :elm_web_navigate_possible, [ :evas_object_p, :int ], :eina_bool ],
-        # EAPI Eina_Bool elm_web_history_enable_get(const Evas_Object *obj);
-        [ :elm_web_history_enable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_web_history_enable_set(Evas_Object *obj, Eina_Bool enable);
-        [ :elm_web_history_enable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_web_zoom_set(Evas_Object *obj, double zoom);
-        [ :elm_web_zoom_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_web_zoom_get(const Evas_Object *obj);
-        [ :elm_web_zoom_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_web_zoom_mode_set(Evas_Object *obj, Elm_Web_Zoom_Mode mode);
-        [ :elm_web_zoom_mode_set, [ :evas_object_p, :elm_web_zoom_mode ], :void ],
-        # EAPI Elm_Web_Zoom_Mode elm_web_zoom_mode_get(const Evas_Object *obj);
-        [ :elm_web_zoom_mode_get, [ :evas_object_p ], :elm_web_zoom_mode ],
-        # EAPI void elm_web_region_show(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_web_region_show, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_web_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_web_region_bring_in, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_web_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_web_inwin_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_web_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_web_inwin_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_web_window_features_ref(Elm_Web_Window_Features *wf);
-        [ :elm_web_window_features_ref, [ :elm_web_window_features_p ], :void ],
-        # EAPI void elm_web_window_features_unref(Elm_Web_Window_Features *wf);
-        [ :elm_web_window_features_unref, [ :elm_web_window_features_p ], :void ],
-        # EAPI void elm_web_window_features_bool_property_get(const Elm_Web_Window_Features *wf, Eina_Bool *toolbar_visible, Eina_Bool *statusbar_visible, Eina_Bool *scrollbars_visible, Eina_Bool *menubar_visible, Eina_Bool *locationbar_visble, Eina_Bool *fullscreen);
-        [ :elm_web_window_features_bool_property_get, [ :elm_web_window_features_p, :eina_bool_p, :eina_bool_p, :eina_bool_p, :eina_bool_p, :eina_bool_p, :eina_bool_p ],
-            :void ],
-        # EAPI void elm_web_window_features_int_property_get(const Elm_Web_Window_Features *wf, int *x, int *y, int *w, int *h);
-        [ :elm_web_window_features_int_property_get, [ :elm_web_window_features_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
-        [ :elm_hoversel_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_hoversel_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_hoversel_horizontal_get(const Evas_Object *obj);
-        [ :elm_hoversel_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_hoversel_hover_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_hoversel_hover_parent_get(const Evas_Object *obj);
-        [ :elm_hoversel_hover_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_hoversel_hover_begin(Evas_Object *obj);
-        [ :elm_hoversel_hover_begin, [ :evas_object_p ], :void ],
-        # EAPI void elm_hoversel_hover_end(Evas_Object *obj);
-        [ :elm_hoversel_hover_end, [ :evas_object_p ], :void ],
-        # EAPI Eina_Bool elm_hoversel_expanded_get(const Evas_Object *obj);
-        [ :elm_hoversel_expanded_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_hoversel_clear(Evas_Object *obj);
-        [ :elm_hoversel_clear, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_hoversel_items_get(const Evas_Object *obj);
-        [ :elm_hoversel_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_Object_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
-        [ :elm_hoversel_item_add, [ :evas_object_p, :string, :string, :elm_icon_type, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI void elm_hoversel_item_del(Elm_Object_Item *it);
-        [ :elm_hoversel_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_hoversel_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func);
-        [ :elm_hoversel_item_del_cb_set, [ :elm_object_item_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type);
-        [ :elm_hoversel_item_icon_set, [ :elm_object_item_p, :string, :string, :elm_icon_type ], :void ],
-        # EAPI void elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type);
-        [ :elm_hoversel_item_icon_get, [ :elm_object_item_p, :string_array, :string_array, :elm_icon_type_p ], :void ],
-        # EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
-        [ :elm_toolbar_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
-        [ :elm_toolbar_icon_size_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_toolbar_icon_size_get(const Evas_Object *obj);
-        [ :elm_toolbar_icon_size_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_toolbar_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
-        [ :elm_toolbar_icon_order_lookup_set, [ :evas_object_p, :elm_icon_lookup_order ], :void ],
-        # EAPI Elm_Icon_Lookup_Order elm_toolbar_icon_order_lookup_get(const Evas_Object *obj);
-        [ :elm_toolbar_icon_order_lookup_get, [ :evas_object_p ], :elm_icon_lookup_order ],
-        # EAPI void elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
-        [ :elm_toolbar_always_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_always_select_mode_get(const Evas_Object *obj);
-        [ :elm_toolbar_always_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
-        [ :elm_toolbar_no_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_no_select_mode_get(const Evas_Object *obj);
-        [ :elm_toolbar_no_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_append, [ :evas_object_p, :string, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_prepend, [ :evas_object_p, :string, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_before, [ :evas_object_p, :elm_object_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_after, [ :evas_object_p, :elm_object_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_first_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_first_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_last_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_last_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_next_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_next_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_prev_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_prev_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI void elm_toolbar_item_priority_set(Elm_Object_Item *it, int priority);
-        [ :elm_toolbar_item_priority_set, [ :elm_object_item_p, :int ], :void ],
-        # EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_priority_get, [ :elm_object_item_p ], :int ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label);
-        [ :elm_toolbar_item_find_by_label, [ :evas_object_p, :string ], :elm_object_item_p ],
-        # EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_selected_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_toolbar_item_selected_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Elm_Object_Item *elm_toolbar_selected_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_selected_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI void elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon);
-        [ :elm_toolbar_item_icon_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_icon_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_icon_get, [ :elm_object_item_p ], :string ],
-        # EAPI Evas_Object *elm_toolbar_item_object_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_object_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_toolbar_item_icon_object_get(Elm_Object_Item *it);
-        [ :elm_toolbar_item_icon_object_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t size, const char *format, const char *key);
-        [ :elm_toolbar_item_icon_memfile_set, [ :elm_object_item_p, :void_p, :ulong, :string, :string ], :eina_bool ],
-        # EAPI Eina_Bool elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key);
-        [ :elm_toolbar_item_icon_file_set, [ :elm_object_item_p, :string, :string ], :eina_bool ],
-        # EAPI void elm_toolbar_item_del(Elm_Object_Item *it);
-        [ :elm_toolbar_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_toolbar_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func);
-        [ :elm_toolbar_item_del_cb_set, [ :elm_object_item_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator);
-        [ :elm_toolbar_item_separator_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_separator_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
-        [ :elm_toolbar_mode_shrink_set, [ :evas_object_p, :elm_toolbar_shrink_mode ], :void ],
-        # EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj);
-        [ :elm_toolbar_mode_shrink_get, [ :evas_object_p ], :elm_toolbar_shrink_mode ],
-        # EAPI void elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_toolbar_homogeneous_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj);
-        [ :elm_toolbar_homogeneous_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_toolbar_menu_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_toolbar_menu_parent_get(const Evas_Object *obj);
-        [ :elm_toolbar_menu_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_toolbar_align_set(Evas_Object *obj, double align);
-        [ :elm_toolbar_align_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_toolbar_align_get(const Evas_Object *obj);
-        [ :elm_toolbar_align_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu);
-        [ :elm_toolbar_item_menu_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Evas_Object *elm_toolbar_item_menu_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_menu_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_state_add, [ :elm_object_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_toolbar_item_state_p ],
-        # EAPI Eina_Bool elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state);
-        [ :elm_toolbar_item_state_del, [ :elm_object_item_p, :elm_toolbar_item_state_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state);
-        [ :elm_toolbar_item_state_set, [ :elm_object_item_p, :elm_toolbar_item_state_p ], :eina_bool ],
-        # EAPI void elm_toolbar_item_state_unset(Elm_Object_Item *it);
-        [ :elm_toolbar_item_state_unset, [ :elm_object_item_p ], :void ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_state_get, [ :elm_object_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_next(Elm_Object_Item *it);
-        [ :elm_toolbar_item_state_next, [ :elm_object_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_prev(Elm_Object_Item *it);
-        [ :elm_toolbar_item_state_prev, [ :elm_object_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI void elm_toolbar_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
-        [ :elm_toolbar_item_tooltip_text_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_toolbar_item_tooltip_content_cb_set, [ :elm_object_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_unset(Elm_Object_Item *it);
-        [ :elm_toolbar_item_tooltip_unset, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
-        [ :elm_toolbar_item_tooltip_style_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_tooltip_style_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_tooltip_style_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_set(Elm_Object_Item *it, const char *cursor);
-        [ :elm_toolbar_item_cursor_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_cursor_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_cursor_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_unset(Elm_Object_Item *it);
-        [ :elm_toolbar_item_cursor_unset, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_toolbar_item_cursor_style_set(Elm_Object_Item *it, const char *style);
-        [ :elm_toolbar_item_cursor_style_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_cursor_style_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_cursor_style_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only);
-        [ :elm_toolbar_item_cursor_engine_only_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_item_cursor_engine_only_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_cursor_engine_only_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_toolbar_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_horizontal_get(const Evas_Object *obj);
-        [ :elm_toolbar_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI double elm_tooltip_delay_get(void);
-        [ :elm_tooltip_delay_get, [  ], :double ],
-        # EAPI Eina_Bool elm_tooltip_delay_set(double delay);
-        [ :elm_tooltip_delay_set, [ :double ], :eina_bool ],
-        # EAPI void elm_object_tooltip_show(Evas_Object *obj);
-        [ :elm_object_tooltip_show, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_tooltip_hide(Evas_Object *obj);
-        [ :elm_object_tooltip_hide, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_tooltip_text_set(Evas_Object *obj, const char *text);
-        [ :elm_object_tooltip_text_set, [ :evas_object_p, :string ], :void ],
-        # EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *obj, const char *domain, const char *text);
-        [ :elm_object_tooltip_domain_translatable_text_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_object_tooltip_content_cb_set, [ :evas_object_p, :elm_tooltip_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_object_tooltip_unset(Evas_Object *obj);
-        [ :elm_object_tooltip_unset, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_tooltip_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
-        [ :elm_object_tooltip_style_get, [ :evas_object_p ], :string ],
-        # EAPI Eina_Bool elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable);
-        [ :elm_object_tooltip_window_mode_set, [ :evas_object_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_object_tooltip_window_mode_get(const Evas_Object *obj);
-        [ :elm_object_tooltip_window_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor);
-        [ :elm_object_cursor_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_object_cursor_get(const Evas_Object *obj);
-        [ :elm_object_cursor_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_object_cursor_unset(Evas_Object *obj);
-        [ :elm_object_cursor_unset, [ :evas_object_p ], :void ],
-        # EAPI void elm_object_cursor_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_cursor_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_object_cursor_style_get(const Evas_Object *obj);
-        [ :elm_object_cursor_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only);
-        [ :elm_object_cursor_engine_only_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_object_cursor_engine_only_get(const Evas_Object *obj);
-        [ :elm_object_cursor_engine_only_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI int elm_cursor_engine_only_get(void);
-        [ :elm_cursor_engine_only_get, [  ], :int ],
-        # EAPI Eina_Bool elm_cursor_engine_only_set(int engine_only);
-        [ :elm_cursor_engine_only_set, [ :int ], :eina_bool ],
-        # EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
-        [ :elm_menu_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_menu_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj);
-        [ :elm_menu_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :elm_menu_move, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_menu_close(Evas_Object *obj);
-        [ :elm_menu_close, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_menu_items_get(const Evas_Object *obj);
-        [ :elm_menu_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Evas_Object *elm_menu_item_object_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_object_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Elm_Object_Item *elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_menu_item_add, [ :evas_object_p, :elm_object_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data);
-        [ :elm_menu_item_add_object, [ :evas_object_p, :elm_object_item_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI void elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon);
-        [ :elm_menu_item_object_icon_name_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_menu_item_object_icon_name_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_object_icon_name_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_menu_item_selected_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_selected_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI Elm_Object_Item *elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent);
-        [ :elm_menu_item_separator_add, [ :evas_object_p, :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it);
-        [ :elm_menu_item_is_separator, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_menu_item_del(Elm_Object_Item *it);
-        [ :elm_menu_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_menu_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func);
-        [ :elm_menu_item_del_cb_set, [ :elm_object_item_p, :evas_smart_cb ], :void ],
-        # EAPI const Eina_List *elm_menu_item_subitems_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_subitems_get, [ :elm_object_item_p ], :eina_list_p ],
-        # EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_index_get, [ :elm_object_item_p ], :uint ],
-        # EAPI Evas_Object *elm_menu_item_menu_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_menu_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Elm_Object_Item *elm_menu_selected_item_get(const Evas_Object * obj);
-        [ :elm_menu_selected_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_menu_last_item_get(const Evas_Object * obj);
-        [ :elm_menu_last_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_menu_first_item_get(const Evas_Object * obj);
-        [ :elm_menu_first_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_menu_item_next_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_next_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_menu_item_prev_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_prev_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI Evas_Object *elm_list_add(Evas_Object *parent);
-        [ :elm_list_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_list_go(Evas_Object *obj);
-        [ :elm_list_go, [ :evas_object_p ], :void ],
-        # EAPI void elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_list_multi_select_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_multi_select_get(const Evas_Object *obj);
-        [ :elm_list_multi_select_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_list_mode_set(Evas_Object *obj, Elm_List_Mode mode);
-        [ :elm_list_mode_set, [ :evas_object_p, :elm_list_mode ], :void ],
-        # EAPI Elm_List_Mode elm_list_mode_get(const Evas_Object *obj);
-        [ :elm_list_mode_get, [ :evas_object_p ], :elm_list_mode ],
-        # EAPI void elm_list_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_list_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_horizontal_get(const Evas_Object *obj);
-        [ :elm_list_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_list_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
-        [ :elm_list_always_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_always_select_mode_get(const Evas_Object *obj);
-        [ :elm_list_always_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_list_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_list_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_list_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-        [ :elm_list_scroller_policy_set, [ :evas_object_p, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
-        [ :elm_list_scroller_policy_get, [ :evas_object_p, :elm_scroller_policy_p, :elm_scroller_policy_p ], :void ],
-        # EAPI Elm_List_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_append, [ :evas_object_p, :string, :evas_object_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_list_item_p ],
-        # EAPI Elm_List_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_prepend, [ :evas_object_p, :string, :evas_object_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_list_item_p ],
-        # EAPI Elm_List_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_insert_before, [ :evas_object_p, :elm_list_item_p, :string, :evas_object_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_list_item_p ],
-        # EAPI Elm_List_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_insert_after, [ :evas_object_p, :elm_list_item_p, :string, :evas_object_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_list_item_p ],
-        # EAPI Elm_List_Item *elm_list_item_sorted_insert(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data, Eina_Compare_Cb cmp_func);
-        [ :elm_list_item_sorted_insert, [ :evas_object_p, :string, :evas_object_p, :evas_object_p, :evas_smart_cb, :void_p, :eina_compare_cb ], :elm_list_item_p ],
-        # EAPI void elm_list_clear(Evas_Object *obj);
-        [ :elm_list_clear, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj);
-        [ :elm_list_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_List_Item *elm_list_selected_item_get(const Evas_Object *obj);
-        [ :elm_list_selected_item_get, [ :evas_object_p ], :elm_list_item_p ],
-        # EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj);
-        [ :elm_list_selected_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_list_item_selected_set(Elm_List_Item *item, Eina_Bool selected);
-        [ :elm_list_item_selected_set, [ :elm_list_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_selected_get(const Elm_List_Item *item);
-        [ :elm_list_item_selected_get, [ :elm_list_item_p ], :eina_bool ],
-        # EAPI void elm_list_item_separator_set(Elm_List_Item *it, Eina_Bool setting);
-        [ :elm_list_item_separator_set, [ :elm_list_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_separator_get(const Elm_List_Item *it);
-        [ :elm_list_item_separator_get, [ :elm_list_item_p ], :eina_bool ],
-        # EAPI void elm_list_item_show(Elm_List_Item *item);
-        [ :elm_list_item_show, [ :elm_list_item_p ], :void ],
-        # EAPI void elm_list_item_bring_in(Elm_List_Item *item);
-        [ :elm_list_item_bring_in, [ :elm_list_item_p ], :void ],
-        # EAPI void elm_list_item_del(Elm_List_Item *item);
-        [ :elm_list_item_del, [ :elm_list_item_p ], :void ],
-        # EAPI void elm_list_item_del_cb_set(Elm_List_Item *item, Evas_Smart_Cb func);
-        [ :elm_list_item_del_cb_set, [ :elm_list_item_p, :evas_smart_cb ], :void ],
-        # EAPI void *elm_list_item_data_get(const Elm_List_Item *item);
-        [ :elm_list_item_data_get, [ :elm_list_item_p ], :void_p ],
-        # EAPI Evas_Object *elm_list_item_icon_get(const Elm_List_Item *item);
-        [ :elm_list_item_icon_get, [ :elm_list_item_p ], :evas_object_p ],
-        # EAPI void elm_list_item_icon_set(Elm_List_Item *item, Evas_Object *icon);
-        [ :elm_list_item_icon_set, [ :elm_list_item_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_list_item_end_get(const Elm_List_Item *item);
-        [ :elm_list_item_end_get, [ :elm_list_item_p ], :evas_object_p ],
-        # EAPI void elm_list_item_end_set(Elm_List_Item *item, Evas_Object *end);
-        [ :elm_list_item_end_set, [ :elm_list_item_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_list_item_object_get(const Elm_List_Item *item);
-        [ :elm_list_item_object_get, [ :elm_list_item_p ], :evas_object_p ],
-        # EAPI const char *elm_list_item_label_get(const Elm_List_Item *item);
-        [ :elm_list_item_label_get, [ :elm_list_item_p ], :string ],
-        # EAPI void elm_list_item_label_set(Elm_List_Item *item, const char *text);
-        [ :elm_list_item_label_set, [ :elm_list_item_p, :string ], :void ],
-        # EAPI Elm_List_Item *elm_list_item_prev(const Elm_List_Item *it);
-        [ :elm_list_item_prev, [ :elm_list_item_p ], :elm_list_item_p ],
-        # EAPI Elm_List_Item *elm_list_item_next(const Elm_List_Item *it);
-        [ :elm_list_item_next, [ :elm_list_item_p ], :elm_list_item_p ],
-        # EAPI void elm_list_item_disabled_set(Elm_List_Item *it, Eina_Bool disabled);
-        [ :elm_list_item_disabled_set, [ :elm_list_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_disabled_get(const Elm_List_Item *it);
-        [ :elm_list_item_disabled_get, [ :elm_list_item_p ], :eina_bool ],
-        # EAPI void elm_list_item_tooltip_text_set(Elm_List_Item *item, const char *text);
-        [ :elm_list_item_tooltip_text_set, [ :elm_list_item_p, :string ], :void ],
-        # EAPI Eina_Bool elm_list_item_tooltip_window_mode_set(Elm_List_Item *item, Eina_Bool disable);
-        [ :elm_list_item_tooltip_window_mode_set, [ :elm_list_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_list_item_tooltip_window_mode_get(const Elm_List_Item *item);
-        [ :elm_list_item_tooltip_window_mode_get, [ :elm_list_item_p ], :eina_bool ],
-        # EAPI void elm_list_item_tooltip_content_cb_set(Elm_List_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_list_item_tooltip_content_cb_set, [ :elm_list_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_list_item_tooltip_unset(Elm_List_Item *item);
-        [ :elm_list_item_tooltip_unset, [ :elm_list_item_p ], :void ],
-        # EAPI void elm_list_item_tooltip_style_set(Elm_List_Item *item, const char *style);
-        [ :elm_list_item_tooltip_style_set, [ :elm_list_item_p, :string ], :void ],
-        # EAPI const char *elm_list_item_tooltip_style_get(const Elm_List_Item *item);
-        [ :elm_list_item_tooltip_style_get, [ :elm_list_item_p ], :string ],
-        # EAPI void elm_list_item_cursor_set(Elm_List_Item *item, const char *cursor);
-        [ :elm_list_item_cursor_set, [ :elm_list_item_p, :string ], :void ],
-        # EAPI const char *elm_list_item_cursor_get(const Elm_List_Item *item);
-        [ :elm_list_item_cursor_get, [ :elm_list_item_p ], :string ],
-        # EAPI void elm_list_item_cursor_unset(Elm_List_Item *item);
-        [ :elm_list_item_cursor_unset, [ :elm_list_item_p ], :void ],
-        # EAPI void elm_list_item_cursor_style_set(Elm_List_Item *item, const char *style);
-        [ :elm_list_item_cursor_style_set, [ :elm_list_item_p, :string ], :void ],
-        # EAPI const char *elm_list_item_cursor_style_get(const Elm_List_Item *item);
-        [ :elm_list_item_cursor_style_get, [ :elm_list_item_p ], :string ],
-        # EAPI void elm_list_item_cursor_engine_only_set(Elm_List_Item *item, Eina_Bool engine_only);
-        [ :elm_list_item_cursor_engine_only_set, [ :elm_list_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_cursor_engine_only_get(const Elm_List_Item *item);
-        [ :elm_list_item_cursor_engine_only_get, [ :elm_list_item_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_slider_add(Evas_Object *parent);
-        [ :elm_slider_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size);
-        [ :elm_slider_span_size_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Evas_Coord elm_slider_span_size_get(const Evas_Object *obj);
-        [ :elm_slider_span_size_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_slider_unit_format_set(Evas_Object *obj, const char *format);
-        [ :elm_slider_unit_format_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_slider_unit_format_get(const Evas_Object *obj);
-        [ :elm_slider_unit_format_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator);
-        [ :elm_slider_indicator_format_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_slider_indicator_format_get(const Evas_Object *obj);
-        [ :elm_slider_indicator_format_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_slider_indicator_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str));
-        # FIXME
-        # EAPI void elm_slider_units_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str));
-        # FIXME
-        # EAPI void elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_slider_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_slider_horizontal_get(const Evas_Object *obj);
-        [ :elm_slider_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max);
-        [ :elm_slider_min_max_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max);
-        [ :elm_slider_min_max_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_slider_value_set(Evas_Object *obj, double val);
-        [ :elm_slider_value_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_slider_value_get(const Evas_Object *obj);
-        [ :elm_slider_value_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-        [ :elm_slider_inverted_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_slider_inverted_get(const Evas_Object *obj);
-        [ :elm_slider_inverted_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show);
-        [ :elm_slider_indicator_show_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj);
-        [ :elm_slider_indicator_show_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_actionslider_add(Evas_Object *parent);
-        [ :elm_actionslider_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char *elm_actionslider_selected_label_get(const Evas_Object *obj);
-        [ :elm_actionslider_selected_label_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_indicator_pos_set, [ :evas_object_p, :elm_actionslider_pos ], :void ],
-        # EAPI Elm_Actionslider_Pos elm_actionslider_indicator_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_indicator_pos_get, [ :evas_object_p ], :elm_actionslider_pos ],
-        # EAPI void elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_magnet_pos_set, [ :evas_object_p, :elm_actionslider_pos ], :void ],
-        # EAPI Elm_Actionslider_Pos elm_actionslider_magnet_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_magnet_pos_get, [ :evas_object_p ], :elm_actionslider_pos ],
-        # EAPI void elm_actionslider_enabled_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_enabled_pos_set, [ :evas_object_p, :elm_actionslider_pos ], :void ],
-        # EAPI Elm_Actionslider_Pos elm_actionslider_enabled_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_enabled_pos_get, [ :evas_object_p ], :elm_actionslider_pos ],
-        # EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
-        [ :elm_genlist_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_genlist_clear(Evas_Object *obj);
-        [ :elm_genlist_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_genlist_multi_select_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Object *obj);
-        [ :elm_genlist_multi_select_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_horizontal_set(Evas_Object *obj, Elm_List_Mode mode);
-        [ :elm_genlist_horizontal_set, [ :evas_object_p, :elm_list_mode ], :void ],
-        # EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj);
-        [ :elm_genlist_horizontal_get, [ :evas_object_p ], :elm_list_mode ],
-        # EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
-        [ :elm_genlist_always_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_always_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
-        [ :elm_genlist_no_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_no_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_compress_mode_set(Evas_Object *obj, Eina_Bool compress);
-        [ :elm_genlist_compress_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_compress_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_compress_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_height_for_width_mode_set(Evas_Object *obj, Eina_Bool height_for_width);
-        [ :elm_genlist_height_for_width_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_height_for_width_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_height_for_width_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_genlist_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_genlist_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_genlist_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_genlist_homogeneous_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_homogeneous_get(const Evas_Object *obj);
-        [ :elm_genlist_homogeneous_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_genlist_block_count_set(Evas_Object *obj, int n);
-        [ :elm_genlist_block_count_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_genlist_block_count_get(const Evas_Object *obj);
-        [ :elm_genlist_block_count_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_genlist_longpress_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_genlist_longpress_timeout_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_genlist_longpress_timeout_get(const Evas_Object *obj);
-        [ :elm_genlist_longpress_timeout_get, [ :evas_object_p ], :double ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_append, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_flags, :evas_smart_cb, :void_p ],
-            :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_prepend, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_flags, :evas_smart_cb, :void_p ],
-            :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_insert_before, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_p, :elm_genlist_item_flags,
-            :evas_smart_cb, :void_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_insert_after, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_p, :elm_genlist_item_flags,
-            :evas_smart_cb, :void_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func,const void *func_data);
-        [ :elm_genlist_item_sorted_insert, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_flags, :eina_compare_cb,
-            :evas_smart_cb, :void_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_direct_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_direct_sorted_insert, [ :evas_object_p, :elm_genlist_item_class_p, :void_p, :elm_genlist_item_p, :elm_genlist_item_flags, :eina_compare_cb,
-            :evas_smart_cb, :void_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
-        [ :elm_genlist_selected_item_get, [ :evas_object_p ], :elm_genlist_item_p ],
-        # EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj);
-        [ :elm_genlist_selected_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI const char *elm_genlist_mode_item_style_get(const Evas_Object *obj);
-        [ :elm_genlist_mode_item_style_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style);
-        [ :elm_genlist_mode_item_style_set, [ :evas_object_p, :string ], :void ],
-        # EAPI Eina_List *elm_genlist_realized_items_get(const Evas_Object *obj);
-        [ :elm_genlist_realized_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret);
-        [ :elm_genlist_at_xy_item_get, [ :evas_object_p, :int, :int, :int_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj);
-        [ :elm_genlist_first_item_get, [ :evas_object_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj);
-        [ :elm_genlist_last_item_get, [ :evas_object_p ], :elm_genlist_item_p ],
-        # EAPI void elm_genlist_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-        [ :elm_genlist_scroller_policy_set, [ :evas_object_p, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_genlist_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
-        [ :elm_genlist_scroller_policy_get, [ :evas_object_p, :elm_scroller_policy_p, :elm_scroller_policy_p ], :void ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_next_get, [ :elm_genlist_item_p ], :elm_genlist_item_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_prev_get, [ :elm_genlist_item_p ], :elm_genlist_item_p ],
-        # EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_genlist_get, [ :elm_genlist_item_p ], :evas_object_p ],
-        # EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it);
-        [ :elm_genlist_item_parent_get, [ :elm_genlist_item_p ], :elm_genlist_item_p ],
-        # EAPI void elm_genlist_item_subitems_clear(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_subitems_clear, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected);
-        [ :elm_genlist_item_selected_set, [ :elm_genlist_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_selected_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI void elm_genlist_item_expanded_set(Elm_Genlist_Item *item, Eina_Bool expanded);
-        [ :elm_genlist_item_expanded_set, [ :elm_genlist_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_item_expanded_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_expanded_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI int elm_genlist_item_expanded_depth_get(const Elm_Genlist_Item *it);
-        [ :elm_genlist_item_expanded_depth_get, [ :elm_genlist_item_p ], :int ],
-        # EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Eina_Bool disabled);
-        [ :elm_genlist_item_disabled_set, [ :elm_genlist_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_item_disabled_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_disabled_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI void elm_genlist_item_display_only_set(Elm_Genlist_Item *it, Eina_Bool display_only);
-        [ :elm_genlist_item_display_only_set, [ :elm_genlist_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_item_display_only_get(const Elm_Genlist_Item *it);
-        [ :elm_genlist_item_display_only_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_show, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_bring_in(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_bring_in, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_top_show(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_top_show, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_top_bring_in(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_top_bring_in, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_middle_show(Elm_Genlist_Item *it);
-        [ :elm_genlist_item_middle_show, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_middle_bring_in(Elm_Genlist_Item *it);
-        [ :elm_genlist_item_middle_bring_in, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_del, [ :elm_genlist_item_p ], :void ],
-        # EAPI void *elm_genlist_item_data_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_data_get, [ :elm_genlist_item_p ], :void_p ],
-        # EAPI void elm_genlist_item_data_set(Elm_Genlist_Item *it, const void *data);
-        [ :elm_genlist_item_data_set, [ :elm_genlist_item_p, :void_p ], :void ],
-        # EAPI void elm_genlist_item_contents_orphan(Elm_Genlist_Item *it);
-        [ :elm_genlist_item_contents_orphan, [ :elm_genlist_item_p ], :void ],
-        # EAPI const Evas_Object *elm_genlist_item_object_get(const Elm_Genlist_Item *it);
-        [ :elm_genlist_item_object_get, [ :elm_genlist_item_p ], :evas_object_p ],
-        # EAPI void elm_genlist_item_update(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_update, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_promote(Elm_Gen_Item *it);
-        [ :elm_genlist_item_promote, [ :elm_gen_item_p ], :void ],
-        # EAPI void elm_genlist_item_demote(Elm_Gen_Item *it);
-        [ :elm_genlist_item_demote, [ :elm_gen_item_p ], :void ],
-        # EAPI void elm_genlist_item_fields_update(Elm_Genlist_Item *it, const char *parts, Elm_Genlist_Item_Field_Flags itf);
-        [ :elm_genlist_item_fields_update, [ :elm_genlist_item_p, :string, :elm_genlist_item_field_flags ], :void ],
-        # EAPI void elm_genlist_item_item_class_update(Elm_Genlist_Item *it, const Elm_Genlist_Item_Class *itc);
-        [ :elm_genlist_item_item_class_update, [ :elm_genlist_item_p, :elm_genlist_item_class_p ], :void ],
-        # EAPI const Elm_Genlist_Item_Class *elm_genlist_item_item_class_get(const Elm_Genlist_Item *it);
-        [ :elm_genlist_item_item_class_get, [ :elm_genlist_item_p ], :elm_genlist_item_class_p ],
-        # EAPI void elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *item, const char *text);
-        [ :elm_genlist_item_tooltip_text_set, [ :elm_genlist_item_p, :string ], :void ],
-        # EAPI void elm_genlist_item_tooltip_content_cb_set(Elm_Genlist_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_genlist_item_tooltip_content_cb_set, [ :elm_genlist_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_genlist_item_tooltip_unset(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_tooltip_unset, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_tooltip_style_set(Elm_Genlist_Item *item, const char *style);
-        [ :elm_genlist_item_tooltip_style_set, [ :elm_genlist_item_p, :string ], :void ],
-        # EAPI const char *elm_genlist_item_tooltip_style_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_tooltip_style_get, [ :elm_genlist_item_p ], :string ],
-        # EAPI Eina_Bool elm_genlist_item_tooltip_window_mode_set(Elm_Genlist_Item *item, Eina_Bool disable);
-        [ :elm_genlist_item_tooltip_window_mode_set, [ :elm_genlist_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_genlist_item_tooltip_window_mode_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_tooltip_window_mode_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI void elm_genlist_item_cursor_set(Elm_Genlist_Item *item, const char *cursor);
-        [ :elm_genlist_item_cursor_set, [ :elm_genlist_item_p, :string ], :void ],
-        # EAPI const char *elm_genlist_item_cursor_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_cursor_get, [ :elm_genlist_item_p ], :string ],
-        # EAPI void elm_genlist_item_cursor_unset(Elm_Genlist_Item *item);
-        [ :elm_genlist_item_cursor_unset, [ :elm_genlist_item_p ], :void ],
-        # EAPI void elm_genlist_item_cursor_style_set(Elm_Genlist_Item *item, const char *style);
-        [ :elm_genlist_item_cursor_style_set, [ :elm_genlist_item_p, :string ], :void ],
-        # EAPI const char *elm_genlist_item_cursor_style_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_cursor_style_get, [ :elm_genlist_item_p ], :string ],
-        # EAPI void elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *item, Eina_Bool engine_only);
-        [ :elm_genlist_item_cursor_engine_only_set, [ :elm_genlist_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_cursor_engine_only_get, [ :elm_genlist_item_p ], :eina_bool ],
-        # EAPI void elm_genlist_realized_items_update(Evas_Object *obj);
-        [ :elm_genlist_realized_items_update, [ :evas_object_p ], :void ],
-        # EAPI void elm_genlist_item_mode_set(Elm_Genlist_Item *it, const char *mode_type, Eina_Bool mode_set);
-        [ :elm_genlist_item_mode_set, [ :elm_genlist_item_p, :string, :eina_bool ], :void ],
-        # EAPI const char *elm_genlist_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_mode_get, [ :evas_object_p ], :string ],
-        # EAPI const Elm_Genlist_Item *elm_genlist_mode_item_get(const Evas_Object *obj);
-        [ :elm_genlist_mode_item_get, [ :evas_object_p ], :elm_genlist_item_p ],
-        # EAPI void elm_genlist_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
-        [ :elm_genlist_reorder_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_reorder_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_reorder_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_check_add(Evas_Object *parent);
-        [ :elm_check_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state);
-        [ :elm_check_state_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj);
-        [ :elm_check_state_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
-        [ :elm_check_state_pointer_set, [ :evas_object_p, :eina_bool_p ], :void ],
-        # EAPI Evas_Object *elm_radio_add(Evas_Object *parent);
-        [ :elm_radio_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_radio_group_add(Evas_Object *obj, Evas_Object *group);
-        [ :elm_radio_group_add, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_radio_state_value_set(Evas_Object *obj, int value);
-        [ :elm_radio_state_value_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_radio_state_value_get(const Evas_Object *obj);
-        [ :elm_radio_state_value_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_radio_value_set(Evas_Object *obj, int value);
-        [ :elm_radio_value_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_radio_value_get(const Evas_Object *obj);
-        [ :elm_radio_value_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_radio_value_pointer_set(Evas_Object *obj, int *valuep);
-        [ :elm_radio_value_pointer_set, [ :evas_object_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_pager_add(Evas_Object *parent);
-        [ :elm_pager_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_pager_content_push(Evas_Object *obj, Evas_Object *content);
-        [ :elm_pager_content_push, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_pager_content_pop(Evas_Object *obj);
-        [ :elm_pager_content_pop, [ :evas_object_p ], :void ],
-        # EAPI void elm_pager_content_promote(Evas_Object *obj, Evas_Object *content);
-        [ :elm_pager_content_promote, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_pager_content_bottom_get(const Evas_Object *obj);
-        [ :elm_pager_content_bottom_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_pager_content_top_get(const Evas_Object *obj);
-        [ :elm_pager_content_top_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent);
-        [ :elm_slideshow_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Elm_Object_Item *elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data);
-        [ :elm_slideshow_item_add, [ :evas_object_p, :elm_slideshow_item_class_p, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_slideshow_item_sorted_insert(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data, Eina_Compare_Cb func);
-        [ :elm_slideshow_item_sorted_insert, [ :evas_object_p, :elm_slideshow_item_class_p, :void_p, :eina_compare_cb ], :elm_object_item_p ],
-        # EAPI void elm_slideshow_show(Elm_Object_Item *it);
-        [ :elm_slideshow_show, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_slideshow_next(Evas_Object *obj);
-        [ :elm_slideshow_next, [ :evas_object_p ], :void ],
-        # EAPI void elm_slideshow_previous(Evas_Object *obj);
-        [ :elm_slideshow_previous, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_slideshow_transitions_get(const Evas_Object *obj);
-        [ :elm_slideshow_transitions_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *transition);
-        [ :elm_slideshow_transition_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj);
-        [ :elm_slideshow_transition_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_slideshow_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_slideshow_timeout_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_slideshow_timeout_get(const Evas_Object *obj);
-        [ :elm_slideshow_timeout_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop);
-        [ :elm_slideshow_loop_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj);
-        [ :elm_slideshow_loop_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_slideshow_clear(Evas_Object *obj);
-        [ :elm_slideshow_clear, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj);
-        [ :elm_slideshow_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_slideshow_item_del(Elm_Object_Item *it);
-        [ :elm_slideshow_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI Elm_Object_Item *elm_slideshow_item_current_get(const Evas_Object *obj);
-        [ :elm_slideshow_item_current_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Evas_Object* elm_slideshow_item_object_get(const Elm_Object_Item* it);
-        [ :elm_slideshow_item_object_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI Elm_Object_Item *elm_slideshow_item_nth_get(const Evas_Object *obj, unsigned int nth);
-        [ :elm_slideshow_item_nth_get, [ :evas_object_p, :uint ], :elm_object_item_p ],
-        # EAPI void elm_slideshow_layout_set(Evas_Object *obj, const char *layout);
-        [ :elm_slideshow_layout_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_slideshow_layout_get(const Evas_Object *obj);
-        [ :elm_slideshow_layout_get, [ :evas_object_p ], :string ],
-        # EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj);
-        [ :elm_slideshow_layouts_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_slideshow_cache_before_set(Evas_Object *obj, int count);
-        [ :elm_slideshow_cache_before_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_slideshow_cache_before_get(const Evas_Object *obj);
-        [ :elm_slideshow_cache_before_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_slideshow_cache_after_set(Evas_Object *obj, int count);
-        [ :elm_slideshow_cache_after_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_slideshow_cache_after_get(const Evas_Object *obj);
-        [ :elm_slideshow_cache_after_get, [ :evas_object_p ], :int ],
-        # EAPI unsigned int elm_slideshow_count_get(const Evas_Object *obj);
-        [ :elm_slideshow_count_get, [ :evas_object_p ], :uint ],
-        # EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
-        [ :elm_fileselector_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save);
-        [ :elm_fileselector_is_save_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_is_save_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_folder_only_set(Evas_Object *obj, Eina_Bool only);
-        [ :elm_fileselector_folder_only_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_folder_only_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj, Eina_Bool buttons);
-        [ :elm_fileselector_buttons_ok_cancel_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_buttons_ok_cancel_get(const Evas_Object *obj);
-        [ :elm_fileselector_buttons_ok_cancel_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool expand);
-        [ :elm_fileselector_expandable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_fileselector_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_expandable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_fileselector_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_path_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_fileselector_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_path_get, [ :evas_object_p ], :string ],
-        # EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_selected_set, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI const char *elm_fileselector_selected_get(const Evas_Object *obj);
-        [ :elm_fileselector_selected_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_fileselector_mode_set(Evas_Object *obj, Elm_Fileselector_Mode mode);
-        [ :elm_fileselector_mode_set, [ :evas_object_p, :elm_fileselector_mode ], :void ],
-        # EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_mode_get, [ :evas_object_p ], :elm_fileselector_mode ],
-        # EAPI Evas_Object *elm_progressbar_add(Evas_Object *parent);
-        [ :elm_progressbar_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_progressbar_pulse_set(Evas_Object *obj, Eina_Bool pulse);
-        [ :elm_progressbar_pulse_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_progressbar_pulse_get(const Evas_Object *obj);
-        [ :elm_progressbar_pulse_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_progressbar_pulse(Evas_Object *obj, Eina_Bool state);
-        [ :elm_progressbar_pulse, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_progressbar_value_set(Evas_Object *obj, double val);
-        [ :elm_progressbar_value_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_progressbar_value_get(const Evas_Object *obj);
-        [ :elm_progressbar_value_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size);
-        [ :elm_progressbar_span_size_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Evas_Coord elm_progressbar_span_size_get(const Evas_Object *obj);
-        [ :elm_progressbar_span_size_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_progressbar_unit_format_set(Evas_Object *obj, const char *format);
-        [ :elm_progressbar_unit_format_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_progressbar_unit_format_get(const Evas_Object *obj);
-        [ :elm_progressbar_unit_format_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_progressbar_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_progressbar_horizontal_get(const Evas_Object *obj);
-        [ :elm_progressbar_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-        [ :elm_progressbar_inverted_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_progressbar_inverted_get(const Evas_Object *obj);
-        [ :elm_progressbar_inverted_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_separator_add(Evas_Object *parent);
-        [ :elm_separator_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_separator_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_separator_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_separator_horizontal_get(const Evas_Object *obj);
-        [ :elm_separator_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
-        [ :elm_spinner_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_spinner_label_format_set(Evas_Object *obj, const char *fmt);
-        [ :elm_spinner_label_format_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_spinner_label_format_get(const Evas_Object *obj);
-        [ :elm_spinner_label_format_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_spinner_min_max_set(Evas_Object *obj, double min, double max);
-        [ :elm_spinner_min_max_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_spinner_min_max_get(const Evas_Object *obj, double *min, double *max);
-        [ :elm_spinner_min_max_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_spinner_step_set(Evas_Object *obj, double step);
-        [ :elm_spinner_step_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_spinner_step_get(const Evas_Object *obj);
-        [ :elm_spinner_step_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_spinner_value_set(Evas_Object *obj, double val);
-        [ :elm_spinner_value_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_spinner_value_get(const Evas_Object *obj);
-        [ :elm_spinner_value_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_spinner_wrap_set(Evas_Object *obj, Eina_Bool wrap);
-        [ :elm_spinner_wrap_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_spinner_wrap_get(const Evas_Object *obj);
-        [ :elm_spinner_wrap_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_spinner_editable_set(Evas_Object *obj, Eina_Bool editable);
-        [ :elm_spinner_editable_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_spinner_editable_get(const Evas_Object *obj);
-        [ :elm_spinner_editable_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_spinner_special_value_add(Evas_Object *obj, double value, const char *label);
-        [ :elm_spinner_special_value_add, [ :evas_object_p, :double, :string ], :void ],
-        # EAPI void elm_spinner_interval_set(Evas_Object *obj, double interval);
-        [ :elm_spinner_interval_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_spinner_interval_get(const Evas_Object *obj);
-        [ :elm_spinner_interval_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_index_add(Evas_Object *parent);
-        [ :elm_index_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_index_active_set(Evas_Object *obj, Eina_Bool active);
-        [ :elm_index_active_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_index_active_get(const Evas_Object *obj);
-        [ :elm_index_active_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_index_item_level_set(Evas_Object *obj, int level);
-        [ :elm_index_item_level_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_index_item_level_get(const Evas_Object *obj);
-        [ :elm_index_item_level_get, [ :evas_object_p ], :int ],
-        # EAPI Elm_Index_Item *elm_index_item_selected_get(const Evas_Object *obj, int level);
-        [ :elm_index_item_selected_get, [ :evas_object_p, :int ], :elm_index_item_p ],
-        # EAPI void elm_index_item_append(Evas_Object *obj, const char *letter, const void *item);
-        [ :elm_index_item_append, [ :evas_object_p, :string, :void_p ], :void ],
-        # EAPI void elm_index_item_prepend(Evas_Object *obj, const char *letter, const void *item);
-        [ :elm_index_item_prepend, [ :evas_object_p, :string, :void_p ], :void ],
-        # EAPI void elm_index_item_append_relative(Evas_Object *obj, const char *letter, const void *item, const Elm_Index_Item *relative);
-        [ :elm_index_item_append_relative, [ :evas_object_p, :string, :void_p, :elm_index_item_p ], :void ],
-        # EAPI void elm_index_item_prepend_relative(Evas_Object *obj, const char *letter, const void *item, const Elm_Index_Item *relative);
-        [ :elm_index_item_prepend_relative, [ :evas_object_p, :string, :void_p, :elm_index_item_p ], :void ],
-        # EAPI void elm_index_item_sorted_insert(Evas_Object *obj, const char *letter, const void *item, Eina_Compare_Cb cmp_func, Eina_Compare_Cb cmp_data_func);
-        [ :elm_index_item_sorted_insert, [ :evas_object_p, :string, :void_p, :eina_compare_cb, :eina_compare_cb ], :void ],
-        # EAPI void elm_index_item_del(Evas_Object *obj, Elm_Index_Item *item);
-        [ :elm_index_item_del, [ :evas_object_p, :elm_index_item_p ], :void ],
-        # EAPI Elm_Index_Item *elm_index_item_find(Evas_Object *obj, const void *item);
-        [ :elm_index_item_find, [ :evas_object_p, :void_p ], :elm_index_item_p ],
-        # EAPI void elm_index_item_clear(Evas_Object *obj);
-        [ :elm_index_item_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_index_item_go(Evas_Object *obj, int level);
-        [ :elm_index_item_go, [ :evas_object_p, :int ], :void ],
-        # EAPI void *elm_index_item_data_get(const Elm_Index_Item *item);
-        [ :elm_index_item_data_get, [ :elm_index_item_p ], :void_p ],
-        # EAPI void elm_index_item_data_set(Elm_Index_Item *it, const void *data);
-        [ :elm_index_item_data_set, [ :elm_index_item_p, :void_p ], :void ],
-        # EAPI void elm_index_item_del_cb_set(Elm_Index_Item *it, Evas_Smart_Cb func);
-        [ :elm_index_item_del_cb_set, [ :elm_index_item_p, :evas_smart_cb ], :void ],
-        # EAPI const char *elm_index_item_letter_get(const Elm_Index_Item *item);
-        [ :elm_index_item_letter_get, [ :elm_index_item_p ], :string ],
-        # EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
-        [ :elm_photocam_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Load_Error elm_photocam_file_set(Evas_Object *obj, const char *file);
-        [ :elm_photocam_file_set, [ :evas_object_p, :string ], :evas_load_error ],
-        # EAPI const char *elm_photocam_file_get(const Evas_Object *obj);
-        [ :elm_photocam_file_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_photocam_zoom_set(Evas_Object *obj, double zoom);
-        [ :elm_photocam_zoom_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_photocam_zoom_get(const Evas_Object *obj);
-        [ :elm_photocam_zoom_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
-        [ :elm_photocam_zoom_mode_set, [ :evas_object_p, :elm_photocam_zoom_mode ], :void ],
-        # EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(const Evas_Object *obj);
-        [ :elm_photocam_zoom_mode_get, [ :evas_object_p ], :elm_photocam_zoom_mode ],
-        # EAPI void elm_photocam_image_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :elm_photocam_image_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :elm_photocam_region_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_photocam_image_region_show, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_photocam_image_region_bring_in, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused);
-        [ :elm_photocam_paused_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_photocam_paused_get(const Evas_Object *obj);
-        [ :elm_photocam_paused_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_photocam_internal_image_get(const Evas_Object *obj);
-        [ :elm_photocam_internal_image_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_photocam_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_photocam_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_photocam_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_photocam_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI Evas_Object *elm_map_add(Evas_Object *parent);
-        [ :elm_map_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_map_zoom_set(Evas_Object *obj, int zoom);
-        [ :elm_map_zoom_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_map_zoom_get(const Evas_Object *obj);
-        [ :elm_map_zoom_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_map_zoom_mode_set(Evas_Object *obj, Elm_Map_Zoom_Mode mode);
-        [ :elm_map_zoom_mode_set, [ :evas_object_p, :elm_map_zoom_mode ], :void ],
-        # EAPI Elm_Map_Zoom_Mode elm_map_zoom_mode_get(const Evas_Object *obj);
-        [ :elm_map_zoom_mode_get, [ :evas_object_p ], :elm_map_zoom_mode ],
-        # EAPI void elm_map_geo_region_get(const Evas_Object *obj, double *lon, double *lat);
-        [ :elm_map_geo_region_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_map_geo_region_bring_in(Evas_Object *obj, double lon, double lat);
-        [ :elm_map_geo_region_bring_in, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_map_geo_region_show(Evas_Object *obj, double lon, double lat);
-        [ :elm_map_geo_region_show, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_map_paused_set(Evas_Object *obj, Eina_Bool paused);
-        [ :elm_map_paused_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_map_paused_get(const Evas_Object *obj);
-        [ :elm_map_paused_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool paused);
-        [ :elm_map_paused_markers_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_map_paused_markers_get(const Evas_Object *obj);
-        [ :elm_map_paused_markers_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_map_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num);
-        [ :elm_map_utils_downloading_status_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_map_utils_convert_coord_into_geo(const Evas_Object *obj, int x, int y, int size, double *lon, double *lat);
-        [ :elm_map_utils_convert_coord_into_geo, [ :evas_object_p, :int, :int, :int, :double_p, :double_p ], :void ],
-        # EAPI void elm_map_utils_convert_geo_into_coord(const Evas_Object *obj, double lon, double lat, int size, int *x, int *y);
-        [ :elm_map_utils_convert_geo_into_coord, [ :evas_object_p, :double, :double, :int, :int_p, :int_p ], :void ],
-        # EAPI Elm_Map_Name *elm_map_utils_convert_coord_into_name(const Evas_Object *obj, double lon, double lat);
-        [ :elm_map_utils_convert_coord_into_name, [ :evas_object_p, :double, :double ], :elm_map_name_p ],
-        # EAPI Elm_Map_Name *elm_map_utils_convert_name_into_coord(const Evas_Object *obj, char *address);
-        [ :elm_map_utils_convert_name_into_coord, [ :evas_object_p, :string ], :elm_map_name_p ],
-        # EAPI void elm_map_utils_rotate_coord(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, const Evas_Coord cx, const Evas_Coord cy, const double degree, Evas_Coord *xx, Evas_Coord *yy);
-        [ :elm_map_utils_rotate_coord, [ :evas_object_p, :int, :int, :int, :int, :double, :int_p, :int_p ], :void ],
-        # EAPI Elm_Map_Marker *elm_map_marker_add(Evas_Object *obj, double lon, double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *clas_group, void *data);
-        [ :elm_map_marker_add, [ :evas_object_p, :double, :double, :elm_map_marker_class_p, :elm_map_group_class_p, :void_p ], :elm_map_marker_p ],
-        # EAPI void elm_map_max_marker_per_group_set(Evas_Object *obj, int max);
-        [ :elm_map_max_marker_per_group_set, [ :evas_object_p, :int ], :void ],
-        # EAPI void elm_map_marker_remove(Elm_Map_Marker *marker);
-        [ :elm_map_marker_remove, [ :elm_map_marker_p ], :void ],
-        # EAPI void elm_map_marker_region_get(const Elm_Map_Marker *marker, double *lon, double *lat);
-        [ :elm_map_marker_region_get, [ :elm_map_marker_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_map_marker_bring_in(Elm_Map_Marker *marker);
-        [ :elm_map_marker_bring_in, [ :elm_map_marker_p ], :void ],
-        # EAPI void elm_map_marker_show(Elm_Map_Marker *marker);
-        [ :elm_map_marker_show, [ :elm_map_marker_p ], :void ],
-        # EAPI void elm_map_markers_list_show(Eina_List *markers);
-        [ :elm_map_markers_list_show, [ :eina_list_p ], :void ],
-        # EAPI Evas_Object *elm_map_marker_object_get(const Elm_Map_Marker *marker);
-        [ :elm_map_marker_object_get, [ :elm_map_marker_p ], :evas_object_p ],
-        # EAPI void elm_map_marker_update(Elm_Map_Marker *marker);
-        [ :elm_map_marker_update, [ :elm_map_marker_p ], :void ],
-        # EAPI void elm_map_bubbles_close(Evas_Object *obj);
-        [ :elm_map_bubbles_close, [ :evas_object_p ], :void ],
-        # EAPI Elm_Map_Group_Class *elm_map_group_class_new(Evas_Object *obj);
-        [ :elm_map_group_class_new, [ :evas_object_p ], :elm_map_group_class_p ],
-        # EAPI void elm_map_group_class_style_set(Elm_Map_Group_Class *clas, const char *style);
-        [ :elm_map_group_class_style_set, [ :elm_map_group_class_p, :string ], :void ],
-        # EAPI void elm_map_group_class_icon_cb_set(Elm_Map_Group_Class *clas, ElmMapGroupIconGetFunc icon_get);
-        [ :elm_map_group_class_icon_cb_set, [ :elm_map_group_class_p, :elmmapgroupicongetfunc ], :void ],
-        # EAPI void elm_map_group_class_data_set(Elm_Map_Group_Class *clas, void *data);
-        [ :elm_map_group_class_data_set, [ :elm_map_group_class_p, :void_p ], :void ],
-        # EAPI void elm_map_group_class_zoom_displayed_set(Elm_Map_Group_Class *clas, int zoom);
-        [ :elm_map_group_class_zoom_displayed_set, [ :elm_map_group_class_p, :int ], :void ],
-        # EAPI void elm_map_group_class_zoom_grouped_set(Elm_Map_Group_Class *clas, int zoom);
-        [ :elm_map_group_class_zoom_grouped_set, [ :elm_map_group_class_p, :int ], :void ],
-        # EAPI void elm_map_group_class_hide_set(Evas_Object *obj, Elm_Map_Group_Class *clas, Eina_Bool hide);
-        [ :elm_map_group_class_hide_set, [ :evas_object_p, :elm_map_group_class_p, :eina_bool ], :void ],
-        # EAPI Elm_Map_Marker_Class *elm_map_marker_class_new(Evas_Object *obj);
-        [ :elm_map_marker_class_new, [ :evas_object_p ], :elm_map_marker_class_p ],
-        # EAPI void elm_map_marker_class_style_set(Elm_Map_Marker_Class *clas, const char *style);
-        [ :elm_map_marker_class_style_set, [ :elm_map_marker_class_p, :string ], :void ],
-        # EAPI void elm_map_marker_class_icon_cb_set(Elm_Map_Marker_Class *clas, ElmMapMarkerIconGetFunc icon_get);
-        [ :elm_map_marker_class_icon_cb_set, [ :elm_map_marker_class_p, :elmmapmarkericongetfunc ], :void ],
-        # EAPI void elm_map_marker_class_get_cb_set(Elm_Map_Marker_Class *clas, ElmMapMarkerGetFunc get);
-        [ :elm_map_marker_class_get_cb_set, [ :elm_map_marker_class_p, :elmmapmarkergetfunc ], :void ],
-        # EAPI void elm_map_marker_class_del_cb_set(Elm_Map_Marker_Class *clas, ElmMapMarkerDelFunc del);
-        [ :elm_map_marker_class_del_cb_set, [ :elm_map_marker_class_p, :elmmapmarkerdelfunc ], :void ],
-        # EAPI const char **elm_map_source_names_get(const Evas_Object *obj);
-        [ :elm_map_source_names_get, [ :evas_object_p ], :string_array ],
-        # EAPI void elm_map_source_name_set(Evas_Object *obj, const char *source_name);
-        [ :elm_map_source_name_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_map_source_name_get(const Evas_Object *obj);
-        [ :elm_map_source_name_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_map_route_source_set(Evas_Object *obj, Elm_Map_Route_Sources source);
-        [ :elm_map_route_source_set, [ :evas_object_p, :elm_map_route_sources ], :void ],
-        # EAPI Elm_Map_Route_Sources elm_map_route_source_get(const Evas_Object *obj);
-        [ :elm_map_route_source_get, [ :evas_object_p ], :elm_map_route_sources ],
-        # EAPI void elm_map_source_zoom_min_set(Evas_Object *obj, int zoom);
-        [ :elm_map_source_zoom_min_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_map_source_zoom_min_get(const Evas_Object *obj);
-        [ :elm_map_source_zoom_min_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_map_source_zoom_max_set(Evas_Object *obj, int zoom);
-        [ :elm_map_source_zoom_max_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_map_source_zoom_max_get(const Evas_Object *obj);
-        [ :elm_map_source_zoom_max_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_map_user_agent_set(Evas_Object *obj, const char *user_agent);
-        [ :elm_map_user_agent_set, [ :evas_object_p, :string ], :void ],
-        # EAPI const char *elm_map_user_agent_get(const Evas_Object *obj);
-        [ :elm_map_user_agent_get, [ :evas_object_p ], :string ],
-        # EAPI Elm_Map_Route *elm_map_route_add(Evas_Object *obj, Elm_Map_Route_Type type, Elm_Map_Route_Method method, double flon, double flat, double tlon, double tlat);
-        [ :elm_map_route_add, [ :evas_object_p, :elm_map_route_type, :elm_map_route_method, :double, :double, :double, :double ], :elm_map_route_p ],
-        # EAPI void elm_map_route_remove(Elm_Map_Route *route);
-        [ :elm_map_route_remove, [ :elm_map_route_p ], :void ],
-        # EAPI void elm_map_route_color_set(Elm_Map_Route *route, int r, int g , int b, int a);
-        [ :elm_map_route_color_set, [ :elm_map_route_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_map_route_color_get(const Elm_Map_Route *route, int *r, int *g , int *b, int *a);
-        [ :elm_map_route_color_get, [ :elm_map_route_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI double elm_map_route_distance_get(const Elm_Map_Route *route);
-        [ :elm_map_route_distance_get, [ :elm_map_route_p ], :double ],
-        # EAPI const char *elm_map_route_node_get(const Elm_Map_Route *route);
-        [ :elm_map_route_node_get, [ :elm_map_route_p ], :string ],
-        # EAPI const char *elm_map_route_waypoint_get(const Elm_Map_Route *route);
-        [ :elm_map_route_waypoint_get, [ :elm_map_route_p ], :string ],
-        # EAPI const char *elm_map_name_address_get(const Elm_Map_Name *name);
-        [ :elm_map_name_address_get, [ :elm_map_name_p ], :string ],
-        # EAPI void elm_map_name_region_get(const Elm_Map_Name *name, double *lon, double *lat);
-        [ :elm_map_name_region_get, [ :elm_map_name_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_map_name_remove(Elm_Map_Name *name);
-        [ :elm_map_name_remove, [ :elm_map_name_p ], :void ],
-        # EAPI void elm_map_rotate_set(Evas_Object *obj, double degree, Evas_Coord cx, Evas_Coord cy);
-        [ :elm_map_rotate_set, [ :evas_object_p, :double, :int, :int ], :void ],
-        # EAPI void elm_map_rotate_get(const Evas_Object *obj, double *degree, Evas_Coord *cx, Evas_Coord *cy);
-        [ :elm_map_rotate_get, [ :evas_object_p, :double_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_map_wheel_disabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_map_wheel_disabled_get(const Evas_Object *obj);
-        [ :elm_map_wheel_disabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_map_track_add(Evas_Object *obj, EMap_Route *emap);
-        [ :elm_map_track_add, [ :evas_object_p, :emap_route_p ], :evas_object_p ],
-        # EAPI void elm_map_track_remove(Evas_Object *obj, Evas_Object *route);
-        [ :elm_map_track_remove, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_route_add(Evas_Object *parent);
-        [ :elm_route_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_route_emap_set(Evas_Object *obj, EMap_Route *emap);
-        [ :elm_route_emap_set, [ :evas_object_p, :emap_route_p ], :void ],
-        # EAPI double elm_route_lon_min_get(Evas_Object *obj);
-        [ :elm_route_lon_min_get, [ :evas_object_p ], :double ],
-        # EAPI double elm_route_lat_min_get(Evas_Object *obj);
-        [ :elm_route_lat_min_get, [ :evas_object_p ], :double ],
-        # EAPI double elm_route_lon_max_get(Evas_Object *obj);
-        [ :elm_route_lon_max_get, [ :evas_object_p ], :double ],
-        # EAPI double elm_route_lat_max_get(Evas_Object *obj);
-        [ :elm_route_lat_max_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_panel_add(Evas_Object *parent);
-        [ :elm_panel_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
-        [ :elm_panel_orient_set, [ :evas_object_p, :elm_panel_orient ], :void ],
-        # EAPI Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj);
-        [ :elm_panel_orient_get, [ :evas_object_p ], :elm_panel_orient ],
-        # EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
-        [ :elm_panel_hidden_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_panel_hidden_get(const Evas_Object *obj);
-        [ :elm_panel_hidden_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_panel_toggle(Evas_Object *obj);
-        [ :elm_panel_toggle, [ :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_panes_add(Evas_Object *parent);
-        [ :elm_panes_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI double elm_panes_content_left_size_get(const Evas_Object *obj);
-        [ :elm_panes_content_left_size_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_panes_content_left_size_set(Evas_Object *obj, double size);
-        [ :elm_panes_content_left_size_set, [ :evas_object_p, :double ], :void ],
-        # EAPI void elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_panes_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_panes_horizontal_get(const Evas_Object *obj);
-        [ :elm_panes_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_panes_fixed_set(Evas_Object *obj, Eina_Bool fixed);
-        [ :elm_panes_fixed_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_panes_fixed_get(const Evas_Object *obj);
-        [ :elm_panes_fixed_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
-        [ :elm_flip_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_flip_content_front_set(Evas_Object *obj, Evas_Object *content);
-        [ :elm_flip_content_front_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_flip_content_back_set(Evas_Object *obj, Evas_Object *content);
-        [ :elm_flip_content_back_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_flip_content_front_get(const Evas_Object *obj);
-        [ :elm_flip_content_front_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_flip_content_back_get(const Evas_Object *obj);
-        [ :elm_flip_content_back_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_flip_content_front_unset(Evas_Object *obj);
-        [ :elm_flip_content_front_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_flip_content_back_unset(Evas_Object *obj);
-        [ :elm_flip_content_back_unset, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_flip_front_get(const Evas_Object *obj);
-        [ :elm_flip_front_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
-        [ :elm_flip_perspective_set, [ :evas_object_p, :int, :int, :int ], :void ],
-        # EAPI void elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode);
-        [ :elm_flip_go, [ :evas_object_p, :elm_flip_mode ], :void ],
-        # EAPI void elm_flip_interaction_set(Evas_Object *obj, Elm_Flip_Interaction mode);
-        [ :elm_flip_interaction_set, [ :evas_object_p, :elm_flip_interaction ], :void ],
-        # EAPI Elm_Flip_Interaction elm_flip_interaction_get(const Evas_Object *obj);
-        [ :elm_flip_interaction_get, [ :evas_object_p ], :elm_flip_interaction ],
-        # EAPI void elm_flip_interacton_direction_enabled_set(Evas_Object *obj, Elm_Flip_Direction dir, Eina_Bool enabled);
-        [ :elm_flip_interacton_direction_enabled_set, [ :evas_object_p, :elm_flip_direction, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_flip_interacton_direction_enabled_get(Evas_Object *obj, Elm_Flip_Direction dir);
-        [ :elm_flip_interacton_direction_enabled_get, [ :evas_object_p, :elm_flip_direction ], :eina_bool ],
-        # EAPI void elm_flip_interacton_direction_hitsize_set(Evas_Object *obj, Elm_Flip_Direction dir, double hitsize);
-        [ :elm_flip_interacton_direction_hitsize_set, [ :evas_object_p, :elm_flip_direction, :double ], :void ],
-        # EAPI double elm_flip_interacton_direction_hitsize_get(Evas_Object *obj, Elm_Flip_Direction dir);
-        [ :elm_flip_interacton_direction_hitsize_get, [ :evas_object_p, :elm_flip_direction ], :double ],
-        # EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
-        [ :elm_conformant_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_conformant_content_area_get(const Evas_Object *obj);
-        [ :elm_conformant_content_area_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent);
-        [ :elm_mapbuf_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_mapbuf_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_mapbuf_enabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_mapbuf_enabled_get(const Evas_Object *obj);
-        [ :elm_mapbuf_enabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_mapbuf_smooth_set(Evas_Object *obj, Eina_Bool smooth);
-        [ :elm_mapbuf_smooth_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_mapbuf_smooth_get(const Evas_Object *obj);
-        [ :elm_mapbuf_smooth_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_mapbuf_alpha_set(Evas_Object *obj, Eina_Bool alpha);
-        [ :elm_mapbuf_alpha_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_mapbuf_alpha_get(const Evas_Object *obj);
-        [ :elm_mapbuf_alpha_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent);
-        [ :elm_flipselector_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_flipselector_flip_next(Evas_Object *obj);
-        [ :elm_flipselector_flip_next, [ :evas_object_p ], :void ],
-        # EAPI void elm_flipselector_flip_prev(Evas_Object *obj);
-        [ :elm_flipselector_flip_prev, [ :evas_object_p ], :void ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_append(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_flipselector_item_append, [ :evas_object_p, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_prepend(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_flipselector_item_prepend, [ :evas_object_p, :string, :evas_smart_cb, :void_p ], :elm_object_item_p ],
-        # EAPI const Eina_List *elm_flipselector_items_get(const Evas_Object *obj);
-        [ :elm_flipselector_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_Object_Item *elm_flipselector_first_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_first_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_flipselector_last_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_last_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_flipselector_selected_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_selected_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI void elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_flipselector_item_selected_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_flipselector_item_selected_get(const Elm_Object_Item *it);
-        [ :elm_flipselector_item_selected_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_flipselector_item_del(Elm_Object_Item *it);
-        [ :elm_flipselector_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_prev_get(Elm_Object_Item *it);
-        [ :elm_flipselector_item_prev_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_next_get(Elm_Object_Item *it);
-        [ :elm_flipselector_item_next_get, [ :elm_object_item_p ], :elm_object_item_p ],
-        # EAPI void elm_flipselector_interval_set(Evas_Object *obj, double interval);
-        [ :elm_flipselector_interval_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_flipselector_interval_get(const Evas_Object *obj);
-        [ :elm_flipselector_interval_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_calendar_add(Evas_Object *parent);
-        [ :elm_calendar_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char **elm_calendar_weekdays_names_get(const Evas_Object *obj);
-        [ :elm_calendar_weekdays_names_get, [ :evas_object_p ], :string_array ],
-        # EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]);
-        # FIXME
-        # EAPI void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max);
-        [ :elm_calendar_min_max_year_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max);
-        [ :elm_calendar_min_max_year_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_calendar_day_selection_enabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj);
-        [ :elm_calendar_day_selection_enabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time);
-        [ :elm_calendar_selected_time_set, [ :evas_object_p, :pointer ], :void ],
-        # EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time);
-        [ :elm_calendar_selected_time_get, [ :evas_object_p, :pointer ], :eina_bool ],
-        # EAPI void elm_calendar_format_function_set(Evas_Object *obj, char * (*format_function) (struct tm *stime));
-        # FIXME
-        # EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat);
-        [ :elm_calendar_mark_add, [ :evas_object_p, :string, :pointer, :elm_calendar_mark_repeat ], :elm_calendar_mark_p ],
-        # EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark);
-        [ :elm_calendar_mark_del, [ :elm_calendar_mark_p ], :void ],
-        # EAPI void elm_calendar_marks_clear(Evas_Object *obj);
-        [ :elm_calendar_marks_clear, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj);
-        [ :elm_calendar_marks_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI void elm_calendar_marks_draw(Evas_Object *obj);
-        [ :elm_calendar_marks_draw, [ :evas_object_p ], :void ],
-        # EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval);
-        [ :elm_calendar_interval_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_calendar_interval_get(const Evas_Object *obj);
-        [ :elm_calendar_interval_get, [ :evas_object_p ], :double ],
-        # EAPI Evas_Object *elm_diskselector_add(Evas_Object *parent);
-        [ :elm_diskselector_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_diskselector_round_set(Evas_Object *obj, Eina_Bool round);
-        [ :elm_diskselector_round_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_diskselector_round_get(const Evas_Object *obj);
-        [ :elm_diskselector_round_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI int elm_diskselector_side_label_length_get(const Evas_Object *obj);
-        [ :elm_diskselector_side_label_length_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_diskselector_side_label_length_set(Evas_Object *obj, int len);
-        [ :elm_diskselector_side_label_length_set, [ :evas_object_p, :int ], :void ],
-        # EAPI void elm_diskselector_display_item_num_set(Evas_Object *obj, int num);
-        [ :elm_diskselector_display_item_num_set, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_diskselector_display_item_num_get(const Evas_Object *obj);
-        [ :elm_diskselector_display_item_num_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_diskselector_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_diskselector_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_diskselector_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
-        [ :elm_diskselector_scroller_policy_get, [ :evas_object_p, :elm_scroller_policy_p, :elm_scroller_policy_p ], :void ],
-        # EAPI void elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-        [ :elm_diskselector_scroller_policy_set, [ :evas_object_p, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_diskselector_clear(Evas_Object *obj);
-        [ :elm_diskselector_clear, [ :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_diskselector_items_get(const Evas_Object *obj);
-        [ :elm_diskselector_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-        [ :elm_diskselector_item_append, [ :evas_object_p, :string, :evas_object_p, :evas_smart_cb, :void_p ], :elm_diskselector_item_p ],
-        # EAPI void elm_diskselector_item_del(Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_del, [ :elm_diskselector_item_p ], :void ],
-        # EAPI void elm_diskselector_item_del_cb_set(Elm_Diskselector_Item *item, Evas_Smart_Cb func);
-        [ :elm_diskselector_item_del_cb_set, [ :elm_diskselector_item_p, :evas_smart_cb ], :void ],
-        # EAPI void *elm_diskselector_item_data_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_data_get, [ :elm_diskselector_item_p ], :void_p ],
-        # EAPI void elm_diskselector_item_icon_set(Elm_Diskselector_Item *item, Evas_Object *icon);
-        [ :elm_diskselector_item_icon_set, [ :elm_diskselector_item_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_icon_get, [ :elm_diskselector_item_p ], :evas_object_p ],
-        # EAPI void elm_diskselector_item_label_set(Elm_Diskselector_Item *item, const char *label);
-        [ :elm_diskselector_item_label_set, [ :elm_diskselector_item_p, :string ], :void ],
-        # EAPI const char *elm_diskselector_item_label_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_label_get, [ :elm_diskselector_item_p ], :string ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_selected_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_selected_item_get, [ :evas_object_p ], :elm_diskselector_item_p ],
-        # EAPI void elm_diskselector_item_selected_set(Elm_Diskselector_Item *item, Eina_Bool selected);
-        [ :elm_diskselector_item_selected_set, [ :elm_diskselector_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_diskselector_item_selected_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_selected_get, [ :elm_diskselector_item_p ], :eina_bool ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_first_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_first_item_get, [ :evas_object_p ], :elm_diskselector_item_p ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_last_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_last_item_get, [ :evas_object_p ], :elm_diskselector_item_p ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_item_prev_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_prev_get, [ :elm_diskselector_item_p ], :elm_diskselector_item_p ],
-        # EAPI Elm_Diskselector_Item *elm_diskselector_item_next_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_next_get, [ :elm_diskselector_item_p ], :elm_diskselector_item_p ],
-        # EAPI void elm_diskselector_item_tooltip_text_set(Elm_Diskselector_Item *item, const char *text);
-        [ :elm_diskselector_item_tooltip_text_set, [ :elm_diskselector_item_p, :string ], :void ],
-        # EAPI void elm_diskselector_item_tooltip_content_cb_set(Elm_Diskselector_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_diskselector_item_tooltip_content_cb_set, [ :elm_diskselector_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_diskselector_item_tooltip_unset(Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_tooltip_unset, [ :elm_diskselector_item_p ], :void ],
-        # EAPI void elm_diskselector_item_tooltip_style_set(Elm_Diskselector_Item *item, const char *style);
-        [ :elm_diskselector_item_tooltip_style_set, [ :elm_diskselector_item_p, :string ], :void ],
-        # EAPI const char *elm_diskselector_item_tooltip_style_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_tooltip_style_get, [ :elm_diskselector_item_p ], :string ],
-        # EAPI void elm_diskselector_item_cursor_set(Elm_Diskselector_Item *item, const char *cursor);
-        [ :elm_diskselector_item_cursor_set, [ :elm_diskselector_item_p, :string ], :void ],
-        # EAPI const char *elm_diskselector_item_cursor_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_cursor_get, [ :elm_diskselector_item_p ], :string ],
-        # EAPI void elm_diskselector_item_cursor_unset(Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_cursor_unset, [ :elm_diskselector_item_p ], :void ],
-        # EAPI void elm_diskselector_item_cursor_style_set(Elm_Diskselector_Item *item, const char *style);
-        [ :elm_diskselector_item_cursor_style_set, [ :elm_diskselector_item_p, :string ], :void ],
-        # EAPI const char *elm_diskselector_item_cursor_style_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_cursor_style_get, [ :elm_diskselector_item_p ], :string ],
-        # EAPI void elm_diskselector_item_cursor_engine_only_set(Elm_Diskselector_Item *item, Eina_Bool engine_only);
-        [ :elm_diskselector_item_cursor_engine_only_set, [ :elm_diskselector_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_diskselector_item_cursor_engine_only_get(const Elm_Diskselector_Item *item);
-        [ :elm_diskselector_item_cursor_engine_only_get, [ :elm_diskselector_item_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
-        [ :elm_colorselector_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g , int b, int a);
-        [ :elm_colorselector_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g , int *b, int *a);
-        [ :elm_colorselector_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_ctxpopup_add(Evas_Object *parent);
-        [ :elm_ctxpopup_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_ctxpopup_hover_parent_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_ctxpopup_hover_parent_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_hover_parent_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_ctxpopup_clear(Evas_Object *obj);
-        [ :elm_ctxpopup_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_ctxpopup_horizontal_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_ctxpopup_horizontal_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_horizontal_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_ctxpopup_item_del(Elm_Object_Item *it);
-        [ :elm_ctxpopup_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI Eina_Bool elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it);
-        [ :elm_ctxpopup_item_disabled_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_ctxpopup_direction_priority_set(Evas_Object *obj, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth);
-        [ :elm_ctxpopup_direction_priority_set, [ :evas_object_p, :elm_ctxpopup_direction, :elm_ctxpopup_direction, :elm_ctxpopup_direction, :elm_ctxpopup_direction ],
-            :void ],
-        # EAPI void elm_ctxpopup_direction_priority_get(Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth);
-        [ :elm_ctxpopup_direction_priority_get, [ :evas_object_p, :elm_ctxpopup_direction_p, :elm_ctxpopup_direction_p, :elm_ctxpopup_direction_p,
-            :elm_ctxpopup_direction_p ], :void ],
-        # EAPI Elm_Ctxpopup_Direction elm_ctxpopup_direction_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_direction_get, [ :evas_object_p ], :elm_ctxpopup_direction ],
-        # EAPI Elm_Transit *elm_transit_add(void);
-        [ :elm_transit_add, [  ], :elm_transit_p ],
-        # EAPI void elm_transit_del(Elm_Transit *transit);
-        [ :elm_transit_del, [ :elm_transit_p ], :void ],
-        # EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb);
-        [ :elm_transit_effect_add, [ :elm_transit_p, :elm_transit_effect_transition_cb, :void_p, :elm_transit_effect_end_cb ], :void ],
-        # EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect);
-        [ :elm_transit_effect_del, [ :elm_transit_p, :elm_transit_effect_transition_cb, :void_p ], :void ],
-        # EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj);
-        [ :elm_transit_object_add, [ :elm_transit_p, :evas_object_p ], :void ],
-        # EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj);
-        [ :elm_transit_object_remove, [ :elm_transit_p, :evas_object_p ], :void ],
-        # EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit);
-        [ :elm_transit_objects_get, [ :elm_transit_p ], :eina_list_p ],
-        # EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_keep);
-        [ :elm_transit_objects_final_state_keep_set, [ :elm_transit_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_transit_objects_final_state_keep_get(const Elm_Transit *transit);
-        [ :elm_transit_objects_final_state_keep_get, [ :elm_transit_p ], :eina_bool ],
-        # EAPI void elm_transit_event_enabled_set(Elm_Transit *transit, Eina_Bool enabled);
-        [ :elm_transit_event_enabled_set, [ :elm_transit_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *transit);
-        [ :elm_transit_event_enabled_get, [ :elm_transit_p ], :eina_bool ],
-        # EAPI void elm_transit_del_cb_set(Elm_Transit *transit, Elm_Transit_Del_Cb cb, void *data);
-        [ :elm_transit_del_cb_set, [ :elm_transit_p, :elm_transit_del_cb, :void_p ], :void ],
-        # EAPI void elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse);
-        [ :elm_transit_auto_reverse_set, [ :elm_transit_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *transit);
-        [ :elm_transit_auto_reverse_get, [ :elm_transit_p ], :eina_bool ],
-        # EAPI void elm_transit_repeat_times_set(Elm_Transit *transit, int repeat);
-        [ :elm_transit_repeat_times_set, [ :elm_transit_p, :int ], :void ],
-        # EAPI int elm_transit_repeat_times_get(const Elm_Transit *transit);
-        [ :elm_transit_repeat_times_get, [ :elm_transit_p ], :int ],
-        # EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode);
-        [ :elm_transit_tween_mode_set, [ :elm_transit_p, :elm_transit_tween_mode ], :void ],
-        # EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit);
-        [ :elm_transit_tween_mode_get, [ :elm_transit_p ], :elm_transit_tween_mode ],
-        # EAPI void elm_transit_duration_set(Elm_Transit *transit, double duration);
-        [ :elm_transit_duration_set, [ :elm_transit_p, :double ], :void ],
-        # EAPI double elm_transit_duration_get(const Elm_Transit *transit);
-        [ :elm_transit_duration_get, [ :elm_transit_p ], :double ],
-        # EAPI void elm_transit_go(Elm_Transit *transit);
-        [ :elm_transit_go, [ :elm_transit_p ], :void ],
-        # EAPI void elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused);
-        [ :elm_transit_paused_set, [ :elm_transit_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_transit_paused_get(const Elm_Transit *transit);
-        [ :elm_transit_paused_get, [ :elm_transit_p ], :eina_bool ],
-        # EAPI double elm_transit_progress_value_get(const Elm_Transit *transit);
-        [ :elm_transit_progress_value_get, [ :elm_transit_p ], :double ],
-        # EAPI void elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit);
-        [ :elm_transit_chain_transit_add, [ :elm_transit_p, :elm_transit_p ], :void ],
-        # EAPI void elm_transit_chain_transit_del(Elm_Transit *transit, Elm_Transit *chain_transit);
-        [ :elm_transit_chain_transit_del, [ :elm_transit_p, :elm_transit_p ], :void ],
-        # EAPI Eina_List *elm_transit_chain_transits_get(const Elm_Transit *transit);
-        [ :elm_transit_chain_transits_get, [ :elm_transit_p ], :eina_list_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_resizing_add(Elm_Transit* transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
-        [ :elm_transit_effect_resizing_add, [ :elm_transit_p, :int, :int, :int, :int ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_translation_add(Elm_Transit* transit, Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy);
-        [ :elm_transit_effect_translation_add, [ :elm_transit_p, :int, :int, :int, :int ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate);
-        [ :elm_transit_effect_zoom_add, [ :elm_transit_p, :float, :float ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw);
-        [ :elm_transit_effect_flip_add, [ :elm_transit_p, :elm_transit_effect_flip_axis, :eina_bool ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw);
-        [ :elm_transit_effect_resizable_flip_add, [ :elm_transit_p, :elm_transit_effect_flip_axis, :eina_bool ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Transit_Effect_Wipe_Type type, Elm_Transit_Effect_Wipe_Dir dir);
-        [ :elm_transit_effect_wipe_add, [ :elm_transit_p, :elm_transit_effect_wipe_type, :elm_transit_effect_wipe_dir ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
-        [ :elm_transit_effect_color_add, [ :elm_transit_p, :uint, :uint, :uint, :uint, :uint, :uint, :uint, :uint ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_fade_add(Elm_Transit *transit);
-        [ :elm_transit_effect_fade_add, [ :elm_transit_p ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_blend_add(Elm_Transit *transit);
-        [ :elm_transit_effect_blend_add, [ :elm_transit_p ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree);
-        [ :elm_transit_effect_rotation_add, [ :elm_transit_p, :float, :float ], :void_p ],
-        # EAPI Elm_Transit_Effect *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);
-        [ :elm_transit_effect_image_animation_add, [ :elm_transit_p, :eina_list_p ], :void_p ],
-        # EAPI void elm_store_free(Elm_Store *st);
-        [ :elm_store_free, [ :elm_store_p ], :void ],
-        # EAPI Elm_Store *elm_store_filesystem_new(void);
-        [ :elm_store_filesystem_new, [  ], :elm_store_p ],
-        # EAPI void elm_store_filesystem_directory_set(Elm_Store *st, const char *dir);
-        [ :elm_store_filesystem_directory_set, [ :elm_store_p, :string ], :void ],
-        # EAPI const char *elm_store_filesystem_directory_get(const Elm_Store *st);
-        [ :elm_store_filesystem_directory_get, [ :elm_store_p ], :string ],
-        # EAPI const char *elm_store_item_filesystem_path_get(const Elm_Store_Item *sti);
-        [ :elm_store_item_filesystem_path_get, [ :elm_store_item_p ], :string ],
-        # EAPI void elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj);
-        [ :elm_store_target_genlist_set, [ :elm_store_p, :evas_object_p ], :void ],
-        # EAPI void elm_store_cache_set(Elm_Store *st, int max);
-        [ :elm_store_cache_set, [ :elm_store_p, :int ], :void ],
-        # EAPI int elm_store_cache_get(const Elm_Store *st);
-        [ :elm_store_cache_get, [ :elm_store_p ], :int ],
-        # EAPI void elm_store_list_func_set(Elm_Store *st, Elm_Store_Item_List_Cb func, const void *data);
-        [ :elm_store_list_func_set, [ :elm_store_p, :elm_store_item_list_cb, :void_p ], :void ],
-        # EAPI void elm_store_fetch_func_set(Elm_Store *st, Elm_Store_Item_Fetch_Cb func, const void *data);
-        [ :elm_store_fetch_func_set, [ :elm_store_p, :elm_store_item_fetch_cb, :void_p ], :void ],
-        # EAPI void elm_store_fetch_thread_set(Elm_Store *st, Eina_Bool use_thread);
-        [ :elm_store_fetch_thread_set, [ :elm_store_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_store_fetch_thread_get(const Elm_Store *st);
-        [ :elm_store_fetch_thread_get, [ :elm_store_p ], :eina_bool ],
-        # EAPI void elm_store_unfetch_func_set(Elm_Store *st, Elm_Store_Item_Unfetch_Cb func, const void *data);
-        [ :elm_store_unfetch_func_set, [ :elm_store_p, :elm_store_item_unfetch_cb, :void_p ], :void ],
-        # EAPI void elm_store_sorted_set(Elm_Store *st, Eina_Bool sorted);
-        [ :elm_store_sorted_set, [ :elm_store_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_store_sorted_get(const Elm_Store *st);
-        [ :elm_store_sorted_get, [ :elm_store_p ], :eina_bool ],
-        # EAPI void elm_store_item_data_set(Elm_Store_Item *sti, void *data);
-        [ :elm_store_item_data_set, [ :elm_store_item_p, :void_p ], :void ],
-        # EAPI void *elm_store_item_data_get(Elm_Store_Item *sti);
-        [ :elm_store_item_data_get, [ :elm_store_item_p ], :void_p ],
-        # EAPI const Elm_Store *elm_store_item_store_get(const Elm_Store_Item *sti);
-        [ :elm_store_item_store_get, [ :elm_store_item_p ], :elm_store_p ],
-        # EAPI const Elm_Genlist_Item *elm_store_item_genlist_item_get(const Elm_Store_Item *sti);
-        [ :elm_store_item_genlist_item_get, [ :elm_store_item_p ], :elm_genlist_item_p ],
-        # EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent);
-        [ :elm_segment_control_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Elm_Segment_Item *elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label);
-        [ :elm_segment_control_item_add, [ :evas_object_p, :evas_object_p, :string ], :elm_segment_item_p ],
-        # EAPI Elm_Segment_Item *elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, int index);
-        [ :elm_segment_control_item_insert_at, [ :evas_object_p, :evas_object_p, :string, :int ], :elm_segment_item_p ],
-        # EAPI void elm_segment_control_item_del(Elm_Segment_Item *it);
-        [ :elm_segment_control_item_del, [ :elm_segment_item_p ], :void ],
-        # EAPI void elm_segment_control_item_del_at(Evas_Object *obj, int index);
-        [ :elm_segment_control_item_del_at, [ :evas_object_p, :int ], :void ],
-        # EAPI int elm_segment_control_item_count_get(const Evas_Object *obj);
-        [ :elm_segment_control_item_count_get, [ :evas_object_p ], :int ],
-        # EAPI Elm_Segment_Item *elm_segment_control_item_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_get, [ :evas_object_p, :int ], :elm_segment_item_p ],
-        # EAPI const char *elm_segment_control_item_label_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_label_get, [ :evas_object_p, :int ], :string ],
-        # EAPI void elm_segment_control_item_label_set(Elm_Segment_Item* it, const char* label);
-        [ :elm_segment_control_item_label_set, [ :elm_segment_item_p, :string ], :void ],
-        # EAPI Evas_Object *elm_segment_control_item_icon_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_icon_get, [ :evas_object_p, :int ], :evas_object_p ],
-        # EAPI void elm_segment_control_item_icon_set(Elm_Segment_Item *it, Evas_Object *icon);
-        [ :elm_segment_control_item_icon_set, [ :elm_segment_item_p, :evas_object_p ], :void ],
-        # EAPI int elm_segment_control_item_index_get(const Elm_Segment_Item *it);
-        [ :elm_segment_control_item_index_get, [ :elm_segment_item_p ], :int ],
-        # EAPI Evas_Object *elm_segment_control_item_object_get(const Elm_Segment_Item *it);
-        [ :elm_segment_control_item_object_get, [ :elm_segment_item_p ], :evas_object_p ],
-        # EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj);
-        [ :elm_segment_control_item_selected_get, [ :evas_object_p ], :elm_segment_item_p ],
-        # EAPI void elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select);
-        [ :elm_segment_control_item_selected_set, [ :elm_segment_item_p, :eina_bool ], :void ],
-        # EAPI Evas_Object *elm_grid_add(Evas_Object *parent);
-        [ :elm_grid_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_grid_size_set(Evas_Object *obj, int w, int h);
-        [ :elm_grid_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_grid_size_get(Evas_Object *obj, int *w, int *h);
-        [ :elm_grid_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_grid_pack, [ :evas_object_p, :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_grid_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_grid_unpack, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI void elm_grid_clear(Evas_Object *obj, Eina_Bool clear);
-        [ :elm_grid_clear, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI void elm_grid_pack_set(Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_grid_pack_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_grid_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h);
-        [ :elm_grid_pack_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI Evas_Object *elm_factory_add(Evas_Object *parent);
-        [ :elm_factory_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_factory_maxmin_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_factory_maxmin_mode_get(const Evas_Object *obj);
-        [ :elm_factory_maxmin_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_factory_maxmin_reset_set(Evas_Object *obj);
-        [ :elm_factory_maxmin_reset_set, [ :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_player_add(Evas_Object *parent);
-        [ :elm_player_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_video_add(Evas_Object *parent);
-        [ :elm_video_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_video_file_set(Evas_Object *video, const char *filename);
-        [ :elm_video_file_set, [ :evas_object_p, :string ], :void ],
-        # EAPI void elm_video_uri_set(Evas_Object *video, const char *uri);
-        [ :elm_video_uri_set, [ :evas_object_p, :string ], :void ],
-        # EAPI Evas_Object *elm_video_emotion_get(const Evas_Object *video);
-        [ :elm_video_emotion_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_video_play(Evas_Object *video);
-        [ :elm_video_play, [ :evas_object_p ], :void ],
-        # EAPI void elm_video_pause(Evas_Object *video);
-        [ :elm_video_pause, [ :evas_object_p ], :void ],
-        # EAPI void elm_video_stop(Evas_Object *video);
-        [ :elm_video_stop, [ :evas_object_p ], :void ],
-        # EAPI Eina_Bool elm_video_is_playing(const Evas_Object *video);
-        [ :elm_video_is_playing, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_video_is_seekable(const Evas_Object *video);
-        [ :elm_video_is_seekable, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_video_audio_mute_get(const Evas_Object *video);
-        [ :elm_video_audio_mute_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_video_audio_mute_set(Evas_Object *video, Eina_Bool mute);
-        [ :elm_video_audio_mute_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI double elm_video_audio_level_get(const Evas_Object *video);
-        [ :elm_video_audio_level_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_video_audio_level_set(Evas_Object *video, double volume);
-        [ :elm_video_audio_level_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_video_play_position_get(const Evas_Object *video);
-        [ :elm_video_play_position_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_video_play_position_set(Evas_Object *video, double position);
-        [ :elm_video_play_position_set, [ :evas_object_p, :double ], :void ],
-        # EAPI double elm_video_play_length_get(const Evas_Object *video);
-        [ :elm_video_play_length_get, [ :evas_object_p ], :double ],
-        # EAPI void elm_video_remember_position_set(Evas_Object *video, Eina_Bool remember);
-        [ :elm_video_remember_position_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_video_remember_position_get(const Evas_Object *video);
-        [ :elm_video_remember_position_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI const char *elm_video_title_get(const Evas_Object *video);
-        [ :elm_video_title_get, [ :evas_object_p ], :string ],
-        # EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent);
-        [ :elm_naviframe_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_push, [ :evas_object_p, :string, :evas_object_p, :evas_object_p, :evas_object_p, :string ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_insert_before, [ :elm_object_item_p, :string, :evas_object_p, :evas_object_p, :evas_object_p, :string ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_insert_after(Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_insert_after, [ :elm_object_item_p, :string, :evas_object_p, :evas_object_p, :evas_object_p, :string ], :elm_object_item_p ],
-        # EAPI Evas_Object *elm_naviframe_item_pop(Evas_Object *obj);
-        [ :elm_naviframe_item_pop, [ :evas_object_p ], :evas_object_p ],
-        # EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it);
-        [ :elm_naviframe_item_pop_to, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_naviframe_item_promote(Elm_Object_Item *it);
-        [ :elm_naviframe_item_promote, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_naviframe_item_del(Elm_Object_Item *it);
-        [ :elm_naviframe_item_del, [ :elm_object_item_p ], :void ],
-        # EAPI void elm_naviframe_content_preserve_on_pop_set(Evas_Object *obj, Eina_Bool preserve);
-        [ :elm_naviframe_content_preserve_on_pop_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_naviframe_content_preserve_on_pop_get(const Evas_Object *obj);
-        [ :elm_naviframe_content_preserve_on_pop_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Elm_Object_Item *elm_naviframe_top_item_get(const Evas_Object *obj);
-        [ :elm_naviframe_top_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI Elm_Object_Item *elm_naviframe_bottom_item_get(const Evas_Object *obj);
-        [ :elm_naviframe_bottom_item_get, [ :evas_object_p ], :elm_object_item_p ],
-        # EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style);
-        [ :elm_naviframe_item_style_set, [ :elm_object_item_p, :string ], :void ],
-        # EAPI const char *elm_naviframe_item_style_get(const Elm_Object_Item *it);
-        [ :elm_naviframe_item_style_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible);
-        [ :elm_naviframe_item_title_visible_set, [ :elm_object_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Object_Item *it);
-        [ :elm_naviframe_item_title_visible_get, [ :elm_object_item_p ], :eina_bool ],
-        # EAPI void elm_naviframe_prev_btn_auto_pushed_set(Evas_Object *obj, Eina_Bool auto_pushed);
-        [ :elm_naviframe_prev_btn_auto_pushed_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_naviframe_prev_btn_auto_pushed_get(const Evas_Object *obj);
-        [ :elm_naviframe_prev_btn_auto_pushed_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Inlist *elm_naviframe_items_get(const Evas_Object *obj);
-        [ :elm_naviframe_items_get, [ :evas_object_p ], :pointer ],
-        # EAPI void elm_naviframe_event_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_naviframe_event_enabled_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_naviframe_event_enabled_get(const Evas_Object *obj);
-        [ :elm_naviframe_event_enabled_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent);
-        [ :elm_multibuttonentry_add, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char *elm_multibuttonentry_label_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_label_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_multibuttonentry_label_set(Evas_Object *obj, const char *label);
-        [ :elm_multibuttonentry_label_set, [ :evas_object_p, :string ], :void ],
-        # EAPI Evas_Object *elm_multibuttonentry_entry_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_entry_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI const char * elm_multibuttonentry_guide_text_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_guide_text_get, [ :evas_object_p ], :string ],
-        # EAPI void elm_multibuttonentry_guide_text_set(Evas_Object *obj, const char *guidetext);
-        [ :elm_multibuttonentry_guide_text_set, [ :evas_object_p, :string ], :void ],
-        # EAPI int elm_multibuttonentry_shrink_mode_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_shrink_mode_get, [ :evas_object_p ], :int ],
-        # EAPI void elm_multibuttonentry_shrink_mode_set(Evas_Object *obj, int shrink);
-        [ :elm_multibuttonentry_shrink_mode_set, [ :evas_object_p, :int ], :void ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_prepend(Evas_Object *obj, const char *label, void *data);
-        [ :elm_multibuttonentry_item_prepend, [ :evas_object_p, :string, :void_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_append(Evas_Object *obj, const char *label, void *data);
-        [ :elm_multibuttonentry_item_append, [ :evas_object_p, :string, :void_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_insert_before(Evas_Object *obj, Elm_Multibuttonentry_Item *before, const char *label, void *data);
-        [ :elm_multibuttonentry_item_insert_before, [ :evas_object_p, :elm_multibuttonentry_item_p, :string, :void_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_insert_after(Evas_Object *obj, Elm_Multibuttonentry_Item *after, const char *label, void *data);
-        [ :elm_multibuttonentry_item_insert_after, [ :evas_object_p, :elm_multibuttonentry_item_p, :string, :void_p ], :elm_multibuttonentry_item_p ],
-        # EAPI const Eina_List *elm_multibuttonentry_items_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_items_get, [ :evas_object_p ], :eina_list_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_first_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_first_item_get, [ :evas_object_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_last_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_last_item_get, [ :evas_object_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_selected_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_selected_item_get, [ :evas_object_p ], :elm_multibuttonentry_item_p ],
-        # EAPI void elm_multibuttonentry_item_select(Elm_Multibuttonentry_Item *item, Eina_Bool selected);
-        [ :elm_multibuttonentry_item_select, [ :elm_multibuttonentry_item_p, :eina_bool ], :void ],
-        # EAPI void elm_multibuttonentry_item_unselect_all(Evas_Object *obj);
-        [ :elm_multibuttonentry_item_unselect_all, [ :evas_object_p ], :void ],
-        # EAPI void elm_multibuttonentry_item_del(Elm_Multibuttonentry_Item *item);
-        [ :elm_multibuttonentry_item_del, [ :elm_multibuttonentry_item_p ], :void ],
-        # EAPI void elm_multibuttonentry_clear(Evas_Object *obj);
-        [ :elm_multibuttonentry_clear, [ :evas_object_p ], :void ],
-        # EAPI const char *elm_multibuttonentry_item_label_get(const Elm_Multibuttonentry_Item *item);
-        [ :elm_multibuttonentry_item_label_get, [ :elm_multibuttonentry_item_p ], :string ],
-        # EAPI void elm_multibuttonentry_item_label_set(Elm_Multibuttonentry_Item *item, const char *str);
-        [ :elm_multibuttonentry_item_label_set, [ :elm_multibuttonentry_item_p, :string ], :void ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_prev_get(const Elm_Multibuttonentry_Item *item);
-        [ :elm_multibuttonentry_item_prev_get, [ :elm_multibuttonentry_item_p ], :elm_multibuttonentry_item_p ],
-        # EAPI Elm_Multibuttonentry_Item *elm_multibuttonentry_item_next_get(const Elm_Multibuttonentry_Item *item);
-        [ :elm_multibuttonentry_item_next_get, [ :elm_multibuttonentry_item_p ], :elm_multibuttonentry_item_p ],
-        # EAPI void elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
-        [ :elm_multibuttonentry_item_filter_append, [ :evas_object_p, :elm_multibuttonentry_item_filter_callback, :void_p ], :void ],
-        # EAPI void elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
-        [ :elm_multibuttonentry_item_filter_prepend, [ :evas_object_p, :elm_multibuttonentry_item_filter_callback, :void_p ], :void ],
-        # EAPI void elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data);
-        [ :elm_multibuttonentry_item_filter_remove, [ :evas_object_p, :elm_multibuttonentry_item_filter_callback, :void_p ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_bg.rb b/lib/efl/native/elm/elm_bg.rb
new file mode 100644
index 0000000..7aa1c61
--- /dev/null
+++ b/lib/efl/native/elm/elm_bg.rb
@@ -0,0 +1,53 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmBg
+        #
+        FCT_PREFIX = 'elm_bg_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Bg_Option;
+        enum :elm_bg_option, [ :elm_bg_option_center, :elm_bg_option_scale, :elm_bg_option_stretch, :elm_bg_option_tile ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_bg_add(Evas_Object *parent);
+        [ :elm_bg_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_bg_file_set(Evas_Object *obj, const char *file, const char *group);
+        [ :elm_bg_file_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI void elm_bg_file_get(const Evas_Object *obj, const char **file, const char **group);
+        [ :elm_bg_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option);
+        [ :elm_bg_option_set, [ :evas_object, :elm_bg_option ], :void ],
+        # EAPI Elm_Bg_Option elm_bg_option_get(const Evas_Object *obj);
+        [ :elm_bg_option_get, [ :evas_object ], :elm_bg_option ],
+        # EAPI void elm_bg_color_set(Evas_Object *obj, int r, int g, int b);
+        [ :elm_bg_color_set, [ :evas_object, :int, :int, :int ], :void ],
+        # EAPI void elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b);
+        [ :elm_bg_color_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+        [ :elm_bg_load_size_set, [ :evas_object, :int, :int ], :void ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_box.rb b/lib/efl/native/elm/elm_box.rb
new file mode 100644
index 0000000..4b776cd
--- /dev/null
+++ b/lib/efl/native/elm/elm_box.rb
@@ -0,0 +1,81 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmBox
+        #
+        FCT_PREFIX = 'elm_box_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # TYPEDEFS
+        # typedef struct _Elm_Box_Transition Elm_Box_Transition;
+        typedef :pointer, :elm_box_transition
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_box_add(Evas_Object *parent);
+        [ :elm_box_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
+        [ :elm_box_horizontal_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_box_horizontal_get(const Evas_Object *obj);
+        [ :elm_box_horizontal_get, [ :evas_object ], :bool ],
+        # EAPI void elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
+        [ :elm_box_homogeneous_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj);
+        [ :elm_box_homogeneous_get, [ :evas_object ], :bool ],
+        # EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_box_pack_start, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_box_pack_end, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
+        [ :elm_box_pack_before, [ :evas_object, :evas_object, :evas_object ], :void ],
+        # EAPI void elm_box_pack_after(Evas_Object *obj, Evas_Object *subobj, Evas_Object *after);
+        [ :elm_box_pack_after, [ :evas_object, :evas_object, :evas_object ], :void ],
+        # EAPI void elm_box_clear(Evas_Object *obj);
+        [ :elm_box_clear, [ :evas_object ], :void ],
+        # EAPI void elm_box_unpack(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_box_unpack, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_box_unpack_all(Evas_Object *obj);
+        [ :elm_box_unpack_all, [ :evas_object ], :void ],
+        # EAPI Eina_List *elm_box_children_get(const Evas_Object *obj);
+        [ :elm_box_children_get, [ :evas_object ], :eina_list ],
+        # EAPI void elm_box_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
+        [ :elm_box_padding_set, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_box_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
+        [ :elm_box_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_box_align_set(Evas_Object *obj, double horizontal, double vertical);
+        [ :elm_box_align_set, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_box_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
+        [ :elm_box_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_box_recalculate(Evas_Object *obj);
+        [ :elm_box_recalculate, [ :evas_object ], :void ],
+        # EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
+        # FIXME
+        # EAPI void elm_box_layout_transition(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
+        [ :elm_box_layout_transition, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        # EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, void (*start_layout_free_data)(void *data), Evas_Object_Box_Layout end_layout, void *end_layout_data, void (*end_layout_free_data)(void *data), void (*transition_end_cb)(void *data), void *transition_end_data);
+        # FIXME
+        # EAPI void elm_box_transition_free(void *data);
+        [ :elm_box_transition_free, [ :pointer ], :void ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_bubble.rb b/lib/efl/native/elm/elm_bubble.rb
new file mode 100644
index 0000000..11b000b
--- /dev/null
+++ b/lib/efl/native/elm/elm_bubble.rb
@@ -0,0 +1,39 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmBubble
+        #
+        FCT_PREFIX = 'elm_bubble_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_bubble_add(Evas_Object *parent);
+        [ :elm_bubble_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_bubble_corner_set(Evas_Object *obj, const char *corner);
+        [ :elm_bubble_corner_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_bubble_corner_get(const Evas_Object *obj);
+        [ :elm_bubble_corner_get, [ :evas_object ], :string ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_button.rb b/lib/efl/native/elm/elm_button.rb
new file mode 100644
index 0000000..c850123
--- /dev/null
+++ b/lib/efl/native/elm/elm_button.rb
@@ -0,0 +1,47 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmButton
+        #
+        FCT_PREFIX = 'elm_button_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_button_add(Evas_Object *parent);
+        [ :elm_button_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on);
+        [ :elm_button_autorepeat_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
+        [ :elm_button_autorepeat_get, [ :evas_object ], :bool ],
+        # EAPI void elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t);
+        [ :elm_button_autorepeat_initial_timeout_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_button_autorepeat_initial_timeout_get(const Evas_Object *obj);
+        [ :elm_button_autorepeat_initial_timeout_get, [ :evas_object ], :double ],
+        # EAPI void elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t);
+        [ :elm_button_autorepeat_gap_timeout_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj);
+        [ :elm_button_autorepeat_gap_timeout_get, [ :evas_object ], :double ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_calendar.rb b/lib/efl/native/elm/elm_calendar.rb
new file mode 100644
index 0000000..9677040
--- /dev/null
+++ b/lib/efl/native/elm/elm_calendar.rb
@@ -0,0 +1,76 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmCalendar
+        #
+        FCT_PREFIX = 'elm_calendar_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Calendar_Mark_Repeat;
+        enum :elm_calendar_mark_repeat, [ :elm_calendar_unique, :elm_calendar_daily, :elm_calendar_weekly, :elm_calendar_monthly,
+            :elm_calendar_annually ]
+        #
+        # TYPEDEFS
+        # typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark;
+        typedef :pointer, :elm_calendar_mark
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_calendar_add(Evas_Object *parent);
+        [ :elm_calendar_add, [ :evas_object ], :evas_object ],
+        # EAPI const char **elm_calendar_weekdays_names_get(const Evas_Object *obj);
+        [ :elm_calendar_weekdays_names_get, [ :evas_object ], :pointer ],
+        # EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]);
+        # FIXME
+        # EAPI void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max);
+        [ :elm_calendar_min_max_year_set, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max);
+        [ :elm_calendar_min_max_year_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_calendar_day_selection_enabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj);
+        [ :elm_calendar_day_selection_enabled_get, [ :evas_object ], :bool ],
+        # EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time);
+        [ :elm_calendar_selected_time_set, [ :evas_object, :pointer ], :void ],
+        # EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time);
+        [ :elm_calendar_selected_time_get, [ :evas_object, :pointer ], :bool ],
+        # EAPI void elm_calendar_format_function_set(Evas_Object *obj, char *(*format_function)(struct tm *stime));
+        # FIXME
+        # EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat);
+        [ :elm_calendar_mark_add, [ :evas_object, :string, :pointer, :elm_calendar_mark_repeat ], :elm_calendar_mark ],
+        # EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark);
+        [ :elm_calendar_mark_del, [ :elm_calendar_mark ], :void ],
+        # EAPI void elm_calendar_marks_clear(Evas_Object *obj);
+        [ :elm_calendar_marks_clear, [ :evas_object ], :void ],
+        # EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj);
+        [ :elm_calendar_marks_get, [ :evas_object ], :eina_list ],
+        # EAPI void elm_calendar_marks_draw(Evas_Object *obj);
+        [ :elm_calendar_marks_draw, [ :evas_object ], :void ],
+        # EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval);
+        [ :elm_calendar_interval_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_calendar_interval_get(const Evas_Object *obj);
+        [ :elm_calendar_interval_get, [ :evas_object ], :double ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_check.rb b/lib/efl/native/elm/elm_check.rb
new file mode 100644
index 0000000..9165d30
--- /dev/null
+++ b/lib/efl/native/elm/elm_check.rb
@@ -0,0 +1,41 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmCheck
+        #
+        FCT_PREFIX = 'elm_check_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object * elm_check_add(Evas_Object *parent);
+        [ :elm_check_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state);
+        [ :elm_check_state_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj);
+        [ :elm_check_state_get, [ :evas_object ], :bool ],
+        # EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
+        [ :elm_check_state_pointer_set, [ :evas_object, :pointer ], :void ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_clock.rb b/lib/efl/native/elm/elm_clock.rb
new file mode 100644
index 0000000..bd6cff7
--- /dev/null
+++ b/lib/efl/native/elm/elm_clock.rb
@@ -0,0 +1,64 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmClock
+        #
+        FCT_PREFIX = 'elm_clock_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Clock_Digedit;
+        enum :elm_clock_digedit, [ :elm_clock_none, 0, :elm_clock_hour_decimal, 1<<0, :elm_clock_hour_unit, 1<<1, :elm_clock_min_decimal, 1<<2,
+            :elm_clock_min_unit, 1<<3, :elm_clock_sec_decimal, 1<<4, :elm_clock_sec_unit, 1<<5, :elm_clock_all, (1<<6)-1 ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
+        [ :elm_clock_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
+        [ :elm_clock_time_set, [ :evas_object, :int, :int, :int ], :void ],
+        # EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec);
+        [ :elm_clock_time_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit);
+        [ :elm_clock_edit_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_clock_edit_get(const Evas_Object *obj);
+        [ :elm_clock_edit_get, [ :evas_object ], :bool ],
+        # EAPI void elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit);
+        [ :elm_clock_digit_edit_set, [ :evas_object, :elm_clock_digedit ], :void ],
+        # EAPI Elm_Clock_Digedit elm_clock_digit_edit_get(const Evas_Object *obj);
+        [ :elm_clock_digit_edit_get, [ :evas_object ], :elm_clock_digedit ],
+        # EAPI void elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm);
+        [ :elm_clock_show_am_pm_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_clock_show_am_pm_get(const Evas_Object *obj);
+        [ :elm_clock_show_am_pm_get, [ :evas_object ], :bool ],
+        # EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds);
+        [ :elm_clock_show_seconds_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_clock_show_seconds_get(const Evas_Object *obj);
+        [ :elm_clock_show_seconds_get, [ :evas_object ], :bool ],
+        # EAPI void elm_clock_interval_set(Evas_Object *obj, double interval);
+        [ :elm_clock_interval_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_clock_interval_get(const Evas_Object *obj);
+        [ :elm_clock_interval_get, [ :evas_object ], :double ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_cursor.rb b/lib/efl/native/elm/elm_cursor.rb
new file mode 100644
index 0000000..1a0b6fe
--- /dev/null
+++ b/lib/efl/native/elm/elm_cursor.rb
@@ -0,0 +1,51 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmCursor
+        #
+        FCT_PREFIX = 'elm_cursor_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor);
+        [ :elm_object_cursor_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_object_cursor_get(const Evas_Object *obj);
+        [ :elm_object_cursor_get, [ :evas_object ], :string ],
+        # EAPI void elm_object_cursor_unset(Evas_Object *obj);
+        [ :elm_object_cursor_unset, [ :evas_object ], :void ],
+        # EAPI void elm_object_cursor_style_set(Evas_Object *obj, const char *style);
+        [ :elm_object_cursor_style_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_object_cursor_style_get(const Evas_Object *obj);
+        [ :elm_object_cursor_style_get, [ :evas_object ], :string ],
+        # EAPI void elm_object_cursor_engine_only_set(Evas_Object *obj, Eina_Bool engine_only);
+        [ :elm_object_cursor_engine_only_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_object_cursor_engine_only_get(const Evas_Object *obj);
+        [ :elm_object_cursor_engine_only_get, [ :evas_object ], :bool ],
+        # EAPI int elm_cursor_engine_only_get(void);
+        [ :elm_cursor_engine_only_get, [  ], :int ],
+        # EAPI Eina_Bool elm_cursor_engine_only_set(int engine_only);
+        [ :elm_cursor_engine_only_set, [ :int ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_entry.rb b/lib/efl/native/elm/elm_entry.rb
new file mode 100644
index 0000000..6e1ba88
--- /dev/null
+++ b/lib/efl/native/elm/elm_entry.rb
@@ -0,0 +1,242 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/edje'
+require 'efl/native/elementary'
+require 'efl/native/elm/elm_icon'
+require 'efl/native/elm/elm_scroller'
+#
+module Efl
+    #
+    module ElmEntry
+        #
+        FCT_PREFIX = 'elm_entry_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Text_Format;
+        enum :elm_text_format, [ :elm_text_format_plain_utf8, :elm_text_format_markup_utf8 ]
+        # typedef enum {...} Elm_Wrap_Type;
+        enum :elm_wrap_type, [ :elm_wrap_none, 0, :elm_wrap_char, 1, :elm_wrap_word, 2, :elm_wrap_mixed, 3, :elm_wrap_last, 4 ]
+        # typedef enum {...} Elm_Input_Panel_Layout;
+        enum :elm_input_panel_layout, [ :elm_input_panel_layout_normal, :elm_input_panel_layout_number, :elm_input_panel_layout_email,
+            :elm_input_panel_layout_url, :elm_input_panel_layout_phonenumber, :elm_input_panel_layout_ip, :elm_input_panel_layout_month,
+            :elm_input_panel_layout_numberonly, :elm_input_panel_layout_invalid, :elm_input_panel_layout_hex, :elm_input_panel_layout_terminal,
+            :elm_input_panel_layout_password ]
+        # typedef enum {...} Elm_Input_Panel_Lang;
+        enum :elm_input_panel_lang, [ :elm_input_panel_lang_automatic, :elm_input_panel_lang_alphabet ]
+        # typedef enum {...} Elm_Autocapital_Type;
+        enum :elm_autocapital_type, [ :elm_autocapital_type_none, :elm_autocapital_type_word, :elm_autocapital_type_sentence,
+            :elm_autocapital_type_allcharacter ]
+        # typedef enum {...} Elm_Input_Panel_Return_Key_Type;
+        enum :elm_input_panel_return_key_type, [ :elm_input_panel_return_key_type_default, :elm_input_panel_return_key_type_done,
+            :elm_input_panel_return_key_type_go, :elm_input_panel_return_key_type_join, :elm_input_panel_return_key_type_login,
+            :elm_input_panel_return_key_type_next, :elm_input_panel_return_key_type_search, :elm_input_panel_return_key_type_send ]
+        #
+        # TYPEDEFS
+        # typedef struct _Elm_Entry_Anchor_Info Elm_Entry_Anchor_Info;
+        typedef :pointer, :elm_entry_anchor_info
+        # typedef Edje_Entry_Change_Info Elm_Entry_Change_Info;
+        typedef :edje_entry_change_info, :elm_entry_change_info
+        # typedef struct _Elm_Entry_Filter_Limit_Size Elm_Entry_Filter_Limit_Size;
+        typedef :pointer, :elm_entry_filter_limit_size
+        # typedef struct _Elm_Entry_Filter_Accept_Set Elm_Entry_Filter_Accept_Set;
+        typedef :pointer, :elm_entry_filter_accept_set
+        #
+        # CALLBACKS
+        # typedef void (*Elm_Entry_Filter_Cb) (void *data, Evas_Object *entry, char **text);
+        callback :elm_entry_filter_cb, [ :pointer, :evas_object, :pointer ], :void
+        # use in elm_entry_item_provider_* : Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item)
+        callback :elm_entry_item_provider_cb, [ :pointer, :evas_object, :string ], :evas_object
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
+        [ :elm_entry_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
+        [ :elm_entry_single_line_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_single_line_get(const Evas_Object *obj);
+        [ :elm_entry_single_line_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password);
+        [ :elm_entry_password_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj);
+        [ :elm_entry_password_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
+        [ :elm_entry_entry_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
+        [ :elm_entry_entry_get, [ :evas_object ], :string ],
+        # EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry);
+        [ :elm_entry_entry_append, [ :evas_object, :string ], :void ],
+        # EAPI Eina_Bool elm_entry_is_empty(const Evas_Object *obj);
+        [ :elm_entry_is_empty, [ :evas_object ], :bool ],
+        # EAPI const char *elm_entry_selection_get(const Evas_Object *obj);
+        [ :elm_entry_selection_get, [ :evas_object ], :string ],
+        # EAPI Evas_Object * elm_entry_textblock_get(Evas_Object *obj);
+        [ :elm_entry_textblock_get, [ :evas_object ], :evas_object ],
+        # EAPI void elm_entry_calc_force(Evas_Object *obj);
+        [ :elm_entry_calc_force, [ :evas_object ], :void ],
+        # EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry);
+        [ :elm_entry_entry_insert, [ :evas_object, :string ], :void ],
+        # EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
+        [ :elm_entry_line_wrap_set, [ :evas_object, :elm_wrap_type ], :void ],
+        # EAPI Elm_Wrap_Type elm_entry_line_wrap_get(const Evas_Object *obj);
+        [ :elm_entry_line_wrap_get, [ :evas_object ], :elm_wrap_type ],
+        # EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable);
+        [ :elm_entry_editable_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj);
+        [ :elm_entry_editable_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_select_none(Evas_Object *obj);
+        [ :elm_entry_select_none, [ :evas_object ], :void ],
+        # EAPI void elm_entry_select_all(Evas_Object *obj);
+        [ :elm_entry_select_all, [ :evas_object ], :void ],
+        # EAPI Eina_Bool elm_entry_cursor_next(Evas_Object *obj);
+        [ :elm_entry_cursor_next, [ :evas_object ], :bool ],
+        # EAPI Eina_Bool elm_entry_cursor_prev(Evas_Object *obj);
+        [ :elm_entry_cursor_prev, [ :evas_object ], :bool ],
+        # EAPI Eina_Bool elm_entry_cursor_up(Evas_Object *obj);
+        [ :elm_entry_cursor_up, [ :evas_object ], :bool ],
+        # EAPI Eina_Bool elm_entry_cursor_down(Evas_Object *obj);
+        [ :elm_entry_cursor_down, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_cursor_begin_set(Evas_Object *obj);
+        [ :elm_entry_cursor_begin_set, [ :evas_object ], :void ],
+        # EAPI void elm_entry_cursor_end_set(Evas_Object *obj);
+        [ :elm_entry_cursor_end_set, [ :evas_object ], :void ],
+        # EAPI void elm_entry_cursor_line_begin_set(Evas_Object *obj);
+        [ :elm_entry_cursor_line_begin_set, [ :evas_object ], :void ],
+        # EAPI void elm_entry_cursor_line_end_set(Evas_Object *obj);
+        [ :elm_entry_cursor_line_end_set, [ :evas_object ], :void ],
+        # EAPI void elm_entry_cursor_selection_begin(Evas_Object *obj);
+        [ :elm_entry_cursor_selection_begin, [ :evas_object ], :void ],
+        # EAPI void elm_entry_cursor_selection_end(Evas_Object *obj);
+        [ :elm_entry_cursor_selection_end, [ :evas_object ], :void ],
+        # EAPI Eina_Bool elm_entry_cursor_is_format_get(const Evas_Object *obj);
+        [ :elm_entry_cursor_is_format_get, [ :evas_object ], :bool ],
+        # EAPI Eina_Bool elm_entry_cursor_is_visible_format_get(const Evas_Object *obj);
+        [ :elm_entry_cursor_is_visible_format_get, [ :evas_object ], :bool ],
+        # EAPI char *elm_entry_cursor_content_get(const Evas_Object *obj);
+        [ :elm_entry_cursor_content_get, [ :evas_object ], :string ],
+        # EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_entry_cursor_geometry_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        # EAPI void elm_entry_cursor_pos_set(Evas_Object *obj, int pos);
+        [ :elm_entry_cursor_pos_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_entry_cursor_pos_get(const Evas_Object *obj);
+        [ :elm_entry_cursor_pos_get, [ :evas_object ], :int ],
+        # EAPI void elm_entry_selection_cut(Evas_Object *obj);
+        [ :elm_entry_selection_cut, [ :evas_object ], :void ],
+        # EAPI void elm_entry_selection_copy(Evas_Object *obj);
+        [ :elm_entry_selection_copy, [ :evas_object ], :void ],
+        # EAPI void elm_entry_selection_paste(Evas_Object *obj);
+        [ :elm_entry_selection_paste, [ :evas_object ], :void ],
+        # EAPI void elm_entry_context_menu_clear(Evas_Object *obj);
+        [ :elm_entry_context_menu_clear, [ :evas_object ], :void ],
+        # EAPI void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
+        [ :elm_entry_context_menu_item_add, [ :evas_object, :string, :string, :elm_icon_type, :evas_smart_cb, :pointer ], :void ],
+        # EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_entry_context_menu_disabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj);
+        [ :elm_entry_context_menu_disabled_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        [ :elm_entry_item_provider_append, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        # EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        [ :elm_entry_item_provider_prepend, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        # EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data);
+        [ :elm_entry_item_provider_remove, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        # EAPI void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
+        [ :elm_entry_markup_filter_append, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
+        # EAPI void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
+        [ :elm_entry_markup_filter_prepend, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
+        # EAPI void elm_entry_markup_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
+        [ :elm_entry_markup_filter_remove, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
+        # EAPI char *elm_entry_markup_to_utf8(const char *s);
+        [ :elm_entry_markup_to_utf8, [ :string ], :string ],
+        # EAPI char *elm_entry_utf8_to_markup(const char *s);
+        [ :elm_entry_utf8_to_markup, [ :string ], :string ],
+        # EAPI void elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format);
+        [ :elm_entry_file_set, [ :evas_object, :string, :elm_text_format ], :void ],
+        # EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format);
+        [ :elm_entry_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_entry_file_save(Evas_Object *obj);
+        [ :elm_entry_file_save, [ :evas_object ], :void ],
+        # EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave);
+        [ :elm_entry_autosave_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj);
+        [ :elm_entry_autosave_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly);
+        [ :elm_entry_cnp_textonly_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_cnp_textonly_get(const Evas_Object *obj);
+        [ :elm_entry_cnp_textonly_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll);
+        [ :elm_entry_scrollable_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj);
+        [ :elm_entry_scrollable_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting);
+        [ :elm_entry_icon_visible_set, [ :evas_object, :bool ], :void ],
+        # EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting);
+        [ :elm_entry_end_visible_set, [ :evas_object, :bool ], :void ],
+        # EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
+        [ :elm_entry_scrollbar_policy_set, [ :evas_object, :elm_scroller_policy, :elm_scroller_policy ], :void ],
+        # EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
+        [ :elm_entry_bounce_set, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
+        [ :elm_entry_bounce_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
+        [ :elm_entry_input_panel_layout_set, [ :evas_object, :elm_input_panel_layout ], :void ],
+        # EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_layout_get, [ :evas_object ], :elm_input_panel_layout ],
+        # EAPI void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type);
+        [ :elm_entry_autocapital_type_set, [ :evas_object, :elm_autocapital_type ], :void ],
+        # EAPI Elm_Autocapital_Type elm_entry_autocapital_type_get(const Evas_Object *obj);
+        [ :elm_entry_autocapital_type_get, [ :evas_object ], :elm_autocapital_type ],
+        # EAPI void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_entry_input_panel_enabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_input_panel_enabled_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_enabled_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_input_panel_show(Evas_Object *obj);
+        [ :elm_entry_input_panel_show, [ :evas_object ], :void ],
+        # EAPI void elm_entry_input_panel_hide(Evas_Object *obj);
+        [ :elm_entry_input_panel_hide, [ :evas_object ], :void ],
+        # EAPI void elm_entry_input_panel_language_set(Evas_Object *obj, Elm_Input_Panel_Lang lang);
+        [ :elm_entry_input_panel_language_set, [ :evas_object, :elm_input_panel_lang ], :void ],
+        # EAPI Elm_Input_Panel_Lang elm_entry_input_panel_language_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_language_get, [ :evas_object ], :elm_input_panel_lang ],
+        # EAPI void elm_entry_input_panel_imdata_set(Evas_Object *obj, const void *data, int len);
+        [ :elm_entry_input_panel_imdata_set, [ :evas_object, :pointer, :int ], :void ],
+        # EAPI void elm_entry_input_panel_imdata_get(const Evas_Object *obj, void *data, int *len);
+        [ :elm_entry_input_panel_imdata_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_entry_input_panel_return_key_type_set(Evas_Object *obj, Elm_Input_Panel_Return_Key_Type return_key_type);
+        [ :elm_entry_input_panel_return_key_type_set, [ :evas_object, :elm_input_panel_return_key_type ], :void ],
+        # EAPI Elm_Input_Panel_Return_Key_Type elm_entry_input_panel_return_key_type_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_return_key_type_get, [ :evas_object ], :elm_input_panel_return_key_type ],
+        # EAPI void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_entry_input_panel_return_key_disabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_input_panel_return_key_disabled_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_return_key_disabled_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_imf_context_reset(Evas_Object *obj);
+        [ :elm_entry_imf_context_reset, [ :evas_object ], :void ],
+        # EAPI void elm_entry_prediction_allow_set(Evas_Object *obj, Eina_Bool prediction);
+        [ :elm_entry_prediction_allow_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_prediction_allow_get(const Evas_Object *obj);
+        [ :elm_entry_prediction_allow_get, [ :evas_object ], :bool ],
+        # EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text);
+        [ :elm_entry_filter_limit_size, [ :pointer, :evas_object, :pointer ], :void ],
+        # EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
+        [ :elm_entry_filter_accept_set, [ :pointer, :evas_object, :pointer ], :void ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_frame.rb b/lib/efl/native/elm/elm_frame.rb
new file mode 100644
index 0000000..e941b82
--- /dev/null
+++ b/lib/efl/native/elm/elm_frame.rb
@@ -0,0 +1,45 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmFrame
+        #
+        FCT_PREFIX = 'elm_frame_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_frame_add(Evas_Object *parent);
+        [ :elm_frame_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse);
+        [ :elm_frame_autocollapse_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_frame_autocollapse_get(const Evas_Object *obj);
+        [ :elm_frame_autocollapse_get, [ :evas_object ], :bool ],
+        # EAPI void elm_frame_collapse_set(Evas_Object *obj, Eina_Bool collapse);
+        [ :elm_frame_collapse_set, [ :evas_object, :bool ], :void ],
+        # EAPI void elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse);
+        [ :elm_frame_collapse_go, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_frame_collapse_get(const Evas_Object *obj);
+        [ :elm_frame_collapse_get, [ :evas_object ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_general.rb b/lib/efl/native/elm/elm_general.rb
new file mode 100644
index 0000000..8cde6ac
--- /dev/null
+++ b/lib/efl/native/elm/elm_general.rb
@@ -0,0 +1,105 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/evas'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module Elm
+        #
+        FCT_PREFIX = 'elm_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Object_Layer;
+        enum :elm_object_layer, [ :elm_object_layer_background, EVAS_LAYER_MIN+64, :elm_object_layer_default, 0, :elm_object_layer_focus,
+            EVAS_LAYER_MAX-128, :elm_object_layer_tooltip, EVAS_LAYER_MAX-64, :elm_object_layer_cursor, EVAS_LAYER_MAX-32, :elm_object_layer_last, 32736 ]
+        # typedef enum {...} Elm_Policy;
+        enum :elm_policy, [ :elm_policy_quit, :elm_policy_last ]
+        # typedef enum {...} Elm_Policy_Quit;
+        enum :elm_policy_quit, [ :elm_policy_quit_none, 0, :elm_policy_quit_last_window_closed, 1 ]
+        # typedef enum {...} Elm_Focus_Direction;
+        enum :elm_focus_direction, [ :elm_focus_previous, :elm_focus_next ]
+        #
+        # TYPEDEFS
+        # typedef struct _Elm_Event_Policy_Changed Elm_Event_Policy_Changed;
+        typedef :pointer, :elm_event_policy_changed
+        # typedef struct _Elm_Object_Item Elm_Object_Item;
+        typedef :pointer, :elm_object_item
+        #
+        # CALLBACKS
+        # typedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info);
+        callback :elm_event_cb, [ :pointer, :evas_object, :evas_object, :evas_callback_type, :pointer ], :bool
+        #
+        # VARIABLES
+        # EAPI extern int ELM_ECORE_EVENT_ETHUMB_CONNECT;
+        attach_variable :ELM_ECORE_EVENT_ETHUMB_CONNECT, :int
+        # EAPI extern int ELM_EVENT_CONFIG_ALL_CHANGED;
+        attach_variable :ELM_EVENT_CONFIG_ALL_CHANGED, :int
+        # EAPI extern int ELM_EVENT_POLICY_CHANGED;
+        attach_variable :ELM_EVENT_POLICY_CHANGED, :int
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI int elm_init(int argc, char **argv);
+        [ :elm_init, [ :int, :pointer ], :int ],
+        # EAPI int elm_shutdown(void);
+        [ :elm_shutdown, [  ], :int ],
+        # EAPI void elm_run(void);
+        [ :elm_run, [  ], :void ],
+        # EAPI void elm_exit(void);
+        [ :elm_exit, [  ], :void ],
+        # EAPI void elm_quicklaunch_mode_set(Eina_Bool ql_on);
+        [ :elm_quicklaunch_mode_set, [ :bool ], :void ],
+        # EAPI Eina_Bool elm_quicklaunch_mode_get(void);
+        [ :elm_quicklaunch_mode_get, [  ], :bool ],
+        # EAPI int elm_quicklaunch_init(int argc, char **argv);
+        [ :elm_quicklaunch_init, [ :int, :pointer ], :int ],
+        # EAPI int elm_quicklaunch_sub_init(int argc, char **argv);
+        [ :elm_quicklaunch_sub_init, [ :int, :pointer ], :int ],
+        # EAPI int elm_quicklaunch_sub_shutdown(void);
+        [ :elm_quicklaunch_sub_shutdown, [  ], :int ],
+        # EAPI int elm_quicklaunch_shutdown(void);
+        [ :elm_quicklaunch_shutdown, [  ], :int ],
+        # EAPI void elm_quicklaunch_seed(void);
+        [ :elm_quicklaunch_seed, [  ], :void ],
+        # EAPI Eina_Bool elm_quicklaunch_prepare(int argc, char **argv);
+        [ :elm_quicklaunch_prepare, [ :int, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
+        # FIXME
+        # EAPI void elm_quicklaunch_cleanup(void);
+        [ :elm_quicklaunch_cleanup, [  ], :void ],
+        # EAPI int elm_quicklaunch_fallback(int argc, char **argv);
+        [ :elm_quicklaunch_fallback, [ :int, :pointer ], :int ],
+        # EAPI char *elm_quicklaunch_exe_path_get(const char *exe);
+        [ :elm_quicklaunch_exe_path_get, [ :string ], :string ],
+        # EAPI Eina_Bool elm_policy_set(unsigned int policy, int value);
+        [ :elm_policy_set, [ :uint, :int ], :bool ],
+        # EAPI int elm_policy_get(unsigned int policy);
+        [ :elm_policy_get, [ :uint ], :int ],
+        # EAPI void elm_language_set(const char *lang);
+        [ :elm_language_set, [ :string ], :void ],
+        # EAPI void elm_object_domain_translatable_text_part_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
+        [ :elm_object_domain_translatable_text_part_set, [ :evas_object, :string, :string, :string ], :void ],
+        # EAPI const char *elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part);
+        [ :elm_object_translatable_text_part_get, [ :evas_object, :string ], :string ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_grid.rb b/lib/efl/native/elm/elm_grid.rb
new file mode 100644
index 0000000..0b02565
--- /dev/null
+++ b/lib/efl/native/elm/elm_grid.rb
@@ -0,0 +1,51 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmGrid
+        #
+        FCT_PREFIX = 'elm_grid_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_grid_add(Evas_Object *parent);
+        [ :elm_grid_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+        [ :elm_grid_size_set, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_grid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :elm_grid_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_grid_unpack(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_grid_unpack, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_grid_clear(Evas_Object *obj, Eina_Bool clear);
+        [ :elm_grid_clear, [ :evas_object, :bool ], :void ],
+        # EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :elm_grid_pack_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_grid_pack_get(Evas_Object *subobj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_grid_pack_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI Eina_List *elm_grid_children_get(const Evas_Object *obj);
+        [ :elm_grid_children_get, [ :evas_object ], :eina_list ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_icon.rb b/lib/efl/native/elm/elm_icon.rb
new file mode 100644
index 0000000..dabfeb4
--- /dev/null
+++ b/lib/efl/native/elm/elm_icon.rb
@@ -0,0 +1,97 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmIcon
+        #
+        FCT_PREFIX = 'elm_icon_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Icon_Type;
+        enum :elm_icon_type, [ :elm_icon_none, :elm_icon_file, :elm_icon_standard ]
+        # typedef enum {...} Elm_Icon_Lookup_Order;
+        enum :elm_icon_lookup_order, [ :elm_icon_lookup_fdo_theme, :elm_icon_lookup_theme_fdo, :elm_icon_lookup_fdo, :elm_icon_lookup_theme ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_icon_add(Evas_Object *parent);
+        [ :elm_icon_add, [ :evas_object ], :evas_object ],
+        # EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, const char *file, const char *group);
+        [ :elm_icon_file_set, [ :evas_object, :string, :string ], :bool ],
+        # EAPI Eina_Bool elm_icon_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key);
+        [ :elm_icon_memfile_set, [ :evas_object, :pointer, :ulong, :string, :string ], :bool ],
+        # EAPI void elm_icon_file_get(const Evas_Object *obj, const char **file, const char **group);
+        [ :elm_icon_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_icon_thumb_set(Evas_Object *obj, const char *file, const char *group);
+        [ :elm_icon_thumb_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI Eina_Bool elm_icon_standard_set(Evas_Object *obj, const char *name);
+        [ :elm_icon_standard_set, [ :evas_object, :string ], :bool ],
+        # EAPI const char *elm_icon_standard_get(const Evas_Object *obj);
+        [ :elm_icon_standard_get, [ :evas_object ], :string ],
+        # EAPI void elm_icon_smooth_set(Evas_Object *obj, Eina_Bool smooth);
+        [ :elm_icon_smooth_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_smooth_get(const Evas_Object *obj);
+        [ :elm_icon_smooth_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
+        [ :elm_icon_no_scale_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_no_scale_get(const Evas_Object *obj);
+        [ :elm_icon_no_scale_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
+        [ :elm_icon_scale_set, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_icon_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
+        [ :elm_icon_scale_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_icon_size_get(const Evas_Object *obj, int *w, int *h);
+        [ :elm_icon_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
+        [ :elm_icon_fill_outside_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_fill_outside_get(const Evas_Object *obj);
+        [ :elm_icon_fill_outside_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_prescale_set(Evas_Object *obj, int size);
+        [ :elm_icon_prescale_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_icon_prescale_get(const Evas_Object *obj);
+        [ :elm_icon_prescale_get, [ :evas_object ], :int ],
+        # EAPI Evas_Object *elm_icon_object_get(Evas_Object *obj);
+        [ :elm_icon_object_get, [ :evas_object ], :evas_object ],
+        # EAPI void elm_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
+        [ :elm_icon_order_lookup_set, [ :evas_object, :elm_icon_lookup_order ], :void ],
+        # EAPI Elm_Icon_Lookup_Order elm_icon_order_lookup_get(const Evas_Object *obj);
+        [ :elm_icon_order_lookup_get, [ :evas_object ], :elm_icon_lookup_order ],
+        # EAPI void elm_icon_preload_set(Evas_Object *obj, Eina_Bool disable);
+        [ :elm_icon_preload_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_animated_available_get(const Evas_Object *obj);
+        [ :elm_icon_animated_available_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_animated_set(Evas_Object *obj, Eina_Bool animated);
+        [ :elm_icon_animated_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_animated_get(const Evas_Object *obj);
+        [ :elm_icon_animated_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_animated_play_set(Evas_Object *obj, Eina_Bool play);
+        [ :elm_icon_animated_play_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_animated_play_get(const Evas_Object *obj);
+        [ :elm_icon_animated_play_get, [ :evas_object ], :bool ],
+        # EAPI void elm_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
+        [ :elm_icon_aspect_fixed_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_icon_aspect_fixed_get(const Evas_Object *obj);
+        [ :elm_icon_aspect_fixed_get, [ :evas_object ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_image.rb b/lib/efl/native/elm/elm_image.rb
new file mode 100644
index 0000000..356c5dd
--- /dev/null
+++ b/lib/efl/native/elm/elm_image.rb
@@ -0,0 +1,80 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmImage
+        #
+        FCT_PREFIX = 'elm_image_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Image_Orient;
+        enum :elm_image_orient, [ :elm_image_orient_none, 0, :elm_image_orient_0, 0, :elm_image_rotate_90, 1, :elm_image_rotate_180, 2,
+            :elm_image_rotate_270, 3, :elm_image_flip_horizontal, 4, :elm_image_flip_vertical, 5, :elm_image_flip_transpose, 6, :elm_image_flip_transverse, 7 ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_image_add(Evas_Object *parent);
+        [ :elm_image_add, [ :evas_object ], :evas_object ],
+        # EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group);
+        [ :elm_image_file_set, [ :evas_object, :string, :string ], :bool ],
+        # EAPI void elm_image_file_get(const Evas_Object *obj, const char **file, const char **group);
+        [ :elm_image_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth);
+        [ :elm_image_smooth_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_image_smooth_get(const Evas_Object *obj);
+        [ :elm_image_smooth_get, [ :evas_object ], :bool ],
+        # EAPI void elm_image_object_size_get(const Evas_Object *obj, int *w, int *h);
+        [ :elm_image_object_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
+        [ :elm_image_no_scale_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_image_no_scale_get(const Evas_Object *obj);
+        [ :elm_image_no_scale_get, [ :evas_object ], :bool ],
+        # EAPI void elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
+        [ :elm_image_scale_set, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_image_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
+        [ :elm_image_scale_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
+        [ :elm_image_fill_outside_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
+        [ :elm_image_fill_outside_get, [ :evas_object ], :bool ],
+        # EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
+        [ :elm_image_prescale_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_image_prescale_get(const Evas_Object *obj);
+        [ :elm_image_prescale_get, [ :evas_object ], :int ],
+        # EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient);
+        [ :elm_image_orient_set, [ :evas_object, :elm_image_orient ], :void ],
+        # EAPI Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj);
+        [ :elm_image_orient_get, [ :evas_object ], :elm_image_orient ],
+        # EAPI void elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
+        [ :elm_image_editable_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_image_editable_get(const Evas_Object *obj);
+        [ :elm_image_editable_get, [ :evas_object ], :bool ],
+        # EAPI Evas_Object *elm_image_object_get(const Evas_Object *obj);
+        [ :elm_image_object_get, [ :evas_object ], :evas_object ],
+        # EAPI void elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
+        [ :elm_image_aspect_fixed_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj);
+        [ :elm_image_aspect_fixed_get, [ :evas_object ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_label.rb b/lib/efl/native/elm/elm_label.rb
new file mode 100644
index 0000000..f17f5e9
--- /dev/null
+++ b/lib/efl/native/elm/elm_label.rb
@@ -0,0 +1,60 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+require 'efl/native/elm/elm_entry'
+#
+module Efl
+    #
+    module ElmLabel
+        #
+        FCT_PREFIX = 'elm_label_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_label_add(Evas_Object *parent);
+        [ :elm_label_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_label_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
+        [ :elm_label_line_wrap_set, [ :evas_object, :elm_wrap_type ], :void ],
+        # EAPI Elm_Wrap_Type elm_label_line_wrap_get(const Evas_Object *obj);
+        [ :elm_label_line_wrap_get, [ :evas_object ], :elm_wrap_type ],
+        # EAPI void elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w);
+        [ :elm_label_wrap_width_set, [ :evas_object, :int ], :void ],
+        # EAPI Evas_Coord elm_label_wrap_width_get(const Evas_Object *obj);
+        [ :elm_label_wrap_width_get, [ :evas_object ], :int ],
+        # EAPI void elm_label_wrap_height_set(Evas_Object *obj, Evas_Coord h);
+        [ :elm_label_wrap_height_set, [ :evas_object, :int ], :void ],
+        # EAPI Evas_Coord elm_label_wrap_height_get(const Evas_Object *obj);
+        [ :elm_label_wrap_height_get, [ :evas_object ], :int ],
+        # EAPI void elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis);
+        [ :elm_label_ellipsis_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_label_ellipsis_get(const Evas_Object *obj);
+        [ :elm_label_ellipsis_get, [ :evas_object ], :bool ],
+        # EAPI void elm_label_slide_set(Evas_Object *obj, Eina_Bool slide);
+        [ :elm_label_slide_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_label_slide_get(const Evas_Object *obj);
+        [ :elm_label_slide_get, [ :evas_object ], :bool ],
+        # EAPI void elm_label_slide_duration_set(Evas_Object *obj, double duration);
+        [ :elm_label_slide_duration_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_label_slide_duration_get(const Evas_Object *obj);
+        [ :elm_label_slide_duration_get, [ :evas_object ], :double ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_layout.rb b/lib/efl/native/elm/elm_layout.rb
new file mode 100644
index 0000000..c9d76b9
--- /dev/null
+++ b/lib/efl/native/elm/elm_layout.rb
@@ -0,0 +1,77 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmLayout
+        #
+        FCT_PREFIX = 'elm_layout_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
+        [ :elm_layout_add, [ :evas_object ], :evas_object ],
+        # EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
+        [ :elm_layout_file_set, [ :evas_object, :string, :string ], :bool ],
+        # EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
+        [ :elm_layout_theme_set, [ :evas_object, :string, :string, :string ], :bool ],
+        # EAPI void elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child);
+        [ :elm_layout_box_append, [ :evas_object, :string, :evas_object ], :void ],
+        # EAPI void elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child);
+        [ :elm_layout_box_prepend, [ :evas_object, :string, :evas_object ], :void ],
+        # EAPI void elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
+        [ :elm_layout_box_insert_before, [ :evas_object, :string, :evas_object, :evas_object ], :void ],
+        # EAPI void elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
+        [ :elm_layout_box_insert_at, [ :evas_object, :string, :evas_object, :uint ], :void ],
+        # EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const char *part, Evas_Object *child);
+        [ :elm_layout_box_remove, [ :evas_object, :string, :evas_object ], :evas_object ],
+        # EAPI void elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear);
+        [ :elm_layout_box_remove_all, [ :evas_object, :string, :bool ], :void ],
+        # EAPI void elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
+        [ :elm_layout_table_pack, [ :evas_object, :string, :evas_object, :ushort, :ushort, :ushort, :ushort ], :void ],
+        # EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj);
+        [ :elm_layout_table_unpack, [ :evas_object, :string, :evas_object ], :evas_object ],
+        # EAPI void elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear);
+        [ :elm_layout_table_clear, [ :evas_object, :string, :bool ], :void ],
+        # EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
+        [ :elm_layout_edje_get, [ :evas_object ], :evas_object ],
+        # EAPI const char *elm_layout_data_get(const Evas_Object *obj, const char *key);
+        [ :elm_layout_data_get, [ :evas_object, :string ], :string ],
+        # EAPI void elm_layout_sizing_eval(Evas_Object *obj);
+        [ :elm_layout_sizing_eval, [ :evas_object ], :void ],
+        # EAPI Eina_Bool elm_layout_part_cursor_set(Evas_Object *obj, const char *part_name, const char *cursor);
+        [ :elm_layout_part_cursor_set, [ :evas_object, :string, :string ], :bool ],
+        # EAPI const char *elm_layout_part_cursor_get(const Evas_Object *obj, const char *part_name);
+        [ :elm_layout_part_cursor_get, [ :evas_object, :string ], :string ],
+        # EAPI void elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
+        [ :elm_layout_part_cursor_unset, [ :evas_object, :string ], :void ],
+        # EAPI Eina_Bool elm_layout_part_cursor_style_set(Evas_Object *obj, const char *part_name, const char *style);
+        [ :elm_layout_part_cursor_style_set, [ :evas_object, :string, :string ], :bool ],
+        # EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const char *part_name);
+        [ :elm_layout_part_cursor_style_get, [ :evas_object, :string ], :string ],
+        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_set(Evas_Object *obj, const char *part_name, Eina_Bool engine_only);
+        [ :elm_layout_part_cursor_engine_only_set, [ :evas_object, :string, :bool ], :bool ],
+        # EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const Evas_Object *obj, const char *part_name);
+        [ :elm_layout_part_cursor_engine_only_get, [ :evas_object, :string ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_list.rb b/lib/efl/native/elm/elm_list.rb
new file mode 100644
index 0000000..8fcbecd
--- /dev/null
+++ b/lib/efl/native/elm/elm_list.rb
@@ -0,0 +1,105 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+require 'efl/native/elm/elm_scroller'
+#
+module Efl
+    #
+    module ElmList
+        #
+        FCT_PREFIX = 'elm_list_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_List_Mode;
+        enum :elm_list_mode, [ :elm_list_compress, 0, :elm_list_scroll, 1, :elm_list_limit, 2, :elm_list_expand, 3, :elm_list_last, 4 ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_list_add(Evas_Object *parent);
+        [ :elm_list_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_list_go(Evas_Object *obj);
+        [ :elm_list_go, [ :evas_object ], :void ],
+        # EAPI void elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi);
+        [ :elm_list_multi_select_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_multi_select_get(const Evas_Object *obj);
+        [ :elm_list_multi_select_get, [ :evas_object ], :bool ],
+        # EAPI void elm_list_mode_set(Evas_Object *obj, Elm_List_Mode mode);
+        [ :elm_list_mode_set, [ :evas_object, :elm_list_mode ], :void ],
+        # EAPI Elm_List_Mode elm_list_mode_get(const Evas_Object *obj);
+        [ :elm_list_mode_get, [ :evas_object ], :elm_list_mode ],
+        # EAPI void elm_list_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
+        [ :elm_list_horizontal_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_horizontal_get(const Evas_Object *obj);
+        [ :elm_list_horizontal_get, [ :evas_object ], :bool ],
+        # EAPI void elm_list_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
+        [ :elm_list_always_select_mode_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_always_select_mode_get(const Evas_Object *obj);
+        [ :elm_list_always_select_mode_get, [ :evas_object ], :bool ],
+        # EAPI void elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
+        [ :elm_list_bounce_set, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_list_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
+        [ :elm_list_bounce_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
+        [ :elm_list_scroller_policy_set, [ :evas_object, :elm_scroller_policy, :elm_scroller_policy ], :void ],
+        # EAPI void elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
+        [ :elm_list_scroller_policy_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI Elm_Object_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+        [ :elm_list_item_append, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+        [ :elm_list_item_prepend, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+        [ :elm_list_item_insert_before, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ],
+            :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+        [ :elm_list_item_insert_after, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ],
+            :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_sorted_insert(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data, Eina_Compare_Cb cmp_func);
+        [ :elm_list_item_sorted_insert, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer, :eina_compare_cb ],
+            :elm_object_item ],
+        # EAPI void elm_list_clear(Evas_Object *obj);
+        [ :elm_list_clear, [ :evas_object ], :void ],
+        # EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj);
+        [ :elm_list_items_get, [ :evas_object ], :eina_list ],
+        # EAPI Elm_Object_Item *elm_list_selected_item_get(const Evas_Object *obj);
+        [ :elm_list_selected_item_get, [ :evas_object ], :elm_object_item ],
+        # EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj);
+        [ :elm_list_selected_items_get, [ :evas_object ], :eina_list ],
+        # EAPI void elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
+        [ :elm_list_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it);
+        [ :elm_list_item_selected_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting);
+        [ :elm_list_item_separator_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it);
+        [ :elm_list_item_separator_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_list_item_show(Elm_Object_Item *it);
+        [ :elm_list_item_show, [ :elm_object_item ], :void ],
+        # EAPI void elm_list_item_bring_in(Elm_Object_Item *it);
+        [ :elm_list_item_bring_in, [ :elm_object_item ], :void ],
+        # EAPI Evas_Object *elm_list_item_object_get(const Elm_Object_Item *it);
+        [ :elm_list_item_object_get, [ :elm_object_item ], :evas_object ],
+        # EAPI Elm_Object_Item *elm_list_item_prev(const Elm_Object_Item *it);
+        [ :elm_list_item_prev, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_next(const Elm_Object_Item *it);
+        [ :elm_list_item_next, [ :elm_object_item ], :elm_object_item ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_menu.rb b/lib/efl/native/elm/elm_menu.rb
new file mode 100644
index 0000000..bb981a6
--- /dev/null
+++ b/lib/efl/native/elm/elm_menu.rb
@@ -0,0 +1,77 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmMenu
+        #
+        FCT_PREFIX = 'elm_menu_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
+        [ :elm_menu_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
+        [ :elm_menu_parent_set, [ :evas_object, :evas_object ], :void ],
+        # EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj);
+        [ :elm_menu_parent_get, [ :evas_object ], :evas_object ],
+        # EAPI void elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+        [ :elm_menu_move, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_menu_close(Evas_Object *obj);
+        [ :elm_menu_close, [ :evas_object ], :void ],
+        # EAPI const Eina_List *elm_menu_items_get(const Evas_Object *obj);
+        [ :elm_menu_items_get, [ :evas_object ], :eina_list ],
+        # EAPI Evas_Object *elm_menu_item_object_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_object_get, [ :elm_object_item ], :evas_object ],
+        # EAPI Elm_Object_Item *elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_menu_item_add, [ :evas_object, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data);
+        [ :elm_menu_item_add_object, [ :evas_object, :elm_object_item, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI void elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon);
+        [ :elm_menu_item_object_icon_name_set, [ :elm_object_item, :string ], :void ],
+        # EAPI const char *elm_menu_item_object_icon_name_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_object_icon_name_get, [ :elm_object_item ], :string ],
+        # EAPI void elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
+        [ :elm_menu_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_selected_get, [ :elm_object_item ], :bool ],
+        # EAPI Elm_Object_Item *elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent);
+        [ :elm_menu_item_separator_add, [ :evas_object, :elm_object_item ], :elm_object_item ],
+        # EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it);
+        [ :elm_menu_item_is_separator, [ :elm_object_item ], :bool ],
+        # EAPI const Eina_List *elm_menu_item_subitems_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_subitems_get, [ :elm_object_item ], :eina_list ],
+        # EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_index_get, [ :elm_object_item ], :uint ],
+        # EAPI Elm_Object_Item *elm_menu_selected_item_get(const Evas_Object *obj);
+        [ :elm_menu_selected_item_get, [ :evas_object ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_last_item_get(const Evas_Object *obj);
+        [ :elm_menu_last_item_get, [ :evas_object ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_first_item_get(const Evas_Object *obj);
+        [ :elm_menu_first_item_get, [ :evas_object ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_item_next_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_next_get, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_item_prev_get(const Elm_Object_Item *it);
+        [ :elm_menu_item_prev_get, [ :elm_object_item ], :elm_object_item ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_notify.rb b/lib/efl/native/elm/elm_notify.rb
new file mode 100644
index 0000000..656bb28
--- /dev/null
+++ b/lib/efl/native/elm/elm_notify.rb
@@ -0,0 +1,57 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmNotify
+        #
+        FCT_PREFIX = 'elm_notify_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Notify_Orient;
+        enum :elm_notify_orient, [ :elm_notify_orient_top, :elm_notify_orient_center, :elm_notify_orient_bottom, :elm_notify_orient_left,
+            :elm_notify_orient_right, :elm_notify_orient_top_left, :elm_notify_orient_top_right, :elm_notify_orient_bottom_left, :elm_notify_orient_bottom_right,
+            :elm_notify_orient_last ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_notify_add(Evas_Object *parent);
+        [ :elm_notify_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent);
+        [ :elm_notify_parent_set, [ :evas_object, :evas_object ], :void ],
+        # EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj);
+        [ :elm_notify_parent_get, [ :evas_object ], :evas_object ],
+        # EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient);
+        [ :elm_notify_orient_set, [ :evas_object, :elm_notify_orient ], :void ],
+        # EAPI Elm_Notify_Orient elm_notify_orient_get(const Evas_Object *obj);
+        [ :elm_notify_orient_get, [ :evas_object ], :elm_notify_orient ],
+        # EAPI void elm_notify_timeout_set(Evas_Object *obj, double timeout);
+        [ :elm_notify_timeout_set, [ :evas_object, :double ], :void ],
+        # EAPI double elm_notify_timeout_get(const Evas_Object *obj);
+        [ :elm_notify_timeout_get, [ :evas_object ], :double ],
+        # EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat);
+        [ :elm_notify_repeat_events_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_notify_repeat_events_get(const Evas_Object *obj);
+        [ :elm_notify_repeat_events_get, [ :evas_object ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_object.rb b/lib/efl/native/elm/elm_object.rb
new file mode 100644
index 0000000..ffeae49
--- /dev/null
+++ b/lib/efl/native/elm/elm_object.rb
@@ -0,0 +1,74 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/edje'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmObject
+        #
+        FCT_PREFIX = 'elm_object_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label);
+        [ :elm_object_part_text_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI const char *elm_object_part_text_get(const Evas_Object *obj, const char *part);
+        [ :elm_object_part_text_get, [ :evas_object, :string ], :string ],
+        # EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content);
+        [ :elm_object_part_content_set, [ :evas_object, :string, :evas_object ], :void ],
+        # EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part);
+        [ :elm_object_part_content_get, [ :evas_object, :string ], :evas_object ],
+        # EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part);
+        [ :elm_object_part_content_unset, [ :evas_object, :string ], :evas_object ],
+        # EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt);
+        [ :elm_object_access_info_set, [ :evas_object, :string ], :void ],
+        # EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, const char *name, int recurse);
+        [ :elm_object_name_find, [ :evas_object, :string, :int ], :evas_object ],
+        # EAPI void elm_object_style_set(Evas_Object *obj, const char *style);
+        [ :elm_object_style_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_object_style_get(const Evas_Object *obj);
+        [ :elm_object_style_get, [ :evas_object ], :string ],
+        # EAPI void elm_object_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_object_disabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj);
+        [ :elm_object_disabled_get, [ :evas_object ], :bool ],
+        # EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj);
+        [ :elm_object_widget_check, [ :evas_object ], :bool ],
+        # EAPI Evas_Object *elm_object_parent_widget_get(const Evas_Object *obj);
+        [ :elm_object_parent_widget_get, [ :evas_object ], :evas_object ],
+        # EAPI Evas_Object *elm_object_top_widget_get(const Evas_Object *obj);
+        [ :elm_object_top_widget_get, [ :evas_object ], :evas_object ],
+        # EAPI const char *elm_object_widget_type_get(const Evas_Object *obj);
+        [ :elm_object_widget_type_get, [ :evas_object ], :string ],
+        # EAPI void elm_object_signal_emit(Evas_Object *obj, const char *emission, const char *source);
+        [ :elm_object_signal_emit, [ :evas_object, :string, :string ], :void ],
+        # EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
+        [ :elm_object_signal_callback_add, [ :evas_object, :string, :string, :edje_signal_cb, :pointer ], :void ],
+        # EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
+        [ :elm_object_signal_callback_del, [ :evas_object, :string, :string, :edje_signal_cb ], :pointer ],
+        # EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
+        [ :elm_object_event_callback_add, [ :evas_object, :elm_event_cb, :pointer ], :void ],
+        # EAPI void *elm_object_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data);
+        [ :elm_object_event_callback_del, [ :evas_object, :elm_event_cb, :pointer ], :pointer ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_object_item.rb b/lib/efl/native/elm/elm_object_item.rb
new file mode 100644
index 0000000..703aba0
--- /dev/null
+++ b/lib/efl/native/elm/elm_object_item.rb
@@ -0,0 +1,93 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmObjectItem
+        #
+        FCT_PREFIX = 'elm_object_item_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # CALLBACKS
+        # typedef void (*Elm_Object_Item_Smart_Cb) (void *data, Elm_Object_Item *it, void *event_info);
+        callback :elm_object_item_smart_cb, [ :pointer, :elm_object_item, :pointer ], :void
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it);
+        [ :elm_object_item_widget_get, [ :elm_object_item ], :evas_object ],
+        # EAPI void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
+        [ :elm_object_item_part_content_set, [ :elm_object_item, :string, :evas_object ], :void ],
+        # EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part);
+        [ :elm_object_item_part_content_get, [ :elm_object_item, :string ], :evas_object ],
+        # EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part);
+        [ :elm_object_item_part_content_unset, [ :elm_object_item, :string ], :evas_object ],
+        # EAPI void elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label);
+        [ :elm_object_item_part_text_set, [ :elm_object_item, :string, :string ], :void ],
+        # EAPI const char *elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part);
+        [ :elm_object_item_part_text_get, [ :elm_object_item, :string ], :string ],
+        # EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt);
+        [ :elm_object_item_access_info_set, [ :elm_object_item, :string ], :void ],
+        # EAPI void *elm_object_item_data_get(const Elm_Object_Item *it);
+        [ :elm_object_item_data_get, [ :elm_object_item ], :pointer ],
+        # EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data);
+        [ :elm_object_item_data_set, [ :elm_object_item, :pointer ], :void ],
+        # EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source);
+        [ :elm_object_item_signal_emit, [ :elm_object_item, :string, :string ], :void ],
+        # EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
+        [ :elm_object_item_disabled_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it);
+        [ :elm_object_item_disabled_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb);
+        [ :elm_object_item_del_cb_set, [ :elm_object_item, :evas_smart_cb ], :void ],
+        # EAPI void elm_object_item_del(Elm_Object_Item *it);
+        [ :elm_object_item_del, [ :elm_object_item ], :void ],
+        # EAPI void elm_object_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
+        [ :elm_object_item_tooltip_text_set, [ :elm_object_item, :string ], :void ],
+        # EAPI Eina_Bool elm_object_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable);
+        [ :elm_object_item_tooltip_window_mode_set, [ :elm_object_item, :bool ], :bool ],
+        # EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *it);
+        [ :elm_object_item_tooltip_window_mode_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_object_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
+        [ :elm_object_item_tooltip_content_cb_set, [ :elm_object_item, :elm_tooltip_item_content_cb, :pointer, :evas_smart_cb ], :void ],
+        # EAPI void elm_object_item_tooltip_unset(Elm_Object_Item *it);
+        [ :elm_object_item_tooltip_unset, [ :elm_object_item ], :void ],
+        # EAPI void elm_object_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
+        [ :elm_object_item_tooltip_style_set, [ :elm_object_item, :string ], :void ],
+        # EAPI const char *elm_object_item_tooltip_style_get(const Elm_Object_Item *it);
+        [ :elm_object_item_tooltip_style_get, [ :elm_object_item ], :string ],
+        # EAPI void elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor);
+        [ :elm_object_item_cursor_set, [ :elm_object_item, :string ], :void ],
+        # EAPI const char *elm_object_item_cursor_get(const Elm_Object_Item *it);
+        [ :elm_object_item_cursor_get, [ :elm_object_item ], :string ],
+        # EAPI void elm_object_item_cursor_unset(Elm_Object_Item *it);
+        [ :elm_object_item_cursor_unset, [ :elm_object_item ], :void ],
+        # EAPI void elm_object_item_cursor_style_set(Elm_Object_Item *it, const char *style);
+        [ :elm_object_item_cursor_style_set, [ :elm_object_item, :string ], :void ],
+        # EAPI const char *elm_object_item_cursor_style_get(const Elm_Object_Item *it);
+        [ :elm_object_item_cursor_style_get, [ :elm_object_item ], :string ],
+        # EAPI void elm_object_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only);
+        [ :elm_object_item_cursor_engine_only_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it);
+        [ :elm_object_item_cursor_engine_only_get, [ :elm_object_item ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_panel.rb b/lib/efl/native/elm/elm_panel.rb
new file mode 100644
index 0000000..4fe40a4
--- /dev/null
+++ b/lib/efl/native/elm/elm_panel.rb
@@ -0,0 +1,55 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmPanel
+        #
+        FCT_PREFIX = 'elm_panel_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Panel_Orient;
+        enum :elm_panel_orient, [ :elm_panel_orient_top, :elm_panel_orient_bottom, :elm_panel_orient_left, :elm_panel_orient_right ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_panel_add(Evas_Object *parent);
+        [ :elm_panel_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
+        [ :elm_panel_orient_set, [ :evas_object, :elm_panel_orient ], :void ],
+        # EAPI Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj);
+        [ :elm_panel_orient_get, [ :evas_object ], :elm_panel_orient ],
+        # EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
+        [ :elm_panel_hidden_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_panel_hidden_get(const Evas_Object *obj);
+        [ :elm_panel_hidden_get, [ :evas_object ], :bool ],
+        # EAPI void elm_panel_toggle(Evas_Object *obj);
+        [ :elm_panel_toggle, [ :evas_object ], :void ],
+        # EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content);
+        [ :elm_panel_content_set, [ :evas_object, :evas_object ], :void ],
+        # EAPI Evas_Object * elm_panel_content_get(const Evas_Object *obj);
+        [ :elm_panel_content_get, [ :evas_object ], :evas_object ],
+        # EAPI Evas_Object * elm_panel_content_unset(Evas_Object *obj);
+        [ :elm_panel_content_unset, [ :evas_object ], :evas_object ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_scroller.rb b/lib/efl/native/elm/elm_scroller.rb
new file mode 100644
index 0000000..a935c7f
--- /dev/null
+++ b/lib/efl/native/elm/elm_scroller.rb
@@ -0,0 +1,80 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmScroller
+        #
+        FCT_PREFIX = 'elm_scroller_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Scroller_Policy;
+        enum :elm_scroller_policy, [ :elm_scroller_policy_auto, 0, :elm_scroller_policy_on, 1, :elm_scroller_policy_off, 2, :elm_scroller_policy_last,
+            3 ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
+        [ :elm_scroller_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_scroller_custom_widget_base_theme_set(Evas_Object *obj, const char *widget, const char *base);
+        [ :elm_scroller_custom_widget_base_theme_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
+        [ :elm_scroller_content_min_limit, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :elm_scroller_region_show, [ :evas_object, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
+        [ :elm_scroller_policy_set, [ :evas_object, :elm_scroller_policy, :elm_scroller_policy ], :void ],
+        # EAPI void elm_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
+        [ :elm_scroller_policy_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_scroller_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_child_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_scroller_child_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
+        [ :elm_scroller_bounce_set, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_scroller_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
+        [ :elm_scroller_bounce_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
+        [ :elm_scroller_page_relative_set, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
+        [ :elm_scroller_page_size_set, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
+        [ :elm_scroller_current_page_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
+        [ :elm_scroller_last_page_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_page_show(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
+        [ :elm_scroller_page_show, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_scroller_page_bring_in(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
+        [ :elm_scroller_page_bring_in, [ :evas_object, :int, :int ], :void ],
+        # EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :elm_scroller_region_bring_in, [ :evas_object, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation);
+        [ :elm_scroller_propagate_events_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj);
+        [ :elm_scroller_propagate_events_get, [ :evas_object ], :bool ],
+        # EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y);
+        [ :elm_scroller_gravity_set, [ :evas_object, :double, :double ], :void ],
+        # EAPI void elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y);
+        [ :elm_scroller_gravity_get, [ :evas_object, :pointer, :pointer ], :void ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_tooltip.rb b/lib/efl/native/elm/elm_tooltip.rb
new file mode 100644
index 0000000..f8fa2ce
--- /dev/null
+++ b/lib/efl/native/elm/elm_tooltip.rb
@@ -0,0 +1,59 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmTooltip
+        #
+        FCT_PREFIX = 'elm_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # CALLBACKS
+        # typedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip);
+        callback :elm_tooltip_content_cb, [ :pointer, :evas_object, :evas_object ], :evas_object
+        # typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item);
+        callback :elm_tooltip_item_content_cb, [ :pointer, :evas_object, :evas_object, :pointer ], :evas_object
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI void elm_object_tooltip_show(Evas_Object *obj);
+        [ :elm_object_tooltip_show, [ :evas_object ], :void ],
+        # EAPI void elm_object_tooltip_hide(Evas_Object *obj);
+        [ :elm_object_tooltip_hide, [ :evas_object ], :void ],
+        # EAPI void elm_object_tooltip_text_set(Evas_Object *obj, const char *text);
+        [ :elm_object_tooltip_text_set, [ :evas_object, :string ], :void ],
+        # EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *obj, const char *domain, const char *text);
+        [ :elm_object_tooltip_domain_translatable_text_set, [ :evas_object, :string, :string ], :void ],
+        # EAPI void elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
+        [ :elm_object_tooltip_content_cb_set, [ :evas_object, :elm_tooltip_content_cb, :pointer, :evas_smart_cb ], :void ],
+        # EAPI void elm_object_tooltip_unset(Evas_Object *obj);
+        [ :elm_object_tooltip_unset, [ :evas_object ], :void ],
+        # EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *style);
+        [ :elm_object_tooltip_style_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
+        [ :elm_object_tooltip_style_get, [ :evas_object ], :string ],
+        # EAPI Eina_Bool elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable);
+        [ :elm_object_tooltip_window_mode_set, [ :evas_object, :bool ], :bool ],
+        # EAPI Eina_Bool elm_object_tooltip_window_mode_get(const Evas_Object *obj);
+        [ :elm_object_tooltip_window_mode_get, [ :evas_object ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/elm/elm_win.rb b/lib/efl/native/elm/elm_win.rb
new file mode 100644
index 0000000..46ed54d
--- /dev/null
+++ b/lib/efl/native/elm/elm_win.rb
@@ -0,0 +1,189 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+require 'efl/native/elementary'
+#
+module Efl
+    #
+    module ElmWin
+        #
+        FCT_PREFIX = 'elm_win_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'elementary-ver-pre-svn-09.so.0'
+        #
+        # ENUMS
+        # typedef enum {...} Elm_Win_Type;
+        enum :elm_win_type, [ :elm_win_basic, :elm_win_dialog_basic, :elm_win_desktop, :elm_win_dock, :melm_win_toolbar, :elm_win_menu,
+            :elm_win_utility, :elm_win_splash, :elm_win_dropdown_menu, :elm_win_popup_menu, :elm_win_tooltip, :telm_win_notification, :elm_win_combo,
+            :elm_win_dnd, :elm_win_inlined_image, :teeelm_win_socket_image, :n ]
+        # typedef enum {...} Elm_Win_Keyboard_Mode;
+        enum :elm_win_keyboard_mode, [ :elm_win_keyboard_unknown, :elm_win_keyboard_off, :elm_win_keyboard_on, :elm_win_keyboard_alpha,
+            :elm_win_keyboard_numeric, :elm_win_keyboard_pin, :elm_win_keyboard_phone_number, :elm_win_keyboard_hex, :elm_win_keyboard_terminal,
+            :elm_win_keyboard_password, :elm_win_keyboard_ip, :elm_win_keyboard_host, :elm_win_keyboard_file, :elm_win_keyboard_url, :elm_win_keyboard_keypad,
+            :elm_win_keyboard_j2me ]
+        # typedef enum {...} Elm_Win_Indicator_Mode;
+        enum :elm_win_indicator_mode, [ :elm_win_indicator_unknown, :elm_win_indicator_hide, :elm_win_indicator_show ]
+        # typedef enum {...} Elm_Illume_Command;
+        enum :elm_illume_command, [ :elm_illume_command_focus_back, :elm_illume_command_focus_forward, :elm_illume_command_focus_home,
+            :elm_illume_command_close ]
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
+        [ :elm_win_add, [ :evas_object, :string, :elm_win_type ], :evas_object ],
+        # EAPI Evas_Object *elm_win_util_standard_add(const char *name, const char *title);
+        [ :elm_win_util_standard_add, [ :string, :string ], :evas_object ],
+        # EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_win_resize_object_add, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
+        [ :elm_win_resize_object_del, [ :evas_object, :evas_object ], :void ],
+        # EAPI void elm_win_title_set(Evas_Object *obj, const char *title);
+        [ :elm_win_title_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_win_title_get(const Evas_Object *obj);
+        [ :elm_win_title_get, [ :evas_object ], :string ],
+        # EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
+        [ :elm_win_autodel_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
+        [ :elm_win_autodel_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_activate(Evas_Object *obj);
+        [ :elm_win_activate, [ :evas_object ], :void ],
+        # EAPI void elm_win_lower(Evas_Object *obj);
+        [ :elm_win_lower, [ :evas_object ], :void ],
+        # EAPI void elm_win_raise(Evas_Object *obj);
+        [ :elm_win_raise, [ :evas_object ], :void ],
+        # EAPI void elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v);
+        [ :elm_win_center, [ :evas_object, :bool, :bool ], :void ],
+        # EAPI void elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
+        [ :elm_win_borderless_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_borderless_get(const Evas_Object *obj);
+        [ :elm_win_borderless_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped);
+        [ :elm_win_shaped_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_shaped_get(const Evas_Object *obj);
+        [ :elm_win_shaped_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha);
+        [ :elm_win_alpha_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_alpha_get(const Evas_Object *obj);
+        [ :elm_win_alpha_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent);
+        [ :elm_win_transparent_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_transparent_get(const Evas_Object *obj);
+        [ :elm_win_transparent_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_override_set(Evas_Object *obj, Eina_Bool override);
+        [ :elm_win_override_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_override_get(const Evas_Object *obj);
+        [ :elm_win_override_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
+        [ :elm_win_fullscreen_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_fullscreen_get(const Evas_Object *obj);
+        [ :elm_win_fullscreen_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
+        [ :elm_win_maximized_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_maximized_get(const Evas_Object *obj);
+        [ :elm_win_maximized_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
+        [ :elm_win_iconified_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_iconified_get(const Evas_Object *obj);
+        [ :elm_win_iconified_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_layer_set(Evas_Object *obj, int layer);
+        [ :elm_win_layer_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_win_layer_get(const Evas_Object *obj);
+        [ :elm_win_layer_get, [ :evas_object ], :int ],
+        # EAPI void elm_win_rotation_set(Evas_Object *obj, int rotation);
+        [ :elm_win_rotation_set, [ :evas_object, :int ], :void ],
+        # EAPI void elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation);
+        [ :elm_win_rotation_with_resize_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_win_rotation_get(const Evas_Object *obj);
+        [ :elm_win_rotation_get, [ :evas_object ], :int ],
+        # EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
+        [ :elm_win_sticky_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_sticky_get(const Evas_Object *obj);
+        [ :elm_win_sticky_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant);
+        [ :elm_win_conformant_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_conformant_get(const Evas_Object *obj);
+        [ :elm_win_conformant_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel);
+        [ :elm_win_quickpanel_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_quickpanel_get(const Evas_Object *obj);
+        [ :elm_win_quickpanel_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority);
+        [ :elm_win_quickpanel_priority_major_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_win_quickpanel_priority_major_get(const Evas_Object *obj);
+        [ :elm_win_quickpanel_priority_major_get, [ :evas_object ], :int ],
+        # EAPI void elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority);
+        [ :elm_win_quickpanel_priority_minor_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_win_quickpanel_priority_minor_get(const Evas_Object *obj);
+        [ :elm_win_quickpanel_priority_minor_get, [ :evas_object ], :int ],
+        # EAPI void elm_win_quickpanel_zone_set(Evas_Object *obj, int zone);
+        [ :elm_win_quickpanel_zone_set, [ :evas_object, :int ], :void ],
+        # EAPI int elm_win_quickpanel_zone_get(const Evas_Object *obj);
+        [ :elm_win_quickpanel_zone_get, [ :evas_object ], :int ],
+        # EAPI void elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip);
+        [ :elm_win_prop_focus_skip_set, [ :evas_object, :bool ], :void ],
+        # EAPI void elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params);
+        [ :elm_win_illume_command_send, [ :evas_object, :elm_illume_command, :pointer ], :void ],
+        # EAPI Evas_Object *elm_win_inlined_image_object_get(Evas_Object *obj);
+        [ :elm_win_inlined_image_object_get, [ :evas_object ], :evas_object ],
+        # EAPI Eina_Bool elm_win_focus_get(const Evas_Object *obj);
+        [ :elm_win_focus_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain);
+        [ :elm_win_screen_constrain_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_screen_constrain_get(Evas_Object *obj);
+        [ :elm_win_screen_constrain_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_screen_size_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
+        [ :elm_win_screen_size_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_win_focus_highlight_enabled_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_focus_highlight_enabled_get(const Evas_Object *obj);
+        [ :elm_win_focus_highlight_enabled_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style);
+        [ :elm_win_focus_highlight_style_set, [ :evas_object, :string ], :void ],
+        # EAPI const char *elm_win_focus_highlight_style_get(const Evas_Object *obj);
+        [ :elm_win_focus_highlight_style_get, [ :evas_object ], :string ],
+        # EAPI void elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode);
+        [ :elm_win_keyboard_mode_set, [ :evas_object, :elm_win_keyboard_mode ], :void ],
+        # EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Evas_Object *obj);
+        [ :elm_win_keyboard_mode_get, [ :evas_object ], :elm_win_keyboard_mode ],
+        # EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
+        [ :elm_win_keyboard_win_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_keyboard_win_get(const Evas_Object *obj);
+        [ :elm_win_keyboard_win_get, [ :evas_object ], :bool ],
+        # EAPI void elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode);
+        [ :elm_win_indicator_mode_set, [ :evas_object, :elm_win_indicator_mode ], :void ],
+        # EAPI Elm_Win_Indicator_Mode elm_win_indicator_mode_get(const Evas_Object *obj);
+        [ :elm_win_indicator_mode_get, [ :evas_object ], :elm_win_indicator_mode ],
+        # EAPI void elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y);
+        [ :elm_win_screen_position_get, [ :evas_object, :pointer, :pointer ], :void ],
+        # EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :elm_win_socket_listen, [ :evas_object, :string, :int, :bool ], :bool ],
+        # EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
+        [ :elm_win_inwin_add, [ :evas_object ], :evas_object ],
+        # EAPI void elm_win_inwin_activate(Evas_Object *obj);
+        [ :elm_win_inwin_activate, [ :evas_object ], :void ],
+        # EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content);
+        [ :elm_win_inwin_content_set, [ :evas_object, :evas_object ], :void ],
+        # EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
+        [ :elm_win_inwin_content_get, [ :evas_object ], :evas_object ],
+        # EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
+        [ :elm_win_inwin_content_unset, [ :evas_object ], :evas_object ],
+        # EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
+        [ :elm_win_xwindow_get, [ :evas_object ], :uint ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/emap.rb b/lib/efl/native/emap.rb
index 6fb4fdb..0f31d7c 100644
--- a/lib/efl/native/emap.rb
+++ b/lib/efl/native/emap.rb
@@ -1,18 +1,18 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/eina_list'
 #
 module Efl
     #
-    module EMap
+    module Emap
         #
-        FCT_PREFIX = 'emap_'
+        FCT_PREFIX = 'emap_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -28,59 +28,53 @@ module Efl
         # TYPEDEFS
         # typedef struct emap_route EMap_Route;
         typedef :pointer, :emap_route
-        typedef :pointer, :emap_route_p
         # typedef struct emap_route_node EMap_Route_Node;
         typedef :pointer, :emap_route_node
-        typedef :pointer, :emap_route_node_p
-        #
-        # CALLBACKS
-        #
-        # VARIABLES
         #
         # FUNCTIONS
         fcts = [
         # EAPI int emap_init();
-        [ :emap_init, [ ], :int ],
+        [ :emap_init, [  ], :int ],
         # EAPI int emap_shutdown();
-        [ :emap_shutdown, [ ], :int ],
+        [ :emap_shutdown, [  ], :int ],
         # EAPI EMap_Route *emap_route_new();
-        [ :emap_route_new, [ ], :emap_route_p ],
+        [ :emap_route_new, [  ], :emap_route ],
         # EAPI void emap_route_node_add(EMap_Route *route, EMap_Route_Node *node);
-        [ :emap_route_node_add, [ :emap_route_p, :emap_route_node_p ], :void ],
+        [ :emap_route_node_add, [ :emap_route, :emap_route_node ], :void ],
         # EAPI void emap_route_free(EMap_Route *route);
-        [ :emap_route_free, [ :emap_route_p ], :void ],
+        [ :emap_route_free, [ :emap_route ], :void ],
         # EAPI void emap_route_name_set(EMap_Route *route, const char *name);
-        [ :emap_route_name_set, [ :emap_route_p, :string ], :void ],
+        [ :emap_route_name_set, [ :emap_route, :string ], :void ],
         # EAPI const char *emap_route_name_get(EMap_Route *route);
-        [ :emap_route_name_get, [ :emap_route_p ], :string ],
+        [ :emap_route_name_get, [ :emap_route ], :string ],
         # EAPI Eina_List *emap_route_nodes_get(EMap_Route *route);
-        [ :emap_route_nodes_get, [ :emap_route_p ], :eina_list_p ],
+        [ :emap_route_nodes_get, [ :emap_route ], :eina_list ],
         # EAPI double emap_route_distance_get(EMap_Route *route);
-        [ :emap_route_distance_get, [ :emap_route_p ], :double ],
+        [ :emap_route_distance_get, [ :emap_route ], :double ],
         # EAPI EMap_Route_Node *emap_route_node_new();
-        [ :emap_route_node_new, [ ], :emap_route_node_p ],
+        [ :emap_route_node_new, [  ], :emap_route_node ],
         # EAPI void emap_route_node_lon_set(EMap_Route_Node *node, double lon);
-        [ :emap_route_node_lon_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_lon_set, [ :emap_route_node, :double ], :void ],
         # EAPI void emap_route_node_lat_set(EMap_Route_Node *node, double lat);
-        [ :emap_route_node_lat_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_lat_set, [ :emap_route_node, :double ], :void ],
         # EAPI double emap_route_node_lon_get(EMap_Route_Node *node);
-        [ :emap_route_node_lon_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_lon_get, [ :emap_route_node ], :double ],
         # EAPI double emap_route_node_lat_get(EMap_Route_Node *node);
-        [ :emap_route_node_lat_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_lat_get, [ :emap_route_node ], :double ],
         # EAPI void emap_route_node_elevation_set(EMap_Route_Node *node, double elevation);
-        [ :emap_route_node_elevation_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_elevation_set, [ :emap_route_node, :double ], :void ],
         # EAPI double emap_route_node_elevation_get(EMap_Route_Node *node);
-        [ :emap_route_node_elevation_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_elevation_get, [ :emap_route_node ], :double ],
         # EAPI void emap_route_node_time_set(EMap_Route_Node *node, time_t time);
-        [ :emap_route_node_time_set, [ :emap_route_node_p, :ulong ], :void ],
+        [ :emap_route_node_time_set, [ :emap_route_node, :ulong ], :void ],
         # EAPI time_t emap_route_node_time_get(EMap_Route_Node *node);
-        [ :emap_route_node_time_get, [ :emap_route_node_p ], :ulong ],
+        [ :emap_route_node_time_get, [ :emap_route_node ], :ulong ],
         # EAPI double emap_route_nodes_distance_get(EMap_Route_Node *A, EMap_Route_Node *B);
-        [ :emap_route_nodes_distance_get, [ :emap_route_node_p, :emap_route_node_p ], :double ],
+        [ :emap_route_nodes_distance_get, [ :emap_route_node, :emap_route_node ], :double ],
         # EAPI void emap_route_node_free(EMap_Route_Node *node);
-        [ :emap_route_node_free, [ :emap_route_node_p ], :void ],
+        [ :emap_route_node_free, [ :emap_route_node ], :void ],
         # EAPI EMap_Route * emap_route_gpx_new(const char *file);
-        [ :emap_route_gpx_new, [ :string ], :emap_route_p ],
+        [ :emap_route_gpx_new, [ :string ], :emap_route ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/evas.rb b/lib/efl/native/evas.rb
index e730b08..6b9ba11 100644
--- a/lib/efl/native/evas.rb
+++ b/lib/efl/native/evas.rb
@@ -1,18 +1,18 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/eina_list'
 #
 module Efl
     #
     module Evas
         #
-        FCT_PREFIX = 'evas_'
+        FCT_PREFIX = 'evas_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, &block; r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,38 +21,45 @@ module Efl
         #
         ffi_lib 'evas'
         #
+        # CONSTANTS
+        EVAS_LAYER_MIN=-32768
+        EVAS_LAYER_MAX=32767
+        #
         # ENUMS
         # typedef enum _Evas_BiDi_Direction {...} Evas_BiDi_Direction;
-        enum :evas_bidi_direction, [ :evas_bidi_direction_natural, :evas_bidi_direction_neutral, :evas_bidi_direction_ltr, :evas_bidi_direction_rtl ]
-        typedef :pointer, :evas_bidi_direction_p
+        enum :evas_bidi_direction, [ :evas_bidi_direction_natural, 0, :evas_bidi_direction_neutral, 0, :evas_bidi_direction_ltr, 1,
+            :evas_bidi_direction_rtl, 2 ]
         # typedef enum _Evas_Callback_Type {...} Evas_Callback_Type;
-        enum :evas_callback_type, [ :evas_callback_mouse_in, :evas_callback_mouse_out, :evas_callback_mouse_down, :evas_callback_mouse_up, :evas_callback_mouse_move,
-            :evas_callback_mouse_wheel, :evas_callback_multi_down, :evas_callback_multi_up, :evas_callback_multi_move, :evas_callback_free, :evas_callback_key_down,
-            :evas_callback_key_up, :evas_callback_focus_in, :evas_callback_focus_out, :evas_callback_show, :evas_callback_hide, :evas_callback_move, :evas_callback_resize,
-            :evas_callback_restack, :evas_callback_del, :evas_callback_hold, :evas_callback_changed_size_hints, :evas_callback_image_preloaded, :evas_callback_canvas_focus_in,
-            :evas_callback_canvas_focus_out, :evas_callback_render_flush_pre, :evas_callback_render_flush_post, :evas_callback_canvas_object_focus_in,
-            :evas_callback_canvas_object_focus_out, :evas_callback_image_unloaded, :evas_callback_render_pre, :evas_callback_render_post, :evas_callback_last ]
+        enum :evas_callback_type, [ :evas_callback_mouse_in, :evas_callback_mouse_out, :evas_callback_mouse_down, :evas_callback_mouse_up,
+            :evas_callback_mouse_move, :evas_callback_mouse_wheel, :evas_callback_multi_down, :evas_callback_multi_up, :evas_callback_multi_move,
+            :evas_callback_free, :evas_callback_key_down, :evas_callback_key_up, :evas_callback_focus_in, :evas_callback_focus_out, :evas_callback_show,
+            :evas_callback_hide, :evas_callback_move, :evas_callback_resize, :evas_callback_restack, :evas_callback_del, :evas_callback_hold,
+            :evas_callback_changed_size_hints, :evas_callback_image_preloaded, :evas_callback_canvas_focus_in, :evas_callback_canvas_focus_out,
+            :evas_callback_render_flush_pre, :evas_callback_render_flush_post, :evas_callback_canvas_object_focus_in, :evas_callback_canvas_object_focus_out,
+            :evas_callback_image_unloaded, :evas_callback_render_pre, :evas_callback_render_post, :evas_callback_last ]
         # typedef enum _Evas_Button_Flags {...} Evas_Button_Flags;
-        enum :evas_button_flags, [ :evas_button_none, 0, :evas_button_double_click, :evas_button_triple_click ]
+        enum :evas_button_flags, [ :evas_button_none, 0, :evas_button_double_click, (1<<0), :evas_button_triple_click, (1<<1) ]
         # typedef enum _Evas_Event_Flags {...} Evas_Event_Flags;
-        enum :evas_event_flags, [ :evas_event_flag_none, 0, :evas_event_flag_on_hold, :evas_event_flag_on_scroll ]
+        enum :evas_event_flags, [ :evas_event_flag_none, 0, :evas_event_flag_on_hold, (1<<0), :evas_event_flag_on_scroll, (1<<1) ]
         # typedef enum _Evas_Touch_Point_State {...} Evas_Touch_Point_State;
-        enum :evas_touch_point_state, [ :evas_touch_point_down, :evas_touch_point_up, :evas_touch_point_move, :evas_touch_point_still, :evas_touch_point_cancel ]
+        enum :evas_touch_point_state, [ :evas_touch_point_down, :evas_touch_point_up, :evas_touch_point_move, :evas_touch_point_still,
+            :evas_touch_point_cancel ]
         # typedef enum _Evas_Font_Hinting_Flags {...} Evas_Font_Hinting_Flags;
         enum :evas_font_hinting_flags, [ :evas_font_hinting_none, :evas_font_hinting_auto, :evas_font_hinting_bytecode ]
         # typedef enum _Evas_Colorspace {...} Evas_Colorspace;
-        enum :evas_colorspace, [ :evas_colorspace_argb8888, :evas_colorspace_ycbcr422p601_pl, :evas_colorspace_ycbcr422p709_pl, :evas_colorspace_rgb565_a5p,
-            :evas_colorspace_gry8, :evas_colorspace_ycbcr422601_pl, :evas_colorspace_ycbcr420nv12601_pl, :evas_colorspace_ycbcr420tm12601_pl ]
+        enum :evas_colorspace, [ :evas_colorspace_argb8888, :evas_colorspace_ycbcr422p601_pl, :evas_colorspace_ycbcr422p709_pl,
+            :evas_colorspace_rgb565_a5p, :evas_colorspace_gry8, :evas_colorspace_ycbcr422601_pl, :evas_colorspace_ycbcr420nv12601_pl,
+            :evas_colorspace_ycbcr420tm12601_pl ]
         # typedef enum _Evas_Object_Table_Homogeneous_Mode {...} Evas_Object_Table_Homogeneous_Mode;
-        enum :evas_object_table_homogeneous_mode, [ :evas_object_table_homogeneous_none, 0, :evas_object_table_homogeneous_table, 1, :evas_object_table_homogeneous_item,
-            2 ]
+        enum :evas_object_table_homogeneous_mode, [ :evas_object_table_homogeneous_none, 0, :evas_object_table_homogeneous_table, 1,
+            :evas_object_table_homogeneous_item, 2 ]
         # typedef enum _Evas_Aspect_Control {...} Evas_Aspect_Control;
-        enum :evas_aspect_control, [ :evas_aspect_control_none, 0, :evas_aspect_control_neither, 1, :evas_aspect_control_horizontal, 2, :evas_aspect_control_vertical, 3,
-            :evas_aspect_control_both, 4 ]
-        typedef :pointer, :evas_aspect_control_p
+        enum :evas_aspect_control, [ :evas_aspect_control_none, 0, :evas_aspect_control_neither, 1, :evas_aspect_control_horizontal, 2,
+            :evas_aspect_control_vertical, 3, :evas_aspect_control_both, 4 ]
         # typedef enum _Evas_Load_Error {...} Evas_Load_Error;
-        enum :evas_load_error, [ :evas_load_error_none, 0, :evas_load_error_generic, 1, :evas_load_error_does_not_exist, 2, :evas_load_error_permission_denied, 3,
-            :evas_load_error_resource_allocation_failed, 4, :evas_load_error_corrupt_file, 5, :evas_load_error_unknown_format, 6 ]
+        enum :evas_load_error, [ :evas_load_error_none, 0, :evas_load_error_generic, 1, :evas_load_error_does_not_exist, 2,
+            :evas_load_error_permission_denied, 3, :evas_load_error_resource_allocation_failed, 4, :evas_load_error_corrupt_file, 5,
+            :evas_load_error_unknown_format, 6 ]
         # typedef enum _Evas_Alloc_Error {...} Evas_Alloc_Error;
         enum :evas_alloc_error, [ :evas_alloc_error_none, 0, :evas_alloc_error_fatal, 1, :evas_alloc_error_recovered, 2 ]
         # typedef enum _Evas_Fill_Spread {...} Evas_Fill_Spread;
@@ -64,25 +71,30 @@ module Efl
         enum :evas_native_surface_type, [ :evas_native_surface_none, :evas_native_surface_x11, :evas_native_surface_opengl ]
         # typedef enum _Evas_Render_Op {...} Evas_Render_Op;
         enum :evas_render_op, [ :evas_render_blend, 0, :evas_render_blend_rel, 1, :evas_render_copy, 2, :evas_render_copy_rel, 3, :evas_render_add, 4,
-            :evas_render_add_rel, 5, :evas_render_sub, 6, :evas_render_sub_rel, 7, :evas_render_tint, 8, :evas_render_tint_rel, 9, :evas_render_mask, 10, :evas_render_mul, 11 ]
+            :evas_render_add_rel, 5, :evas_render_sub, 6, :evas_render_sub_rel, 7, :evas_render_tint, 8, :evas_render_tint_rel, 9, :evas_render_mask, 10,
+            :evas_render_mul, 11 ]
         # typedef enum _Evas_Border_Fill_Mode {...} Evas_Border_Fill_Mode;
         enum :evas_border_fill_mode, [ :evas_border_fill_none, 0, :evas_border_fill_default, 1, :evas_border_fill_solid, 2 ]
         # typedef enum _Evas_Image_Scale_Hint {...} Evas_Image_Scale_Hint;
         enum :evas_image_scale_hint, [ :evas_image_scale_hint_none, 0, :evas_image_scale_hint_dynamic, 1, :evas_image_scale_hint_static, 2 ]
         # typedef enum _Evas_Image_Animated_Loop_Hint {...} Evas_Image_Animated_Loop_Hint;
-        enum :evas_image_animated_loop_hint, [ :evas_image_animated_hint_none, 0, :evas_image_animated_hint_loop, 1, :evas_image_animated_hint_pingpong, 2 ]
+        enum :evas_image_animated_loop_hint, [ :evas_image_animated_hint_none, 0, :evas_image_animated_hint_loop, 1,
+            :evas_image_animated_hint_pingpong, 2 ]
         # typedef enum _Evas_Engine_Render_Mode {...} Evas_Engine_Render_Mode;
         enum :evas_engine_render_mode, [ :evas_render_mode_blocking, 0, :evas_render_mode_nonblocking, 1 ]
         # typedef enum _Evas_Image_Content_Hint {...} Evas_Image_Content_Hint;
         enum :evas_image_content_hint, [ :evas_image_content_hint_none, 0, :evas_image_content_hint_dynamic, 1, :evas_image_content_hint_static, 2 ]
         # typedef enum _Evas_Object_Pointer_Mode {...} Evas_Object_Pointer_Mode;
-        enum :evas_object_pointer_mode, [ :evas_object_pointer_mode_autograb, :evas_object_pointer_mode_nograb ]
+        enum :evas_object_pointer_mode, [ :evas_object_pointer_mode_autograb, :evas_object_pointer_mode_nograb,
+            :evas_object_pointer_mode_nograb_no_repeat_updown ]
         # typedef enum _Evas_Text_Style_Type {...} Evas_Text_Style_Type;
-        enum :evas_text_style_type, [ :evas_text_style_plain, :evas_text_style_shadow, :evas_text_style_outline, :evas_text_style_soft_outline, :evas_text_style_glow,
-            :evas_text_style_outline_shadow, :evas_text_style_far_shadow, :evas_text_style_outline_soft_shadow, :evas_text_style_soft_shadow, :evas_text_style_far_soft_shadow,
-            :evas_text_style_shadow_direction_bottom_right, :evas_text_style_shadow_direction_bottom, :evas_text_style_shadow_direction_bottom_left,
-            :evas_text_style_shadow_direction_left, :evas_text_style_shadow_direction_top_left, :evas_text_style_shadow_direction_top, :evas_text_style_shadow_direction_top_right,
-            :evas_text_style_shadow_direction_right ]
+        enum :evas_text_style_type, [ :evas_text_style_plain, 0, :evas_text_style_shadow, 1, :evas_text_style_outline, 2,
+            :evas_text_style_soft_outline, 3, :evas_text_style_glow, 4, :evas_text_style_outline_shadow, 5, :evas_text_style_far_shadow, 6,
+            :evas_text_style_outline_soft_shadow, 7, :evas_text_style_soft_shadow, 8, :evas_text_style_far_soft_shadow, 9,
+            :evas_text_style_shadow_direction_bottom_right, (0x0<<4), :evas_text_style_shadow_direction_bottom, (0x1<<4),
+            :evas_text_style_shadow_direction_bottom_left, (0x2<<4), :evas_text_style_shadow_direction_left, (0x3<<4), :evas_text_style_shadow_direction_top_left,
+            (0x4<<4), :evas_text_style_shadow_direction_top, (0x5<<4), :evas_text_style_shadow_direction_top_right, (0x6<<4),
+            :evas_text_style_shadow_direction_right, (0x7<<4) ]
         # typedef enum _Evas_Textblock_Text_Type {...} Evas_Textblock_Text_Type;
         enum :evas_textblock_text_type, [ :evas_textblock_text_raw, :evas_textblock_text_plain, :evas_textblock_text_markup ]
         # typedef enum _Evas_Textblock_Cursor_Type {...} Evas_Textblock_Cursor_Type;
@@ -91,7 +103,6 @@ module Efl
         # TYPEDEFS
         # typedef struct _Evas_Version Evas_Version;
         typedef :pointer, :evas_version
-        typedef :pointer, :evas_version_p
         # typedef short Evas_Callback_Priority;
         typedef :short, :evas_callback_priority
         # typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle;
@@ -108,55 +119,38 @@ module Efl
         typedef :pointer, :evas_precision_position
         # typedef struct _Evas_Smart_Class Evas_Smart_Class;
         typedef :pointer, :evas_smart_class
-        typedef :pointer, :evas_smart_class_p
         # typedef struct _Evas_Smart_Cb_Description Evas_Smart_Cb_Description;
         typedef :pointer, :evas_smart_cb_description
-        typedef :pointer, :evas_smart_cb_description_p
-        typedef :pointer, :evas_smart_cb_description_pp
-        typedef :pointer, :evas_smart_cb_description_ppp
         # typedef struct _Evas_Map Evas_Map;
         typedef :pointer, :evas_map
-        typedef :pointer, :evas_map_p
         # typedef struct _Evas Evas;
         typedef :pointer, :evas
-        typedef :pointer, :evas_p
         # typedef struct _Evas_Object Evas_Object;
         typedef :pointer, :evas_object
-        typedef :pointer, :evas_object_p
-        typedef :pointer, :evas_object_pp
         # typedef void Evas_Performance;
         typedef :void, :evas_performance
         # typedef struct _Evas_Modifier Evas_Modifier;
         typedef :pointer, :evas_modifier
-        typedef :pointer, :evas_modifier_p
         # typedef struct _Evas_Lock Evas_Lock;
         typedef :pointer, :evas_lock
-        typedef :pointer, :evas_lock_p
         # typedef struct _Evas_Smart Evas_Smart;
         typedef :pointer, :evas_smart
-        typedef :pointer, :evas_smart_p
         # typedef struct _Evas_Native_Surface Evas_Native_Surface;
         typedef :pointer, :evas_native_surface
-        typedef :pointer, :evas_native_surface_p
         # typedef struct _Evas_Video_Surface Evas_Video_Surface;
         typedef :pointer, :evas_video_surface
-        typedef :pointer, :evas_video_surface_p
         # typedef unsigned long long Evas_Modifier_Mask;
         typedef :ulong_long, :evas_modifier_mask
         # typedef int Evas_Coord;
         typedef :int, :evas_coord
-        typedef :pointer, :evas_coord_p
         # typedef int Evas_Font_Size;
         typedef :int, :evas_font_size
-        typedef :pointer, :evas_font_size_p
         # typedef int Evas_Angle;
         typedef :int, :evas_angle
         # typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source;
         typedef :pointer, :evas_pixel_import_source
-        typedef :pointer, :evas_pixel_import_source_p
         # typedef struct _Evas_Engine_Info Evas_Engine_Info;
         typedef :pointer, :evas_engine_info
-        typedef :pointer, :evas_engine_info_p
         # typedef struct _Evas_Device Evas_Device;
         typedef :pointer, :evas_device
         # typedef struct _Evas_Event_Mouse_Down Evas_Event_Mouse_Down;
@@ -185,87 +179,76 @@ module Efl
         typedef :pointer, :evas_event_hold
         # typedef struct _Evas_Textblock_Style Evas_Textblock_Style;
         typedef :pointer, :evas_textblock_style
-        typedef :pointer, :evas_textblock_style_p
         # typedef struct _Evas_Textblock_Cursor Evas_Textblock_Cursor;
         typedef :pointer, :evas_textblock_cursor
-        typedef :pointer, :evas_textblock_cursor_p
         # typedef struct _Evas_Object_Textblock_Node_Format Evas_Object_Textblock_Node_Format;
         typedef :pointer, :evas_object_textblock_node_format
-        typedef :pointer, :evas_object_textblock_node_format_p
         # typedef struct _Evas_Textblock_Rectangle Evas_Textblock_Rectangle;
         typedef :pointer, :evas_textblock_rectangle
         # typedef struct _Evas_Object_Smart_Clipped_Data Evas_Object_Smart_Clipped_Data;
         typedef :pointer, :evas_object_smart_clipped_data
         # typedef struct _Evas_Object_Box_Api Evas_Object_Box_Api;
         typedef :pointer, :evas_object_box_api
-        typedef :pointer, :evas_object_box_api_p
         # typedef struct _Evas_Object_Box_Data Evas_Object_Box_Data;
         typedef :pointer, :evas_object_box_data
-        typedef :pointer, :evas_object_box_data_p
         # typedef struct _Evas_Object_Box_Option Evas_Object_Box_Option;
         typedef :pointer, :evas_object_box_option
-        typedef :pointer, :evas_object_box_option_p
         # typedef struct _Evas_Cserve_Stats Evas_Cserve_Stats;
         typedef :pointer, :evas_cserve_stats
-        typedef :pointer, :evas_cserve_stats_p
         # typedef struct _Evas_Cserve_Image_Cache Evas_Cserve_Image_Cache;
         typedef :pointer, :evas_cserve_image_cache
-        typedef :pointer, :evas_cserve_image_cache_p
         # typedef struct _Evas_Cserve_Image Evas_Cserve_Image;
         typedef :pointer, :evas_cserve_image
         # typedef struct _Evas_Cserve_Config Evas_Cserve_Config;
         typedef :pointer, :evas_cserve_config
-        typedef :pointer, :evas_cserve_config_p
         #
         # CALLBACKS
         # typedef void (*Evas_Video_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface);
-        callback :evas_video_cb, [ :void_p, :evas_object_p, :evas_video_surface_p ], :void
+        callback :evas_video_cb, [ :pointer, :evas_object, :evas_video_surface ], :void
         # typedef void (*Evas_Video_Coord_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface, Evas_Coord a, Evas_Coord b);
-        callback :evas_video_coord_cb, [ :void_p, :evas_object_p, :evas_video_surface_p, :int, :int ], :void
+        callback :evas_video_coord_cb, [ :pointer, :evas_object, :evas_video_surface, :int, :int ], :void
         # typedef void (*Evas_Smart_Cb) (void *data, Evas_Object *obj, void *event_info);
-        callback :evas_smart_cb, [ :void_p, :evas_object_p, :void_p ], :void
+        callback :evas_smart_cb, [ :pointer, :evas_object, :pointer ], :void
         # typedef void (*Evas_Event_Cb) (void *data, Evas *e, void *event_info);
-        callback :evas_event_cb, [ :void_p, :evas_p, :void_p ], :void
+        callback :evas_event_cb, [ :pointer, :evas, :pointer ], :void
         # typedef Eina_Bool (*Evas_Object_Event_Post_Cb) (void *data, Evas *e);
-        callback :evas_object_event_post_cb, [ :void_p, :evas_p ], :eina_bool
+        callback :evas_object_event_post_cb, [ :pointer, :evas ], :bool
         # typedef void (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj, void *event_info);
-        callback :evas_object_event_cb, [ :void_p, :evas_p, :evas_object_p, :void_p ], :void
+        callback :evas_object_event_cb, [ :pointer, :evas, :evas_object, :pointer ], :void
         # typedef void (*Evas_Async_Events_Put_Cb) (void *target, Evas_Callback_Type type, void *event_info);
-        callback :evas_async_events_put_cb, [ :void_p, :evas_callback_type, :void_p ], :void
+        callback :evas_async_events_put_cb, [ :pointer, :evas_callback_type, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Show_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_show_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_intercept_show_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Hide_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_hide_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_intercept_hide_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Move_Cb) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        callback :evas_object_intercept_move_cb, [ :void_p, :evas_object_p, :int, :int ], :void
+        callback :evas_object_intercept_move_cb, [ :pointer, :evas_object, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Resize_Cb) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        callback :evas_object_intercept_resize_cb, [ :void_p, :evas_object_p, :int, :int ], :void
+        callback :evas_object_intercept_resize_cb, [ :pointer, :evas_object, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Raise_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_raise_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_intercept_raise_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Lower_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_lower_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_intercept_lower_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Above_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_above_cb, [ :void_p, :evas_object_p, :evas_object_p ], :void
+        callback :evas_object_intercept_stack_above_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Below_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_below_cb, [ :void_p, :evas_object_p, :evas_object_p ], :void
+        callback :evas_object_intercept_stack_below_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Layer_Set_Cb) (void *data, Evas_Object *obj, int l);
-        callback :evas_object_intercept_layer_set_cb, [ :void_p, :evas_object_p, :int ], :void
+        callback :evas_object_intercept_layer_set_cb, [ :pointer, :evas_object, :int ], :void
         # typedef void (*Evas_Object_Intercept_Color_Set_Cb) (void *data, Evas_Object *obj, int r, int g, int b, int a);
-        callback :evas_object_intercept_color_set_cb, [ :void_p, :evas_object_p, :int, :int, :int, :int ], :void
+        callback :evas_object_intercept_color_set_cb, [ :pointer, :evas_object, :int, :int, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Set_Cb) (void *data, Evas_Object *obj, Evas_Object *clip);
-        callback :evas_object_intercept_clip_set_cb, [ :void_p, :evas_object_p, :evas_object_p ], :void
+        callback :evas_object_intercept_clip_set_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Unset_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_clip_unset_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_intercept_clip_unset_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
-        callback :evas_object_image_pixels_get_cb, [ :void_p, :evas_object_p ], :void
+        callback :evas_object_image_pixels_get_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Box_Layout) (Evas_Object *o, Evas_Object_Box_Data *priv, void *user_data);
-        callback :evas_object_box_layout, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void
-        # void (*free_data)(void *data)
-        callback :evas_free_data_cb, [ :void_p ], :void
+        callback :evas_object_box_layout_cb, [ :evas_object, :evas_object_box_data, :pointer ], :void
         #
         # VARIABLES
         # EAPI extern Evas_Version *evas_version;
-        attach_variable :evas_version, :evas_version_p
+        attach_variable :evas_version, :evas_version
         #
         # FUNCTIONS
         fcts = [
@@ -280,1099 +263,1118 @@ module Efl
         # EAPI int evas_async_events_process (void);
         [ :evas_async_events_process, [  ], :int ],
         # EAPI Eina_Bool evas_async_events_put (const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func);
-        [ :evas_async_events_put, [ :void_p, :evas_callback_type, :void_p, :evas_async_events_put_cb ], :eina_bool ],
+        [ :evas_async_events_put, [ :pointer, :evas_callback_type, :pointer, :evas_async_events_put_cb ], :bool ],
         # EAPI Evas *evas_new (void);
-        [ :evas_new, [  ], :evas_p ],
+        [ :evas_new, [  ], :evas ],
         # EAPI void evas_free (Evas *e);
-        [ :evas_free, [ :evas_p ], :void ],
+        [ :evas_free, [ :evas ], :void ],
         # EAPI void evas_focus_in (Evas *e);
-        [ :evas_focus_in, [ :evas_p ], :void ],
+        [ :evas_focus_in, [ :evas ], :void ],
         # EAPI void evas_focus_out (Evas *e);
-        [ :evas_focus_out, [ :evas_p ], :void ],
+        [ :evas_focus_out, [ :evas ], :void ],
         # EAPI Eina_Bool evas_focus_state_get (const Evas *e);
-        [ :evas_focus_state_get, [ :evas_p ], :eina_bool ],
+        [ :evas_focus_state_get, [ :evas ], :bool ],
         # EAPI void evas_nochange_push (Evas *e);
-        [ :evas_nochange_push, [ :evas_p ], :void ],
+        [ :evas_nochange_push, [ :evas ], :void ],
         # EAPI void evas_nochange_pop (Evas *e);
-        [ :evas_nochange_pop, [ :evas_p ], :void ],
+        [ :evas_nochange_pop, [ :evas ], :void ],
         # EAPI void evas_data_attach_set (Evas *e, void *data);
-        [ :evas_data_attach_set, [ :evas_p, :void_p ], :void ],
+        [ :evas_data_attach_set, [ :evas, :pointer ], :void ],
         # EAPI void *evas_data_attach_get (const Evas *e);
-        [ :evas_data_attach_get, [ :evas_p ], :void_p ],
+        [ :evas_data_attach_get, [ :evas ], :pointer ],
         # EAPI void evas_damage_rectangle_add (Evas *e, int x, int y, int w, int h);
-        [ :evas_damage_rectangle_add, [ :evas_p, :int, :int, :int, :int ], :void ],
+        [ :evas_damage_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_rectangle_add (Evas *e, int x, int y, int w, int h);
-        [ :evas_obscured_rectangle_add, [ :evas_p, :int, :int, :int, :int ], :void ],
+        [ :evas_obscured_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_clear (Evas *e);
-        [ :evas_obscured_clear, [ :evas_p ], :void ],
+        [ :evas_obscured_clear, [ :evas ], :void ],
         # EAPI Eina_List *evas_render_updates (Evas *e);
-        [ :evas_render_updates, [ :evas_p ], :eina_list_p ],
+        [ :evas_render_updates, [ :evas ], :eina_list ],
         # EAPI void evas_render_updates_free (Eina_List *updates);
-        [ :evas_render_updates_free, [ :eina_list_p ], :void ],
+        [ :evas_render_updates_free, [ :eina_list ], :void ],
         # EAPI void evas_render (Evas *e);
-        [ :evas_render, [ :evas_p ], :void ],
+        [ :evas_render, [ :evas ], :void ],
         # EAPI void evas_norender (Evas *e);
-        [ :evas_norender, [ :evas_p ], :void ],
+        [ :evas_norender, [ :evas ], :void ],
         # EAPI void evas_render_idle_flush (Evas *e);
-        [ :evas_render_idle_flush, [ :evas_p ], :void ],
+        [ :evas_render_idle_flush, [ :evas ], :void ],
         # EAPI void evas_render_dump (Evas *e);
-        [ :evas_render_dump, [ :evas_p ], :void ],
+        [ :evas_render_dump, [ :evas ], :void ],
         # EAPI int evas_render_method_lookup (const char *name);
         [ :evas_render_method_lookup, [ :string ], :int ],
         # EAPI Eina_List *evas_render_method_list (void);
-        [ :evas_render_method_list, [  ], :eina_list_p ],
+        [ :evas_render_method_list, [  ], :eina_list ],
         # EAPI void evas_render_method_list_free (Eina_List *list);
-        [ :evas_render_method_list_free, [ :eina_list_p ], :void ],
+        [ :evas_render_method_list_free, [ :eina_list ], :void ],
         # EAPI void evas_output_method_set (Evas *e, int render_method);
-        [ :evas_output_method_set, [ :evas_p, :int ], :void ],
+        [ :evas_output_method_set, [ :evas, :int ], :void ],
         # EAPI int evas_output_method_get (const Evas *e);
-        [ :evas_output_method_get, [ :evas_p ], :int ],
+        [ :evas_output_method_get, [ :evas ], :int ],
         # EAPI Evas_Engine_Info *evas_engine_info_get (const Evas *e);
-        [ :evas_engine_info_get, [ :evas_p ], :evas_engine_info_p ],
+        [ :evas_engine_info_get, [ :evas ], :evas_engine_info ],
         # EAPI Eina_Bool evas_engine_info_set (Evas *e, Evas_Engine_Info *info);
-        [ :evas_engine_info_set, [ :evas_p, :evas_engine_info_p ], :eina_bool ],
+        [ :evas_engine_info_set, [ :evas, :evas_engine_info ], :bool ],
         # EAPI void evas_output_size_set (Evas *e, int w, int h);
-        [ :evas_output_size_set, [ :evas_p, :int, :int ], :void ],
+        [ :evas_output_size_set, [ :evas, :int, :int ], :void ],
         # EAPI void evas_output_size_get (const Evas *e, int *w, int *h);
-        [ :evas_output_size_get, [ :evas_p, :int_p, :int_p ], :void ],
+        [ :evas_output_size_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI void evas_output_viewport_set (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_viewport_set, [ :evas_p, :int, :int, :int, :int ], :void ],
+        [ :evas_output_viewport_set, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_viewport_get (const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_viewport_get, [ :evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_output_viewport_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_output_framespace_set (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_framespace_set, [ :evas_p, :int, :int, :int, :int ], :void ],
+        [ :evas_output_framespace_set, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_framespace_get (const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_framespace_get, [ :evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_output_framespace_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Coord evas_coord_screen_x_to_world (const Evas *e, int x);
-        [ :evas_coord_screen_x_to_world, [ :evas_p, :int ], :int ],
+        [ :evas_coord_screen_x_to_world, [ :evas, :int ], :int ],
         # EAPI Evas_Coord evas_coord_screen_y_to_world (const Evas *e, int y);
-        [ :evas_coord_screen_y_to_world, [ :evas_p, :int ], :int ],
+        [ :evas_coord_screen_y_to_world, [ :evas, :int ], :int ],
         # EAPI int evas_coord_world_x_to_screen (const Evas *e, Evas_Coord x);
-        [ :evas_coord_world_x_to_screen, [ :evas_p, :int ], :int ],
+        [ :evas_coord_world_x_to_screen, [ :evas, :int ], :int ],
         # EAPI int evas_coord_world_y_to_screen (const Evas *e, Evas_Coord y);
-        [ :evas_coord_world_y_to_screen, [ :evas_p, :int ], :int ],
+        [ :evas_coord_world_y_to_screen, [ :evas, :int ], :int ],
         # EAPI void evas_pointer_output_xy_get (const Evas *e, int *x, int *y);
-        [ :evas_pointer_output_xy_get, [ :evas_p, :int_p, :int_p ], :void ],
+        [ :evas_pointer_output_xy_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI void evas_pointer_canvas_xy_get (const Evas *e, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_pointer_canvas_xy_get, [ :evas_p, :int_p, :int_p ], :void ],
+        [ :evas_pointer_canvas_xy_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI int evas_pointer_button_down_mask_get (const Evas *e);
-        [ :evas_pointer_button_down_mask_get, [ :evas_p ], :int ],
+        [ :evas_pointer_button_down_mask_get, [ :evas ], :int ],
         # EAPI Eina_Bool evas_pointer_inside_get (const Evas *e);
-        [ :evas_pointer_inside_get, [ :evas_p ], :eina_bool ],
+        [ :evas_pointer_inside_get, [ :evas ], :bool ],
         # EAPI void evas_sync(Evas *e);
-        [ :evas_sync, [ :evas_p ], :void ],
+        [ :evas_sync, [ :evas ], :void ],
         # EAPI void evas_event_callback_add (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_add, [ :evas_p, :evas_callback_type, :evas_event_cb, :void_p ], :void ],
+        [ :evas_event_callback_add, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :void ],
         # EAPI void evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_priority_add, [ :evas_p, :evas_callback_type, :short, :evas_event_cb, :void_p ], :void ],
+        [ :evas_event_callback_priority_add, [ :evas, :evas_callback_type, :short, :evas_event_cb, :pointer ], :void ],
         # EAPI void *evas_event_callback_del (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func);
-        [ :evas_event_callback_del, [ :evas_p, :evas_callback_type, :evas_event_cb ], :void_p ],
+        [ :evas_event_callback_del, [ :evas, :evas_callback_type, :evas_event_cb ], :pointer ],
         # EAPI void *evas_event_callback_del_full (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_del_full, [ :evas_p, :evas_callback_type, :evas_event_cb, :void_p ], :void_p ],
+        [ :evas_event_callback_del_full, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :pointer ],
         # EAPI void evas_post_event_callback_push (Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_push, [ :evas_p, :evas_object_event_post_cb, :void_p ], :void ],
+        [ :evas_post_event_callback_push, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_post_event_callback_remove (Evas *e, Evas_Object_Event_Post_Cb func);
-        [ :evas_post_event_callback_remove, [ :evas_p, :evas_object_event_post_cb ], :void ],
+        [ :evas_post_event_callback_remove, [ :evas, :evas_object_event_post_cb ], :void ],
         # EAPI void evas_post_event_callback_remove_full (Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_remove_full, [ :evas_p, :evas_object_event_post_cb, :void_p ], :void ],
+        [ :evas_post_event_callback_remove_full, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_event_default_flags_set (Evas *e, Evas_Event_Flags flags);
-        [ :evas_event_default_flags_set, [ :evas_p, :evas_event_flags ], :void ],
+        [ :evas_event_default_flags_set, [ :evas, :evas_event_flags ], :void ],
         # EAPI Evas_Event_Flags evas_event_default_flags_get (const Evas *e);
-        [ :evas_event_default_flags_get, [ :evas_p ], :evas_event_flags ],
+        [ :evas_event_default_flags_get, [ :evas ], :evas_event_flags ],
         # EAPI void evas_event_freeze (Evas *e);
-        [ :evas_event_freeze, [ :evas_p ], :void ],
+        [ :evas_event_freeze, [ :evas ], :void ],
         # EAPI void evas_event_thaw (Evas *e);
-        [ :evas_event_thaw, [ :evas_p ], :void ],
+        [ :evas_event_thaw, [ :evas ], :void ],
         # EAPI int evas_event_freeze_get (const Evas *e);
-        [ :evas_event_freeze_get, [ :evas_p ], :int ],
+        [ :evas_event_freeze_get, [ :evas ], :int ],
         # EAPI void evas_event_thaw_eval (Evas *e);
-        [ :evas_event_thaw_eval, [ :evas_p ], :void ],
+        [ :evas_event_thaw_eval, [ :evas ], :void ],
+        # EAPI int evas_event_down_count_get (const Evas *e);
+        [ :evas_event_down_count_get, [ :evas ], :int ],
         # EAPI void evas_event_feed_mouse_down (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_down, [ :evas_p, :int, :evas_button_flags, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_down, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_up (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_up, [ :evas_p, :int, :evas_button_flags, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_up, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_move (Evas *e, int x, int y, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_move, [ :evas_p, :int, :int, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_move, [ :evas, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_in (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_in, [ :evas_p, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_in, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_out (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_out, [ :evas_p, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_out, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_down (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_down, [ :evas_p, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags, :uint, :void_p ],
-            :void ],
+        [ :evas_event_feed_multi_down, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+            :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_up (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_up, [ :evas_p, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags, :uint, :void_p ],
-            :void ],
+        [ :evas_event_feed_multi_up, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+            :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_move (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_move, [ :evas_p, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :void_p ], :void ],
+        [ :evas_event_feed_multi_move, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer ],
+            :void ],
         # EAPI void evas_event_feed_mouse_cancel (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_cancel, [ :evas_p, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_cancel, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_wheel (Evas *e, int direction, int z, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_wheel, [ :evas_p, :int, :int, :uint, :void_p ], :void ],
+        [ :evas_event_feed_mouse_wheel, [ :evas, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_down (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_down, [ :evas_p, :string, :string, :string, :string, :uint, :void_p ], :void ],
+        [ :evas_event_feed_key_down, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_up (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_up, [ :evas_p, :string, :string, :string, :string, :uint, :void_p ], :void ],
+        [ :evas_event_feed_key_up, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_hold (Evas *e, int hold, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_hold, [ :evas_p, :int, :uint, :void_p ], :void ],
+        [ :evas_event_feed_hold, [ :evas, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_refeed_event (Evas *e, void *event_copy, Evas_Callback_Type event_type);
-        [ :evas_event_refeed_event, [ :evas_p, :void_p, :evas_callback_type ], :void ],
+        [ :evas_event_refeed_event, [ :evas, :pointer, :evas_callback_type ], :void ],
         # EAPI void evas_image_cache_flush (Evas *e);
-        [ :evas_image_cache_flush, [ :evas_p ], :void ],
+        [ :evas_image_cache_flush, [ :evas ], :void ],
         # EAPI void evas_image_cache_reload (Evas *e);
-        [ :evas_image_cache_reload, [ :evas_p ], :void ],
+        [ :evas_image_cache_reload, [ :evas ], :void ],
         # EAPI void evas_image_cache_set (Evas *e, int size);
-        [ :evas_image_cache_set, [ :evas_p, :int ], :void ],
+        [ :evas_image_cache_set, [ :evas, :int ], :void ],
         # EAPI int evas_image_cache_get (const Evas *e);
-        [ :evas_image_cache_get, [ :evas_p ], :int ],
+        [ :evas_image_cache_get, [ :evas ], :int ],
         # EAPI Eina_Bool evas_image_max_size_get (const Evas *e, int *maxw, int *maxh);
-        [ :evas_image_max_size_get, [ :evas_p, :int_p, :int_p ], :eina_bool ],
+        [ :evas_image_max_size_get, [ :evas, :pointer, :pointer ], :bool ],
         # EAPI void evas_font_hinting_set (Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_set, [ :evas_p, :evas_font_hinting_flags ], :void ],
+        [ :evas_font_hinting_set, [ :evas, :evas_font_hinting_flags ], :void ],
         # EAPI Evas_Font_Hinting_Flags evas_font_hinting_get (const Evas *e);
-        [ :evas_font_hinting_get, [ :evas_p ], :evas_font_hinting_flags ],
+        [ :evas_font_hinting_get, [ :evas ], :evas_font_hinting_flags ],
         # EAPI Eina_Bool evas_font_hinting_can_hint (const Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_can_hint, [ :evas_p, :evas_font_hinting_flags ], :eina_bool ],
+        [ :evas_font_hinting_can_hint, [ :evas, :evas_font_hinting_flags ], :bool ],
         # EAPI void evas_font_cache_flush (Evas *e);
-        [ :evas_font_cache_flush, [ :evas_p ], :void ],
+        [ :evas_font_cache_flush, [ :evas ], :void ],
         # EAPI void evas_font_cache_set (Evas *e, int size);
-        [ :evas_font_cache_set, [ :evas_p, :int ], :void ],
+        [ :evas_font_cache_set, [ :evas, :int ], :void ],
         # EAPI int evas_font_cache_get (const Evas *e);
-        [ :evas_font_cache_get, [ :evas_p ], :int ],
+        [ :evas_font_cache_get, [ :evas ], :int ],
         # EAPI Eina_List *evas_font_available_list (const Evas *e);
-        [ :evas_font_available_list, [ :evas_p ], :eina_list_p ],
+        [ :evas_font_available_list, [ :evas ], :eina_list ],
         # EAPI void evas_font_available_list_free(Evas *e, Eina_List *available);
-        [ :evas_font_available_list_free, [ :evas_p, :eina_list_p ], :void ],
+        [ :evas_font_available_list_free, [ :evas, :eina_list ], :void ],
         # EAPI void evas_font_path_clear (Evas *e);
-        [ :evas_font_path_clear, [ :evas_p ], :void ],
+        [ :evas_font_path_clear, [ :evas ], :void ],
         # EAPI void evas_font_path_append (Evas *e, const char *path);
-        [ :evas_font_path_append, [ :evas_p, :string ], :void ],
+        [ :evas_font_path_append, [ :evas, :string ], :void ],
         # EAPI void evas_font_path_prepend (Evas *e, const char *path);
-        [ :evas_font_path_prepend, [ :evas_p, :string ], :void ],
+        [ :evas_font_path_prepend, [ :evas, :string ], :void ],
         # EAPI const Eina_List *evas_font_path_list (const Evas *e);
-        [ :evas_font_path_list, [ :evas_p ], :eina_list_p ],
+        [ :evas_font_path_list, [ :evas ], :eina_list ],
         # EAPI void evas_object_clip_set (Evas_Object *obj, Evas_Object *clip);
-        [ :evas_object_clip_set, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :evas_object_clip_set, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_clip_get (const Evas_Object *obj);
-        [ :evas_object_clip_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_clip_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_clip_unset (Evas_Object *obj);
-        [ :evas_object_clip_unset, [ :evas_object_p ], :void ],
+        [ :evas_object_clip_unset, [ :evas_object ], :void ],
         # EAPI const Eina_List *evas_object_clipees_get (const Evas_Object *obj);
-        [ :evas_object_clipees_get, [ :evas_object_p ], :eina_list_p ],
+        [ :evas_object_clipees_get, [ :evas_object ], :eina_list ],
         # EAPI void evas_object_focus_set (Evas_Object *obj, Eina_Bool focus);
-        [ :evas_object_focus_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_focus_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_focus_get (const Evas_Object *obj);
-        [ :evas_object_focus_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_focus_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_layer_set (Evas_Object *obj, short l);
-        [ :evas_object_layer_set, [ :evas_object_p, :short ], :void ],
+        [ :evas_object_layer_set, [ :evas_object, :short ], :void ],
         # EAPI short evas_object_layer_get (const Evas_Object *obj);
-        [ :evas_object_layer_get, [ :evas_object_p ], :short ],
+        [ :evas_object_layer_get, [ :evas_object ], :short ],
         # EAPI void evas_object_name_set (Evas_Object *obj, const char *name);
-        [ :evas_object_name_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_name_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_name_get (const Evas_Object *obj);
-        [ :evas_object_name_get, [ :evas_object_p ], :string ],
+        [ :evas_object_name_get, [ :evas_object ], :string ],
         # EAPI void evas_object_ref (Evas_Object *obj);
-        [ :evas_object_ref, [ :evas_object_p ], :void ],
+        [ :evas_object_ref, [ :evas_object ], :void ],
         # EAPI void evas_object_unref (Evas_Object *obj);
-        [ :evas_object_unref, [ :evas_object_p ], :void ],
+        [ :evas_object_unref, [ :evas_object ], :void ],
         # EAPI void evas_object_del (Evas_Object *obj);
-        [ :evas_object_del, [ :evas_object_p ], :void ],
+        [ :evas_object_del, [ :evas_object ], :void ],
         # EAPI void evas_object_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_move, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_move, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_resize, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_resize, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_geometry_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_geometry_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_geometry_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_show (Evas_Object *obj);
-        [ :evas_object_show, [ :evas_object_p ], :void ],
+        [ :evas_object_show, [ :evas_object ], :void ],
         # EAPI void evas_object_hide (Evas_Object *obj);
-        [ :evas_object_hide, [ :evas_object_p ], :void ],
+        [ :evas_object_hide, [ :evas_object ], :void ],
         # EAPI Eina_Bool evas_object_visible_get (const Evas_Object *obj);
-        [ :evas_object_visible_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_visible_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas *evas_object_evas_get (const Evas_Object *obj);
-        [ :evas_object_evas_get, [ :evas_object_p ], :evas_p ],
+        [ :evas_object_evas_get, [ :evas_object ], :evas ],
         # EAPI const char *evas_object_type_get (const Evas_Object *obj);
-        [ :evas_object_type_get, [ :evas_object_p ], :string ],
+        [ :evas_object_type_get, [ :evas_object ], :string ],
         # EAPI void evas_object_raise (Evas_Object *obj);
-        [ :evas_object_raise, [ :evas_object_p ], :void ],
+        [ :evas_object_raise, [ :evas_object ], :void ],
         # EAPI void evas_object_lower (Evas_Object *obj);
-        [ :evas_object_lower, [ :evas_object_p ], :void ],
+        [ :evas_object_lower, [ :evas_object ], :void ],
         # EAPI void evas_object_stack_above (Evas_Object *obj, Evas_Object *above);
-        [ :evas_object_stack_above, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :evas_object_stack_above, [ :evas_object, :evas_object ], :void ],
         # EAPI void evas_object_stack_below (Evas_Object *obj, Evas_Object *below);
-        [ :evas_object_stack_below, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :evas_object_stack_below, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_above_get (const Evas_Object *obj);
-        [ :evas_object_above_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_above_get, [ :evas_object ], :evas_object ],
         # EAPI Evas_Object *evas_object_below_get (const Evas_Object *obj);
-        [ :evas_object_below_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_below_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_event_callback_add (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_add, [ :evas_object_p, :evas_callback_type, :evas_object_event_cb, :void_p ], :void ],
+        [ :evas_object_event_callback_add, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :void ],
         # EAPI void evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_priority_add, [ :evas_object_p, :evas_callback_type, :short, :evas_object_event_cb, :void_p ], :void ],
+        [ :evas_object_event_callback_priority_add, [ :evas_object, :evas_callback_type, :short, :evas_object_event_cb, :pointer ], :void ],
         # EAPI void *evas_object_event_callback_del (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func);
-        [ :evas_object_event_callback_del, [ :evas_object_p, :evas_callback_type, :evas_object_event_cb ], :void_p ],
+        [ :evas_object_event_callback_del, [ :evas_object, :evas_callback_type, :evas_object_event_cb ], :pointer ],
         # EAPI void *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_del_full, [ :evas_object_p, :evas_callback_type, :evas_object_event_cb, :void_p ], :void_p ],
+        [ :evas_object_event_callback_del_full, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :pointer ],
         # EAPI void evas_object_pass_events_set (Evas_Object *obj, Eina_Bool pass);
-        [ :evas_object_pass_events_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_pass_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_pass_events_get (const Evas_Object *obj);
-        [ :evas_object_pass_events_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_pass_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_repeat_events_set (Evas_Object *obj, Eina_Bool repeat);
-        [ :evas_object_repeat_events_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_repeat_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_repeat_events_get (const Evas_Object *obj);
-        [ :evas_object_repeat_events_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_repeat_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_propagate_events_set (Evas_Object *obj, Eina_Bool prop);
-        [ :evas_object_propagate_events_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_propagate_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_propagate_events_get (const Evas_Object *obj);
-        [ :evas_object_propagate_events_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_propagate_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze);
-        [ :evas_object_freeze_events_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_freeze_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_freeze_events_get(const Evas_Object *obj);
-        [ :evas_object_freeze_events_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_freeze_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_map_enable_set (Evas_Object *obj, Eina_Bool enabled);
-        [ :evas_object_map_enable_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_map_enable_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_map_enable_get (const Evas_Object *obj);
-        [ :evas_object_map_enable_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_map_enable_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_map_source_set (Evas_Object *obj, Evas_Object *src);
-        [ :evas_object_map_source_set, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :evas_object_map_source_set, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_map_source_get (const Evas_Object *obj);
-        [ :evas_object_map_source_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_map_source_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_map_set (Evas_Object *obj, const Evas_Map *map);
-        [ :evas_object_map_set, [ :evas_object_p, :evas_map_p ], :void ],
+        [ :evas_object_map_set, [ :evas_object, :evas_map ], :void ],
         # EAPI const Evas_Map *evas_object_map_get (const Evas_Object *obj);
-        [ :evas_object_map_get, [ :evas_object_p ], :evas_map_p ],
+        [ :evas_object_map_get, [ :evas_object ], :evas_map ],
         # EAPI void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_object_full, [ :evas_map_p, :evas_object_p, :int ], :void ],
+        [ :evas_map_util_points_populate_from_object_full, [ :evas_map, :evas_object, :int ], :void ],
         # EAPI void evas_map_util_points_populate_from_object (Evas_Map *m, const Evas_Object *obj);
-        [ :evas_map_util_points_populate_from_object, [ :evas_map_p, :evas_object_p ], :void ],
+        [ :evas_map_util_points_populate_from_object, [ :evas_map, :evas_object ], :void ],
         # EAPI void evas_map_util_points_populate_from_geometry (Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_geometry, [ :evas_map_p, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_points_populate_from_geometry, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_points_color_set (Evas_Map *m, int r, int g, int b, int a);
-        [ :evas_map_util_points_color_set, [ :evas_map_p, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_points_color_set, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_rotate (Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_rotate, [ :evas_map_p, :double, :int, :int ], :void ],
+        [ :evas_map_util_rotate, [ :evas_map, :double, :int, :int ], :void ],
         # EAPI void evas_map_util_zoom (Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_zoom, [ :evas_map_p, :double, :double, :int, :int ], :void ],
+        [ :evas_map_util_zoom, [ :evas_map, :double, :double, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_rotate (Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz);
-        [ :evas_map_util_3d_rotate, [ :evas_map_p, :double, :double, :double, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_rotate, [ :evas_map, :double, :double, :double, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_lighting (Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab);
-        [ :evas_map_util_3d_lighting, [ :evas_map_p, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_lighting, [ :evas_map, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_perspective (Evas_Map *m, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
-        [ :evas_map_util_3d_perspective, [ :evas_map_p, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_perspective, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI Eina_Bool evas_map_util_clockwise_get (Evas_Map *m);
-        [ :evas_map_util_clockwise_get, [ :evas_map_p ], :eina_bool ],
+        [ :evas_map_util_clockwise_get, [ :evas_map ], :bool ],
         # EAPI Evas_Map *evas_map_new (int count);
-        [ :evas_map_new, [ :int ], :evas_map_p ],
+        [ :evas_map_new, [ :int ], :evas_map ],
         # EAPI void evas_map_smooth_set (Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_smooth_set, [ :evas_map_p, :eina_bool ], :void ],
+        [ :evas_map_smooth_set, [ :evas_map, :bool ], :void ],
         # EAPI Eina_Bool evas_map_smooth_get (const Evas_Map *m);
-        [ :evas_map_smooth_get, [ :evas_map_p ], :eina_bool ],
+        [ :evas_map_smooth_get, [ :evas_map ], :bool ],
         # EAPI void evas_map_alpha_set (Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_alpha_set, [ :evas_map_p, :eina_bool ], :void ],
+        [ :evas_map_alpha_set, [ :evas_map, :bool ], :void ],
         # EAPI Eina_Bool evas_map_alpha_get (const Evas_Map *m);
-        [ :evas_map_alpha_get, [ :evas_map_p ], :eina_bool ],
+        [ :evas_map_alpha_get, [ :evas_map ], :bool ],
         # EAPI Evas_Map *evas_map_dup (const Evas_Map *m);
-        [ :evas_map_dup, [ :evas_map_p ], :evas_map_p ],
+        [ :evas_map_dup, [ :evas_map ], :evas_map ],
         # EAPI void evas_map_free (Evas_Map *m);
-        [ :evas_map_free, [ :evas_map_p ], :void ],
+        [ :evas_map_free, [ :evas_map ], :void ],
         # EAPI int evas_map_count_get (const Evas_Map *m);
-        [ :evas_map_count_get, [ :evas_map_p ], :int ],
+        [ :evas_map_count_get, [ :evas_map ], :int ],
         # EAPI void evas_map_point_coord_set (Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z);
-        [ :evas_map_point_coord_set, [ :evas_map_p, :int, :int, :int, :int ], :void ],
+        [ :evas_map_point_coord_set, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_point_coord_get (const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z);
-        [ :evas_map_point_coord_get, [ :evas_map_p, :int, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_map_point_coord_get, [ :evas_map, :int, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_map_point_image_uv_set (Evas_Map *m, int idx, double u, double v);
-        [ :evas_map_point_image_uv_set, [ :evas_map_p, :int, :double, :double ], :void ],
+        [ :evas_map_point_image_uv_set, [ :evas_map, :int, :double, :double ], :void ],
         # EAPI void evas_map_point_image_uv_get (const Evas_Map *m, int idx, double *u, double *v);
-        [ :evas_map_point_image_uv_get, [ :evas_map_p, :int, :double_p, :double_p ], :void ],
+        [ :evas_map_point_image_uv_get, [ :evas_map, :int, :pointer, :pointer ], :void ],
         # EAPI void evas_map_point_color_set (Evas_Map *m, int idx, int r, int g, int b, int a);
-        [ :evas_map_point_color_set, [ :evas_map_p, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_point_color_set, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_point_color_get (const Evas_Map *m, int idx, int *r, int *g, int *b, int *a);
-        [ :evas_map_point_color_get, [ :evas_map_p, :int, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_map_point_color_get, [ :evas_map, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_min_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_min_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_size_hint_min_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_min_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_min_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_size_hint_min_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_max_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_max_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_size_hint_max_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_max_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_max_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_size_hint_max_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_request_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_request_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_size_hint_request_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_request_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_request_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_size_hint_request_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_aspect_get (const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_aspect_get, [ :evas_object_p, :evas_aspect_control_p, :int_p, :int_p ], :void ],
+        [ :evas_object_size_hint_aspect_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_aspect_set (Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_aspect_set, [ :evas_object_p, :evas_aspect_control, :int, :int ], :void ],
+        [ :evas_object_size_hint_aspect_set, [ :evas_object, :evas_aspect_control, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_align_get (const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
+        [ :evas_object_size_hint_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_align_set (Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_align_set, [ :evas_object_p, :double, :double ], :void ],
+        [ :evas_object_size_hint_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_weight_get (const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_weight_get, [ :evas_object_p, :double_p, :double_p ], :void ],
+        [ :evas_object_size_hint_weight_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_weight_set (Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_weight_set, [ :evas_object_p, :double, :double ], :void ],
+        [ :evas_object_size_hint_weight_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_padding_get (const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_size_hint_padding_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_size_hint_padding_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_padding_set (Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
-        [ :evas_object_size_hint_padding_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_size_hint_padding_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_data_set (Evas_Object *obj, const char *key, const void *data);
-        [ :evas_object_data_set, [ :evas_object_p, :string, :void_p ], :void ],
+        [ :evas_object_data_set, [ :evas_object, :string, :pointer ], :void ],
         # EAPI void *evas_object_data_get (const Evas_Object *obj, const char *key);
-        [ :evas_object_data_get, [ :evas_object_p, :string ], :void_p ],
+        [ :evas_object_data_get, [ :evas_object, :string ], :pointer ],
         # EAPI void *evas_object_data_del (Evas_Object *obj, const char *key);
-        [ :evas_object_data_del, [ :evas_object_p, :string ], :void_p ],
+        [ :evas_object_data_del, [ :evas_object, :string ], :pointer ],
         # EAPI void evas_object_pointer_mode_set (Evas_Object *obj, Evas_Object_Pointer_Mode setting);
-        [ :evas_object_pointer_mode_set, [ :evas_object_p, :evas_object_pointer_mode ], :void ],
+        [ :evas_object_pointer_mode_set, [ :evas_object, :evas_object_pointer_mode ], :void ],
         # EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get (const Evas_Object *obj);
-        [ :evas_object_pointer_mode_get, [ :evas_object_p ], :evas_object_pointer_mode ],
+        [ :evas_object_pointer_mode_get, [ :evas_object ], :evas_object_pointer_mode ],
         # EAPI void evas_object_anti_alias_set (Evas_Object *obj, Eina_Bool antialias);
-        [ :evas_object_anti_alias_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_anti_alias_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_anti_alias_get (const Evas_Object *obj);
-        [ :evas_object_anti_alias_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_anti_alias_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_scale_set (Evas_Object *obj, double scale);
-        [ :evas_object_scale_set, [ :evas_object_p, :double ], :void ],
+        [ :evas_object_scale_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_scale_get (const Evas_Object *obj);
-        [ :evas_object_scale_get, [ :evas_object_p ], :double ],
+        [ :evas_object_scale_get, [ :evas_object ], :double ],
         # EAPI void evas_object_render_op_set (Evas_Object *obj, Evas_Render_Op op);
-        [ :evas_object_render_op_set, [ :evas_object_p, :evas_render_op ], :void ],
+        [ :evas_object_render_op_set, [ :evas_object, :evas_render_op ], :void ],
         # EAPI Evas_Render_Op evas_object_render_op_get (const Evas_Object *obj);
-        [ :evas_object_render_op_get, [ :evas_object_p ], :evas_render_op ],
+        [ :evas_object_render_op_get, [ :evas_object ], :evas_render_op ],
         # EAPI void evas_object_precise_is_inside_set(Evas_Object *obj, Eina_Bool precise);
-        [ :evas_object_precise_is_inside_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_precise_is_inside_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_precise_is_inside_get(const Evas_Object *obj);
-        [ :evas_object_precise_is_inside_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_precise_is_inside_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_static_clip_set (Evas_Object *obj, Eina_Bool is_static_clip);
-        [ :evas_object_static_clip_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_static_clip_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_static_clip_get (const Evas_Object *obj);
-        [ :evas_object_static_clip_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_static_clip_get, [ :evas_object ], :bool ],
         # EAPI Evas_Object *evas_focus_get (const Evas *e);
-        [ :evas_focus_get, [ :evas_p ], :evas_object_p ],
+        [ :evas_focus_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_name_find (const Evas *e, const char *name);
-        [ :evas_object_name_find, [ :evas_p, :string ], :evas_object_p ],
+        [ :evas_object_name_find, [ :evas, :string ], :evas_object ],
+        # EAPI Evas_Object *evas_object_name_child_find (const Evas_Object *obj, const char *name, int recurse);
+        [ :evas_object_name_child_find, [ :evas_object, :string, :int ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_at_xy_get (const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_at_xy_get, [ :evas_p, :int, :int, :eina_bool, :eina_bool ], :evas_object_p ],
+        [ :evas_object_top_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_at_pointer_get (const Evas *e);
-        [ :evas_object_top_at_pointer_get, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_top_at_pointer_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_in_rectangle_get (const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_in_rectangle_get, [ :evas_p, :int, :int, :int, :int, :eina_bool, :eina_bool ], :evas_object_p ],
+        [ :evas_object_top_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :evas_object ],
         # EAPI Eina_List *evas_objects_at_xy_get (const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_at_xy_get, [ :evas_p, :int, :int, :eina_bool, :eina_bool ], :eina_list_p ],
+        [ :evas_objects_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Eina_List *evas_objects_in_rectangle_get (const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_in_rectangle_get, [ :evas_p, :int, :int, :int, :int, :eina_bool, :eina_bool ], :eina_list_p ],
+        [ :evas_objects_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Evas_Object *evas_object_bottom_get (const Evas *e);
-        [ :evas_object_bottom_get, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_bottom_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_get (const Evas *e);
-        [ :evas_object_top_get, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_top_get, [ :evas ], :evas_object ],
         # EAPI void evas_object_intercept_show_callback_add (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data);
-        [ :evas_object_intercept_show_callback_add, [ :evas_object_p, :evas_object_intercept_show_cb, :void_p ], :void ],
+        [ :evas_object_intercept_show_callback_add, [ :evas_object, :evas_object_intercept_show_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_show_callback_del (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func);
-        [ :evas_object_intercept_show_callback_del, [ :evas_object_p, :evas_object_intercept_show_cb ], :void_p ],
+        [ :evas_object_intercept_show_callback_del, [ :evas_object, :evas_object_intercept_show_cb ], :pointer ],
         # EAPI void evas_object_intercept_hide_callback_add (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data);
-        [ :evas_object_intercept_hide_callback_add, [ :evas_object_p, :evas_object_intercept_hide_cb, :void_p ], :void ],
+        [ :evas_object_intercept_hide_callback_add, [ :evas_object, :evas_object_intercept_hide_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_hide_callback_del (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func);
-        [ :evas_object_intercept_hide_callback_del, [ :evas_object_p, :evas_object_intercept_hide_cb ], :void_p ],
+        [ :evas_object_intercept_hide_callback_del, [ :evas_object, :evas_object_intercept_hide_cb ], :pointer ],
         # EAPI void evas_object_intercept_move_callback_add (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data);
-        [ :evas_object_intercept_move_callback_add, [ :evas_object_p, :evas_object_intercept_move_cb, :void_p ], :void ],
+        [ :evas_object_intercept_move_callback_add, [ :evas_object, :evas_object_intercept_move_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_move_callback_del (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func);
-        [ :evas_object_intercept_move_callback_del, [ :evas_object_p, :evas_object_intercept_move_cb ], :void_p ],
+        [ :evas_object_intercept_move_callback_del, [ :evas_object, :evas_object_intercept_move_cb ], :pointer ],
         # EAPI void evas_object_intercept_resize_callback_add (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data);
-        [ :evas_object_intercept_resize_callback_add, [ :evas_object_p, :evas_object_intercept_resize_cb, :void_p ], :void ],
+        [ :evas_object_intercept_resize_callback_add, [ :evas_object, :evas_object_intercept_resize_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_resize_callback_del (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func);
-        [ :evas_object_intercept_resize_callback_del, [ :evas_object_p, :evas_object_intercept_resize_cb ], :void_p ],
+        [ :evas_object_intercept_resize_callback_del, [ :evas_object, :evas_object_intercept_resize_cb ], :pointer ],
         # EAPI void evas_object_intercept_raise_callback_add (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data);
-        [ :evas_object_intercept_raise_callback_add, [ :evas_object_p, :evas_object_intercept_raise_cb, :void_p ], :void ],
+        [ :evas_object_intercept_raise_callback_add, [ :evas_object, :evas_object_intercept_raise_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_raise_callback_del (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func);
-        [ :evas_object_intercept_raise_callback_del, [ :evas_object_p, :evas_object_intercept_raise_cb ], :void_p ],
+        [ :evas_object_intercept_raise_callback_del, [ :evas_object, :evas_object_intercept_raise_cb ], :pointer ],
         # EAPI void evas_object_intercept_lower_callback_add (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data);
-        [ :evas_object_intercept_lower_callback_add, [ :evas_object_p, :evas_object_intercept_lower_cb, :void_p ], :void ],
+        [ :evas_object_intercept_lower_callback_add, [ :evas_object, :evas_object_intercept_lower_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_lower_callback_del (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func);
-        [ :evas_object_intercept_lower_callback_del, [ :evas_object_p, :evas_object_intercept_lower_cb ], :void_p ],
+        [ :evas_object_intercept_lower_callback_del, [ :evas_object, :evas_object_intercept_lower_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_above_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data);
-        [ :evas_object_intercept_stack_above_callback_add, [ :evas_object_p, :evas_object_intercept_stack_above_cb, :void_p ], :void ],
+        [ :evas_object_intercept_stack_above_callback_add, [ :evas_object, :evas_object_intercept_stack_above_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_above_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func);
-        [ :evas_object_intercept_stack_above_callback_del, [ :evas_object_p, :evas_object_intercept_stack_above_cb ], :void_p ],
+        [ :evas_object_intercept_stack_above_callback_del, [ :evas_object, :evas_object_intercept_stack_above_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_below_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data);
-        [ :evas_object_intercept_stack_below_callback_add, [ :evas_object_p, :evas_object_intercept_stack_below_cb, :void_p ], :void ],
+        [ :evas_object_intercept_stack_below_callback_add, [ :evas_object, :evas_object_intercept_stack_below_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_below_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func);
-        [ :evas_object_intercept_stack_below_callback_del, [ :evas_object_p, :evas_object_intercept_stack_below_cb ], :void_p ],
+        [ :evas_object_intercept_stack_below_callback_del, [ :evas_object, :evas_object_intercept_stack_below_cb ], :pointer ],
         # EAPI void evas_object_intercept_layer_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data);
-        [ :evas_object_intercept_layer_set_callback_add, [ :evas_object_p, :evas_object_intercept_layer_set_cb, :void_p ], :void ],
+        [ :evas_object_intercept_layer_set_callback_add, [ :evas_object, :evas_object_intercept_layer_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_layer_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func);
-        [ :evas_object_intercept_layer_set_callback_del, [ :evas_object_p, :evas_object_intercept_layer_set_cb ], :void_p ],
+        [ :evas_object_intercept_layer_set_callback_del, [ :evas_object, :evas_object_intercept_layer_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_color_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data);
-        [ :evas_object_intercept_color_set_callback_add, [ :evas_object_p, :evas_object_intercept_color_set_cb, :void_p ], :void ],
+        [ :evas_object_intercept_color_set_callback_add, [ :evas_object, :evas_object_intercept_color_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_color_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func);
-        [ :evas_object_intercept_color_set_callback_del, [ :evas_object_p, :evas_object_intercept_color_set_cb ], :void_p ],
+        [ :evas_object_intercept_color_set_callback_del, [ :evas_object, :evas_object_intercept_color_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data);
-        [ :evas_object_intercept_clip_set_callback_add, [ :evas_object_p, :evas_object_intercept_clip_set_cb, :void_p ], :void ],
+        [ :evas_object_intercept_clip_set_callback_add, [ :evas_object, :evas_object_intercept_clip_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func);
-        [ :evas_object_intercept_clip_set_callback_del, [ :evas_object_p, :evas_object_intercept_clip_set_cb ], :void_p ],
+        [ :evas_object_intercept_clip_set_callback_del, [ :evas_object, :evas_object_intercept_clip_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_unset_callback_add (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data);
-        [ :evas_object_intercept_clip_unset_callback_add, [ :evas_object_p, :evas_object_intercept_clip_unset_cb, :void_p ], :void ],
+        [ :evas_object_intercept_clip_unset_callback_add, [ :evas_object, :evas_object_intercept_clip_unset_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_unset_callback_del (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func);
-        [ :evas_object_intercept_clip_unset_callback_del, [ :evas_object_p, :evas_object_intercept_clip_unset_cb ], :void_p ],
+        [ :evas_object_intercept_clip_unset_callback_del, [ :evas_object, :evas_object_intercept_clip_unset_cb ], :pointer ],
         # EAPI Evas_Object *evas_object_rectangle_add (Evas *e);
-        [ :evas_object_rectangle_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_rectangle_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_image_add (Evas *e);
-        [ :evas_object_image_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_image_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_image_filled_add (Evas *e);
-        [ :evas_object_image_filled_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_image_filled_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_image_memfile_set (Evas_Object *obj, void *data, int size, char *format, char *key);
-        [ :evas_object_image_memfile_set, [ :evas_object_p, :void_p, :int, :string, :string ], :void ],
+        [ :evas_object_image_memfile_set, [ :evas_object, :pointer, :int, :string, :string ], :void ],
         # EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key);
-        [ :evas_object_image_file_set, [ :evas_object_p, :string, :string ], :void ],
+        [ :evas_object_image_file_set, [ :evas_object, :string, :string ], :void ],
         # EAPI void evas_object_image_file_get (const Evas_Object *obj, const char **file, const char **key);
-        [ :evas_object_image_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
+        [ :evas_object_image_file_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b);
-        [ :evas_object_image_border_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_border_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_border_get (const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_image_border_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_image_border_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_center_fill_set (Evas_Object *obj, Evas_Border_Fill_Mode fill);
-        [ :evas_object_image_border_center_fill_set, [ :evas_object_p, :evas_border_fill_mode ], :void ],
+        [ :evas_object_image_border_center_fill_set, [ :evas_object, :evas_border_fill_mode ], :void ],
         # EAPI Evas_Border_Fill_Mode evas_object_image_border_center_fill_get (const Evas_Object *obj);
-        [ :evas_object_image_border_center_fill_get, [ :evas_object_p ], :evas_border_fill_mode ],
+        [ :evas_object_image_border_center_fill_get, [ :evas_object ], :evas_border_fill_mode ],
         # EAPI void evas_object_image_filled_set (Evas_Object *obj, Eina_Bool setting);
-        [ :evas_object_image_filled_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_filled_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_filled_get (const Evas_Object *obj);
-        [ :evas_object_image_filled_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_filled_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_border_scale_set (Evas_Object *obj, double scale);
-        [ :evas_object_image_border_scale_set, [ :evas_object_p, :double ], :void ],
+        [ :evas_object_image_border_scale_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_image_border_scale_get (const Evas_Object *obj);
-        [ :evas_object_image_border_scale_get, [ :evas_object_p ], :double ],
+        [ :evas_object_image_border_scale_get, [ :evas_object ], :double ],
         # EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_image_fill_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_fill_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_image_fill_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_image_fill_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_fill_spread_set (Evas_Object *obj, Evas_Fill_Spread spread);
-        [ :evas_object_image_fill_spread_set, [ :evas_object_p, :evas_fill_spread ], :void ],
+        [ :evas_object_image_fill_spread_set, [ :evas_object, :evas_fill_spread ], :void ],
         # EAPI Evas_Fill_Spread evas_object_image_fill_spread_get (const Evas_Object *obj);
-        [ :evas_object_image_fill_spread_get, [ :evas_object_p ], :evas_fill_spread ],
+        [ :evas_object_image_fill_spread_get, [ :evas_object ], :evas_fill_spread ],
         # EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h);
-        [ :evas_object_image_size_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_image_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_image_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI int evas_object_image_stride_get (const Evas_Object *obj);
-        [ :evas_object_image_stride_get, [ :evas_object_p ], :int ],
+        [ :evas_object_image_stride_get, [ :evas_object ], :int ],
         # EAPI Evas_Load_Error evas_object_image_load_error_get (const Evas_Object *obj);
-        [ :evas_object_image_load_error_get, [ :evas_object_p ], :evas_load_error ],
+        [ :evas_object_image_load_error_get, [ :evas_object ], :evas_load_error ],
         # EAPI void evas_object_image_data_set (Evas_Object *obj, void *data);
-        [ :evas_object_image_data_set, [ :evas_object_p, :void_p ], :void ],
+        [ :evas_object_image_data_set, [ :evas_object, :pointer ], :void ],
         # EAPI void *evas_object_image_data_get (const Evas_Object *obj, Eina_Bool for_writing);
-        [ :evas_object_image_data_get, [ :evas_object_p, :eina_bool ], :void_p ],
+        [ :evas_object_image_data_get, [ :evas_object, :bool ], :pointer ],
         # EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
-        [ :evas_object_image_data_convert, [ :evas_object_p, :evas_colorspace ], :void_p ],
+        [ :evas_object_image_data_convert, [ :evas_object, :evas_colorspace ], :pointer ],
         # EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data);
-        [ :evas_object_image_data_copy_set, [ :evas_object_p, :void_p ], :void ],
+        [ :evas_object_image_data_copy_set, [ :evas_object, :pointer ], :void ],
         # EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_data_update_add, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_data_update_add, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_alpha_set (Evas_Object *obj, Eina_Bool has_alpha);
-        [ :evas_object_image_alpha_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_alpha_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_alpha_get (const Evas_Object *obj);
-        [ :evas_object_image_alpha_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_alpha_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth_scale);
-        [ :evas_object_image_smooth_scale_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_smooth_scale_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_smooth_scale_get (const Evas_Object *obj);
-        [ :evas_object_image_smooth_scale_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_smooth_scale_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_preload (Evas_Object *obj, Eina_Bool cancel);
-        [ :evas_object_image_preload, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_preload, [ :evas_object, :bool ], :void ],
         # EAPI void evas_object_image_reload (Evas_Object *obj);
-        [ :evas_object_image_reload, [ :evas_object_p ], :void ],
+        [ :evas_object_image_reload, [ :evas_object ], :void ],
         # EAPI Eina_Bool evas_object_image_save (const Evas_Object *obj, const char *file, const char *key, const char *flags);
-        [ :evas_object_image_save, [ :evas_object_p, :string, :string, :string ], :eina_bool ],
+        [ :evas_object_image_save, [ :evas_object, :string, :string, :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_pixels_import (Evas_Object *obj, Evas_Pixel_Import_Source *pixels);
-        [ :evas_object_image_pixels_import, [ :evas_object_p, :evas_pixel_import_source_p ], :eina_bool ],
+        [ :evas_object_image_pixels_import, [ :evas_object, :evas_pixel_import_source ], :bool ],
         # EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data);
-        [ :evas_object_image_pixels_get_callback_set, [ :evas_object_p, :evas_object_image_pixels_get_cb, :void_p ], :void ],
+        [ :evas_object_image_pixels_get_callback_set, [ :evas_object, :evas_object_image_pixels_get_cb, :pointer ], :void ],
         # EAPI void evas_object_image_pixels_dirty_set (Evas_Object *obj, Eina_Bool dirty);
-        [ :evas_object_image_pixels_dirty_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_pixels_dirty_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_pixels_dirty_get (const Evas_Object *obj);
-        [ :evas_object_image_pixels_dirty_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_pixels_dirty_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_load_dpi_set (Evas_Object *obj, double dpi);
-        [ :evas_object_image_load_dpi_set, [ :evas_object_p, :double ], :void ],
+        [ :evas_object_image_load_dpi_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_image_load_dpi_get (const Evas_Object *obj);
-        [ :evas_object_image_load_dpi_get, [ :evas_object_p ], :double ],
+        [ :evas_object_image_load_dpi_get, [ :evas_object ], :double ],
         # EAPI void evas_object_image_load_size_set (Evas_Object *obj, int w, int h);
-        [ :evas_object_image_load_size_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_image_load_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_image_load_size_get (const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_load_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_image_load_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_scale_down_set (Evas_Object *obj, int scale_down);
-        [ :evas_object_image_load_scale_down_set, [ :evas_object_p, :int ], :void ],
+        [ :evas_object_image_load_scale_down_set, [ :evas_object, :int ], :void ],
         # EAPI int evas_object_image_load_scale_down_get (const Evas_Object *obj);
-        [ :evas_object_image_load_scale_down_get, [ :evas_object_p ], :int ],
+        [ :evas_object_image_load_scale_down_get, [ :evas_object ], :int ],
         # EAPI void evas_object_image_load_region_set (Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_load_region_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_load_region_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_load_region_get (const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :evas_object_image_load_region_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_image_load_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_orientation_set (Evas_Object *obj, Eina_Bool enable);
-        [ :evas_object_image_load_orientation_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_load_orientation_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_load_orientation_get (const Evas_Object *obj);
-        [ :evas_object_image_load_orientation_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_load_orientation_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_colorspace_set (Evas_Object *obj, Evas_Colorspace cspace);
-        [ :evas_object_image_colorspace_set, [ :evas_object_p, :evas_colorspace ], :void ],
+        [ :evas_object_image_colorspace_set, [ :evas_object, :evas_colorspace ], :void ],
         # EAPI Evas_Colorspace evas_object_image_colorspace_get (const Evas_Object *obj);
-        [ :evas_object_image_colorspace_get, [ :evas_object_p ], :evas_colorspace ],
+        [ :evas_object_image_colorspace_get, [ :evas_object ], :evas_colorspace ],
         # EAPI Eina_Bool evas_object_image_region_support_get (const Evas_Object *obj);
-        [ :evas_object_image_region_support_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_region_support_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_native_surface_set (Evas_Object *obj, Evas_Native_Surface *surf);
-        [ :evas_object_image_native_surface_set, [ :evas_object_p, :evas_native_surface_p ], :void ],
+        [ :evas_object_image_native_surface_set, [ :evas_object, :evas_native_surface ], :void ],
         # EAPI Evas_Native_Surface *evas_object_image_native_surface_get (const Evas_Object *obj);
-        [ :evas_object_image_native_surface_get, [ :evas_object_p ], :evas_native_surface_p ],
+        [ :evas_object_image_native_surface_get, [ :evas_object ], :evas_native_surface ],
         # EAPI void evas_object_image_video_surface_set (Evas_Object *obj, Evas_Video_Surface *surf);
-        [ :evas_object_image_video_surface_set, [ :evas_object_p, :evas_video_surface_p ], :void ],
+        [ :evas_object_image_video_surface_set, [ :evas_object, :evas_video_surface ], :void ],
         # EAPI const Evas_Video_Surface *evas_object_image_video_surface_get (const Evas_Object *obj);
-        [ :evas_object_image_video_surface_get, [ :evas_object_p ], :evas_video_surface_p ],
+        [ :evas_object_image_video_surface_get, [ :evas_object ], :evas_video_surface ],
         # EAPI void evas_object_image_scale_hint_set (Evas_Object *obj, Evas_Image_Scale_Hint hint);
-        [ :evas_object_image_scale_hint_set, [ :evas_object_p, :evas_image_scale_hint ], :void ],
+        [ :evas_object_image_scale_hint_set, [ :evas_object, :evas_image_scale_hint ], :void ],
         # EAPI Evas_Image_Scale_Hint evas_object_image_scale_hint_get (const Evas_Object *obj);
-        [ :evas_object_image_scale_hint_get, [ :evas_object_p ], :evas_image_scale_hint ],
+        [ :evas_object_image_scale_hint_get, [ :evas_object ], :evas_image_scale_hint ],
         # EAPI void evas_object_image_content_hint_set (Evas_Object *obj, Evas_Image_Content_Hint hint);
-        [ :evas_object_image_content_hint_set, [ :evas_object_p, :evas_image_content_hint ], :void ],
+        [ :evas_object_image_content_hint_set, [ :evas_object, :evas_image_content_hint ], :void ],
         # EAPI Evas_Image_Content_Hint evas_object_image_content_hint_get (const Evas_Object *obj);
-        [ :evas_object_image_content_hint_get, [ :evas_object_p ], :evas_image_content_hint ],
+        [ :evas_object_image_content_hint_get, [ :evas_object ], :evas_image_content_hint ],
         # EAPI void evas_object_image_alpha_mask_set (Evas_Object *obj, Eina_Bool ismask);
-        [ :evas_object_image_alpha_mask_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_image_alpha_mask_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_source_set (Evas_Object *obj, Evas_Object *src);
-        [ :evas_object_image_source_set, [ :evas_object_p, :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_source_set, [ :evas_object, :evas_object ], :bool ],
         # EAPI Evas_Object *evas_object_image_source_get (Evas_Object *obj);
-        [ :evas_object_image_source_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_image_source_get, [ :evas_object ], :evas_object ],
         # EAPI Eina_Bool evas_object_image_source_unset (Evas_Object *obj);
-        [ :evas_object_image_source_unset, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_source_unset, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_image_extension_can_load_get(const char *file);
-        [ :evas_object_image_extension_can_load_get, [ :string ], :eina_bool ],
+        [ :evas_object_image_extension_can_load_get, [ :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_extension_can_load_fast_get(const char *file);
-        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :eina_bool ],
+        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_animated_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_image_animated_get, [ :evas_object ], :bool ],
         # EAPI int evas_object_image_animated_frame_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_frame_count_get, [ :evas_object_p ], :int ],
+        [ :evas_object_image_animated_frame_count_get, [ :evas_object ], :int ],
         # EAPI Evas_Image_Animated_Loop_Hint evas_object_image_animated_loop_type_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_type_get, [ :evas_object_p ], :evas_image_animated_loop_hint ],
+        [ :evas_object_image_animated_loop_type_get, [ :evas_object ], :evas_image_animated_loop_hint ],
         # EAPI int evas_object_image_animated_loop_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_count_get, [ :evas_object_p ], :int ],
+        [ :evas_object_image_animated_loop_count_get, [ :evas_object ], :int ],
         # EAPI double evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int fram_num);
-        [ :evas_object_image_animated_frame_duration_get, [ :evas_object_p, :int, :int ], :double ],
+        [ :evas_object_image_animated_frame_duration_get, [ :evas_object, :int, :int ], :double ],
         # EAPI void evas_object_image_animated_frame_set(Evas_Object *obj, int frame_num);
-        [ :evas_object_image_animated_frame_set, [ :evas_object_p, :int ], :void ],
+        [ :evas_object_image_animated_frame_set, [ :evas_object, :int ], :void ],
         # EAPI Evas_Object *evas_object_text_add (Evas *e);
-        [ :evas_object_text_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_text_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_text_font_source_set (Evas_Object *obj, const char *font);
-        [ :evas_object_text_font_source_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_text_font_source_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_font_source_get (const Evas_Object *obj);
-        [ :evas_object_text_font_source_get, [ :evas_object_p ], :string ],
+        [ :evas_object_text_font_source_get, [ :evas_object ], :string ],
         # EAPI void evas_object_text_font_set (Evas_Object *obj, const char *font, Evas_Font_Size size);
-        [ :evas_object_text_font_set, [ :evas_object_p, :string, :int ], :void ],
+        [ :evas_object_text_font_set, [ :evas_object, :string, :int ], :void ],
         # EAPI void evas_object_text_font_get (const Evas_Object *obj, const char **font, Evas_Font_Size *size);
-        [ :evas_object_text_font_get, [ :evas_object_p, :string_array, :int_p ], :void ],
+        [ :evas_object_text_font_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_text_set (Evas_Object *obj, const char *text);
-        [ :evas_object_text_text_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_text_text_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_text_get (const Evas_Object *obj);
-        [ :evas_object_text_text_get, [ :evas_object_p ], :string ],
+        [ :evas_object_text_text_get, [ :evas_object ], :string ],
         # EAPI void evas_object_text_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_text_bidi_delimiters_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_text_bidi_delimiters_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_text_bidi_delimiters_get, [ :evas_object_p ], :string ],
+        [ :evas_object_text_bidi_delimiters_get, [ :evas_object ], :string ],
         # EAPI Evas_Coord evas_object_text_ascent_get (const Evas_Object *obj);
-        [ :evas_object_text_ascent_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_ascent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_descent_get (const Evas_Object *obj);
-        [ :evas_object_text_descent_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_descent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_max_ascent_get (const Evas_Object *obj);
-        [ :evas_object_text_max_ascent_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_max_ascent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_max_descent_get (const Evas_Object *obj);
-        [ :evas_object_text_max_descent_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_max_descent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_horiz_advance_get(const Evas_Object *obj);
-        [ :evas_object_text_horiz_advance_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_horiz_advance_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_vert_advance_get (const Evas_Object *obj);
-        [ :evas_object_text_vert_advance_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_vert_advance_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_inset_get (const Evas_Object *obj);
-        [ :evas_object_text_inset_get, [ :evas_object_p ], :int ],
+        [ :evas_object_text_inset_get, [ :evas_object ], :int ],
         # EAPI Eina_Bool evas_object_text_char_pos_get (const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_pos_get, [ :evas_object_p, :int, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :evas_object_text_char_pos_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI int evas_object_text_char_coords_get (const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_coords_get, [ :evas_object_p, :int, :int, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :evas_object_text_char_coords_get, [ :evas_object, :int, :int, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_object_text_last_up_to_pos (const Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_text_last_up_to_pos, [ :evas_object_p, :int, :int ], :int ],
+        [ :evas_object_text_last_up_to_pos, [ :evas_object, :int, :int ], :int ],
         # EAPI Evas_Text_Style_Type evas_object_text_style_get (const Evas_Object *obj);
-        [ :evas_object_text_style_get, [ :evas_object_p ], :evas_text_style_type ],
+        [ :evas_object_text_style_get, [ :evas_object ], :evas_text_style_type ],
         # EAPI void evas_object_text_style_set (Evas_Object *obj, Evas_Text_Style_Type type);
-        [ :evas_object_text_style_set, [ :evas_object_p, :evas_text_style_type ], :void ],
+        [ :evas_object_text_style_set, [ :evas_object, :evas_text_style_type ], :void ],
         # EAPI void evas_object_text_shadow_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_shadow_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_shadow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_shadow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_shadow_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_text_shadow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_text_glow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow2_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow2_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow2_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow2_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow2_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_text_glow2_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_outline_color_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_outline_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_outline_color_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_text_outline_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_style_pad_get (const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_text_style_pad_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_text_style_pad_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_BiDi_Direction evas_object_text_direction_get (const Evas_Object *obj);
-        [ :evas_object_text_direction_get, [ :evas_object_p ], :evas_bidi_direction ],
+        [ :evas_object_text_direction_get, [ :evas_object ], :evas_bidi_direction ],
         # EAPI Evas_Object *evas_object_textblock_add(Evas *e);
-        [ :evas_object_textblock_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_textblock_add, [ :evas ], :evas_object ],
         # EAPI const char *evas_textblock_escape_string_get(const char *escape);
         [ :evas_textblock_escape_string_get, [ :string ], :string ],
         # EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret);
-        [ :evas_textblock_string_escape_get, [ :string, :int_p ], :string ],
+        [ :evas_textblock_string_escape_get, [ :string, :pointer ], :string ],
         # EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end);
         [ :evas_textblock_escape_string_range_get, [ :string, :string ], :string ],
         # EAPI char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_markup_to_utf8, [ :evas_object_p, :string ], :string ],
+        [ :evas_textblock_text_markup_to_utf8, [ :evas_object, :string ], :string ],
         # EAPI char *evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_utf8_to_markup, [ :evas_object_p, :string ], :string ],
+        [ :evas_textblock_text_utf8_to_markup, [ :evas_object, :string ], :string ],
         # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
-        [ :evas_textblock_style_new, [  ], :evas_textblock_style_p ],
+        [ :evas_textblock_style_new, [  ], :evas_textblock_style ],
         # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_free, [ :evas_textblock_style_p ], :void ],
+        [ :evas_textblock_style_free, [ :evas_textblock_style ], :void ],
         # EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
-        [ :evas_textblock_style_set, [ :evas_textblock_style_p, :string ], :void ],
+        [ :evas_textblock_style_set, [ :evas_textblock_style, :string ], :void ],
         # EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_get, [ :evas_textblock_style_p ], :string ],
+        [ :evas_textblock_style_get, [ :evas_textblock_style ], :string ],
         # EAPI void evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-        [ :evas_object_textblock_style_set, [ :evas_object_p, :evas_textblock_style_p ], :void ],
+        [ :evas_object_textblock_style_set, [ :evas_object, :evas_textblock_style ], :void ],
         # EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj);
-        [ :evas_object_textblock_style_get, [ :evas_object_p ], :evas_textblock_style_p ],
+        [ :evas_object_textblock_style_get, [ :evas_object ], :evas_textblock_style ],
+        # EAPI void evas_object_textblock_style_user_set(Evas_Object *obj, Evas_Textblock_Style *ts);
+        [ :evas_object_textblock_style_user_set, [ :evas_object, :evas_textblock_style ], :void ],
+        # EAPI const Evas_Textblock_Style *evas_object_textblock_style_user_get(const Evas_Object *obj);
+        [ :evas_object_textblock_style_user_get, [ :evas_object ], :evas_textblock_style ],
         # EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
-        [ :evas_object_textblock_replace_char_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_textblock_replace_char_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_textblock_replace_char_get(Evas_Object *obj);
-        [ :evas_object_textblock_replace_char_get, [ :evas_object_p ], :string ],
+        [ :evas_object_textblock_replace_char_get, [ :evas_object ], :string ],
         # EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
-        [ :evas_object_textblock_valign_set, [ :evas_object_p, :double ], :void ],
+        [ :evas_object_textblock_valign_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
-        [ :evas_object_textblock_valign_get, [ :evas_object_p ], :double ],
+        [ :evas_object_textblock_valign_get, [ :evas_object ], :double ],
         # EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_textblock_bidi_delimiters_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_textblock_bidi_delimiters_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_textblock_bidi_delimiters_get, [ :evas_object_p ], :string ],
+        [ :evas_object_textblock_bidi_delimiters_get, [ :evas_object ], :string ],
         # EAPI void evas_object_textblock_legacy_newline_set(Evas_Object *obj, Eina_Bool mode);
-        [ :evas_object_textblock_legacy_newline_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_textblock_legacy_newline_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Evas_Object *obj);
-        [ :evas_object_textblock_legacy_newline_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_textblock_legacy_newline_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text);
-        [ :evas_object_textblock_text_markup_set, [ :evas_object_p, :string ], :void ],
+        [ :evas_object_textblock_text_markup_set, [ :evas_object, :string ], :void ],
         # EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_object_textblock_text_markup_prepend, [ :evas_textblock_cursor_p, :string ], :void ],
+        [ :evas_object_textblock_text_markup_prepend, [ :evas_textblock_cursor, :string ], :void ],
         # EAPI const char *evas_object_textblock_text_markup_get(const Evas_Object *obj);
-        [ :evas_object_textblock_text_markup_get, [ :evas_object_p ], :string ],
+        [ :evas_object_textblock_text_markup_get, [ :evas_object ], :string ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_get, [ :evas_object_p ], :evas_textblock_cursor_p ],
+        [ :evas_object_textblock_cursor_get, [ :evas_object ], :evas_textblock_cursor ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_new, [ :evas_object_p ], :evas_textblock_cursor_p ],
+        [ :evas_object_textblock_cursor_new, [ :evas_object ], :evas_textblock_cursor ],
         # EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_free, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_free, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_first, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_paragraph_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_last, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_paragraph_last, [ :evas_textblock_cursor ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_next, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_paragraph_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_prev, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_paragraph_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor);
-        [ :evas_textblock_node_format_list_get, [ :evas_object_p, :string ], :eina_list_p ],
+        [ :evas_textblock_node_format_list_get, [ :evas_object, :string ], :eina_list ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_first_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_first_get, [ :evas_object_p ], :evas_object_textblock_node_format_p ],
+        [ :evas_textblock_node_format_first_get, [ :evas_object ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_last_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_last_get, [ :evas_object_p ], :evas_object_textblock_node_format_p ],
+        [ :evas_textblock_node_format_last_get, [ :evas_object ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_next_get, [ :evas_object_textblock_node_format_p ], :evas_object_textblock_node_format_p ],
+        [ :evas_textblock_node_format_next_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_prev_get, [ :evas_object_textblock_node_format_p ], :evas_object_textblock_node_format_p ],
+        [ :evas_textblock_node_format_prev_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
         # EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_remove_pair, [ :evas_object_p, :evas_object_textblock_node_format_p ], :void ],
+        [ :evas_textblock_node_format_remove_pair, [ :evas_object, :evas_object_textblock_node_format ], :void ],
+        # EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n);
+        [ :evas_textblock_cursor_set_at_format, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_get, [ :evas_textblock_cursor_p ], :evas_object_textblock_node_format_p ],
+        [ :evas_textblock_cursor_format_get, [ :evas_textblock_cursor ], :evas_object_textblock_node_format ],
         # EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode);
-        [ :evas_textblock_node_format_text_get, [ :evas_object_textblock_node_format_p ], :string ],
+        [ :evas_textblock_node_format_text_get, [ :evas_object_textblock_node_format ], :string ],
         # EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
-        [ :evas_textblock_cursor_at_format_set, [ :evas_textblock_cursor_p, :evas_object_textblock_node_format_p ], :void ],
+        [ :evas_textblock_cursor_at_format_set, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_is_visible_get, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_format_is_visible_get, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_next, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_format_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_prev, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_format_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_is_format, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_is_format, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor ], :bool ],
         # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_last, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_paragraph_char_last, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_first, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_line_char_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_last, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_line_char_last, [ :evas_textblock_cursor ], :void ],
         # EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_pos_get, [ :evas_textblock_cursor_p ], :int ],
+        [ :evas_textblock_cursor_pos_get, [ :evas_textblock_cursor ], :int ],
         # EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
-        [ :evas_textblock_cursor_pos_set, [ :evas_textblock_cursor_p, :int ], :void ],
+        [ :evas_textblock_cursor_pos_set, [ :evas_textblock_cursor, :int ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
-        [ :evas_textblock_cursor_line_set, [ :evas_textblock_cursor_p, :int ], :eina_bool ],
+        [ :evas_textblock_cursor_line_set, [ :evas_textblock_cursor, :int ], :bool ],
         # EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_compare, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :int ],
+        [ :evas_textblock_cursor_compare, [ :evas_textblock_cursor, :evas_textblock_cursor ], :int ],
         # EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
-        [ :evas_textblock_cursor_copy, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_copy, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
         # EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_append, [ :evas_textblock_cursor_p, :string ], :int ],
+        [ :evas_textblock_cursor_text_append, [ :evas_textblock_cursor, :string ], :int ],
         # EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_prepend, [ :evas_textblock_cursor_p, :string ], :int ],
+        [ :evas_textblock_cursor_text_prepend, [ :evas_textblock_cursor, :string ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_append, [ :evas_textblock_cursor_p, :string ], :eina_bool ],
+        [ :evas_textblock_cursor_format_append, [ :evas_textblock_cursor, :string ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_prepend, [ :evas_textblock_cursor_p, :string ], :eina_bool ],
+        [ :evas_textblock_cursor_format_prepend, [ :evas_textblock_cursor, :string ], :bool ],
         # EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_delete, [ :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_char_delete, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_delete, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :void ],
+        [ :evas_textblock_cursor_range_delete, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
         # EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor_p ], :string ],
+        [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor ], :string ],
         # EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_length_get, [ :evas_textblock_cursor_p ], :int ],
+        [ :evas_textblock_cursor_paragraph_text_length_get, [ :evas_textblock_cursor ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end);
-        [ :evas_textblock_cursor_visible_range_get, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_visible_range_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :bool ],
         # EAPI Eina_List * evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_formats_get, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :eina_list_p ],
+        [ :evas_textblock_cursor_range_formats_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
         # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
-        [ :evas_textblock_cursor_range_text_get, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p, :evas_textblock_text_type ], :string ],
+        [ :evas_textblock_cursor_range_text_get, [ :evas_textblock_cursor, :evas_textblock_cursor, :evas_textblock_text_type ], :string ],
         # EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_content_get, [ :evas_textblock_cursor_p ], :string ],
+        [ :evas_textblock_cursor_content_get, [ :evas_textblock_cursor ], :string ],
         # EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype);
-        [ :evas_textblock_cursor_geometry_get, [ :evas_textblock_cursor_p, :int_p, :int_p, :int_p, :int_p, :evas_bidi_direction_p, :evas_textblock_cursor_type ], :int ],
+        [ :evas_textblock_cursor_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer, :pointer, :evas_textblock_cursor_type
+            ], :int ],
         # EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_char_geometry_get, [ :evas_textblock_cursor_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :evas_textblock_cursor_char_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch);
-        [ :evas_textblock_cursor_pen_geometry_get, [ :evas_textblock_cursor_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :evas_textblock_cursor_pen_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_line_geometry_get, [ :evas_textblock_cursor_p, :int_p, :int_p, :int_p, :int_p ], :int ],
+        [ :evas_textblock_cursor_line_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
-        [ :evas_textblock_cursor_char_coord_set, [ :evas_textblock_cursor_p, :int, :int ], :eina_bool ],
+        [ :evas_textblock_cursor_char_coord_set, [ :evas_textblock_cursor, :int, :int ], :bool ],
         # EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
-        [ :evas_textblock_cursor_line_coord_set, [ :evas_textblock_cursor_p, :int ], :int ],
+        [ :evas_textblock_cursor_line_coord_set, [ :evas_textblock_cursor, :int ], :int ],
         # EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_geometry_get, [ :evas_textblock_cursor_p, :evas_textblock_cursor_p ], :eina_list_p ],
+        [ :evas_textblock_cursor_range_geometry_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
         # EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_format_item_geometry_get, [ :evas_textblock_cursor_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :evas_textblock_cursor_format_item_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_eol_get, [ :evas_textblock_cursor_p ], :eina_bool ],
+        [ :evas_textblock_cursor_eol_get, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_textblock_line_number_geometry_get, [ :evas_object_p, :int, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :evas_object_textblock_line_number_geometry_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void evas_object_textblock_clear(Evas_Object *obj);
-        [ :evas_object_textblock_clear, [ :evas_object_p ], :void ],
+        [ :evas_object_textblock_clear, [ :evas_object ], :void ],
         # EAPI void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_formatted_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_textblock_size_formatted_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_native_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_textblock_size_native_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_textblock_style_insets_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_textblock_style_insets_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_line_add (Evas *e);
-        [ :evas_object_line_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_line_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_line_xy_set (Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2);
-        [ :evas_object_line_xy_set, [ :evas_object_p, :int, :int, :int, :int ], :void ],
+        [ :evas_object_line_xy_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_line_xy_get (const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2);
-        [ :evas_object_line_xy_get, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_object_line_xy_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_polygon_add (Evas *e);
-        [ :evas_object_polygon_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_polygon_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_polygon_point_add (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_polygon_point_add, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_polygon_point_add, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_polygon_points_clear (Evas_Object *obj);
-        [ :evas_object_polygon_points_clear, [ :evas_object_p ], :void ],
+        [ :evas_object_polygon_points_clear, [ :evas_object ], :void ],
+        # EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
+        [ :evas_object_is_frame_object_set, [ :evas_object, :bool ], :void ],
+        # EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj);
+        [ :evas_object_is_frame_object_get, [ :evas_object ], :bool ],
         # EAPI void evas_smart_free (Evas_Smart *s);
-        [ :evas_smart_free, [ :evas_smart_p ], :void ],
+        [ :evas_smart_free, [ :evas_smart ], :void ],
         # EAPI Evas_Smart *evas_smart_class_new (const Evas_Smart_Class *sc);
-        [ :evas_smart_class_new, [ :evas_smart_class_p ], :evas_smart_p ],
+        [ :evas_smart_class_new, [ :evas_smart_class ], :evas_smart ],
         # EAPI const Evas_Smart_Class *evas_smart_class_get (const Evas_Smart *s);
-        [ :evas_smart_class_get, [ :evas_smart_p ], :evas_smart_class_p ],
+        [ :evas_smart_class_get, [ :evas_smart ], :evas_smart_class ],
         # EAPI void *evas_smart_data_get (const Evas_Smart *s);
-        [ :evas_smart_data_get, [ :evas_smart_p ], :void_p ],
+        [ :evas_smart_data_get, [ :evas_smart ], :pointer ],
         # EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count);
-        [ :evas_smart_callbacks_descriptions_get, [ :evas_smart_p, :uint_p ], :evas_smart_cb_description_pp ],
+        [ :evas_smart_callbacks_descriptions_get, [ :evas_smart, :pointer ], :evas_smart_cb_description ],
         # EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name);
-        [ :evas_smart_callback_description_find, [ :evas_smart_p, :string ], :evas_smart_cb_description_p ],
+        [ :evas_smart_callback_description_find, [ :evas_smart, :string ], :evas_smart_cb_description ],
         # EAPI Eina_Bool evas_smart_class_inherit_full (Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size);
-        [ :evas_smart_class_inherit_full, [ :evas_smart_class_p, :evas_smart_class_p, :uint ], :eina_bool ],
+        [ :evas_smart_class_inherit_full, [ :evas_smart_class, :evas_smart_class, :uint ], :bool ],
         # EAPI int evas_smart_usage_get(const Evas_Smart *s);
-        [ :evas_smart_usage_get, [ :evas_smart_p ], :int ],
+        [ :evas_smart_usage_get, [ :evas_smart ], :int ],
         # EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s);
-        [ :evas_object_smart_add, [ :evas_p, :evas_smart_p ], :evas_object_p ],
+        [ :evas_object_smart_add, [ :evas, :evas_smart ], :evas_object ],
         # EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj);
-        [ :evas_object_smart_member_add, [ :evas_object_p, :evas_object_p ], :void ],
+        [ :evas_object_smart_member_add, [ :evas_object, :evas_object ], :void ],
         # EAPI void evas_object_smart_member_del (Evas_Object *obj);
-        [ :evas_object_smart_member_del, [ :evas_object_p ], :void ],
+        [ :evas_object_smart_member_del, [ :evas_object ], :void ],
         # EAPI Eina_List *evas_object_smart_members_get (const Evas_Object *obj);
-        [ :evas_object_smart_members_get, [ :evas_object_p ], :eina_list_p ],
+        [ :evas_object_smart_members_get, [ :evas_object ], :eina_list ],
         # EAPI Evas_Object *evas_object_smart_parent_get (const Evas_Object *obj);
-        [ :evas_object_smart_parent_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_smart_parent_get, [ :evas_object ], :evas_object ],
         # EAPI Eina_Bool evas_object_smart_type_check (const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check, [ :evas_object_p, :string ], :eina_bool ],
+        [ :evas_object_smart_type_check, [ :evas_object, :string ], :bool ],
         # EAPI Eina_Bool evas_object_smart_type_check_ptr (const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check_ptr, [ :evas_object_p, :string ], :eina_bool ],
+        [ :evas_object_smart_type_check_ptr, [ :evas_object, :string ], :bool ],
         # EAPI Evas_Smart *evas_object_smart_smart_get (const Evas_Object *obj);
-        [ :evas_object_smart_smart_get, [ :evas_object_p ], :evas_smart_p ],
+        [ :evas_object_smart_smart_get, [ :evas_object ], :evas_smart ],
         # EAPI void *evas_object_smart_data_get (const Evas_Object *obj);
-        [ :evas_object_smart_data_get, [ :evas_object_p ], :void_p ],
+        [ :evas_object_smart_data_get, [ :evas_object ], :pointer ],
         # EAPI void evas_object_smart_data_set (Evas_Object *obj, void *data);
-        [ :evas_object_smart_data_set, [ :evas_object_p, :void_p ], :void ],
+        [ :evas_object_smart_data_set, [ :evas_object, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_add, [ :evas_object_p, :string, :evas_smart_cb, :void_p ], :void ],
+        [ :evas_object_smart_callback_add, [ :evas_object, :string, :evas_smart_cb, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_priority_add, [ :evas_object_p, :string, :short, :evas_smart_cb, :void_p ], :void ],
+        [ :evas_object_smart_callback_priority_add, [ :evas_object, :string, :short, :evas_smart_cb, :pointer ], :void ],
         # EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, Evas_Smart_Cb func);
-        [ :evas_object_smart_callback_del, [ :evas_object_p, :string, :evas_smart_cb ], :void_p ],
+        [ :evas_object_smart_callback_del, [ :evas_object, :string, :evas_smart_cb ], :pointer ],
+        # EAPI void *evas_object_smart_callback_del_full(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
+        [ :evas_object_smart_callback_del_full, [ :evas_object, :string, :evas_smart_cb, :pointer ], :pointer ],
         # EAPI void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info);
-        [ :evas_object_smart_callback_call, [ :evas_object_p, :string, :void_p ], :void ],
+        [ :evas_object_smart_callback_call, [ :evas_object, :string, :pointer ], :void ],
         # EAPI Eina_Bool evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions);
-        [ :evas_object_smart_callbacks_descriptions_set, [ :evas_object_p, :evas_smart_cb_description_p ], :eina_bool ],
+        [ :evas_object_smart_callbacks_descriptions_set, [ :evas_object, :evas_smart_cb_description ], :bool ],
         # EAPI void evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count);
-        [ :evas_object_smart_callbacks_descriptions_get, [ :evas_object_p, :evas_smart_cb_description_ppp, :uint_p, :evas_smart_cb_description_ppp, :uint_p ], :void ],
+        [ :evas_object_smart_callbacks_descriptions_get, [ :evas_object, :evas_smart_cb_description, :pointer, :evas_smart_cb_description, :pointer ],
+            :void ],
         # EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description);
-        [ :evas_object_smart_callback_description_find, [ :evas_object_p, :string, :evas_smart_cb_description_pp, :evas_smart_cb_description_pp ], :void ],
+        [ :evas_object_smart_callback_description_find, [ :evas_object, :string, :evas_smart_cb_description, :evas_smart_cb_description ], :void ],
         # EAPI void evas_object_smart_changed (Evas_Object *obj);
-        [ :evas_object_smart_changed, [ :evas_object_p ], :void ],
+        [ :evas_object_smart_changed, [ :evas_object ], :void ],
         # EAPI void evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value);
-        [ :evas_object_smart_need_recalculate_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_smart_need_recalculate_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
-        [ :evas_object_smart_need_recalculate_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_smart_need_recalculate_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_smart_calculate (Evas_Object *obj);
-        [ :evas_object_smart_calculate, [ :evas_object_p ], :void ],
+        [ :evas_object_smart_calculate, [ :evas_object ], :void ],
         # EAPI void evas_smart_objects_calculate (Evas *e);
-        [ :evas_smart_objects_calculate, [ :evas_p ], :void ],
+        [ :evas_smart_objects_calculate, [ :evas ], :void ],
         # EAPI int evas_smart_objects_calculate_count_get (const Evas *e);
-        [ :evas_smart_objects_calculate_count_get, [ :evas_p ], :int ],
+        [ :evas_smart_objects_calculate_count_get, [ :evas ], :int ],
         # EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
-        [ :evas_object_smart_move_children_relative, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_smart_move_children_relative, [ :evas_object, :int, :int ], :void ],
         # EAPI Evas_Object *evas_object_smart_clipped_clipper_get (Evas_Object *obj);
-        [ :evas_object_smart_clipped_clipper_get, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_smart_clipped_clipper_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_smart_clipped_smart_set (Evas_Smart_Class *sc);
-        [ :evas_object_smart_clipped_smart_set, [ :evas_smart_class_p ], :void ],
+        [ :evas_object_smart_clipped_smart_set, [ :evas_smart_class ], :void ],
         # EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get (void);
-        [ :evas_object_smart_clipped_class_get, [  ], :evas_smart_class_p ],
+        [ :evas_object_smart_clipped_class_get, [  ], :evas_smart_class ],
         # EAPI void evas_object_box_smart_set (Evas_Object_Box_Api *api);
-        [ :evas_object_box_smart_set, [ :evas_object_box_api_p ], :void ],
+        [ :evas_object_box_smart_set, [ :evas_object_box_api ], :void ],
         # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get (void);
-        [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api_p ],
+        [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api ],
         # EAPI void evas_object_box_layout_set (Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        [ :evas_object_box_layout_set, [ :evas_object_p, :evas_object_box_layout, :void_p, :evas_free_data_cb ], :void ],
+        # FIXME
         # EAPI Evas_Object *evas_object_box_add (Evas *evas);
-        [ :evas_object_box_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_box_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_box_add_to (Evas_Object *parent);
-        [ :evas_object_box_add_to, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_box_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_box_layout_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_horizontal, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_vertical, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_vertical, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_homogeneous_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_horizontal, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_homogeneous_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_horizontal, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_flow_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_vertical, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_flow_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_stack (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_stack, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
+        [ :evas_object_box_layout_stack, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_align_set (Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_box_align_set, [ :evas_object_p, :double, :double ], :void ],
+        [ :evas_object_box_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_box_align_get (const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_box_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
+        [ :evas_object_box_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_box_padding_set (Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_box_padding_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_box_padding_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_box_padding_get (const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_box_padding_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_box_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Evas_Object_Box_Option *evas_object_box_append (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_append, [ :evas_object_p, :evas_object_p ], :evas_object_box_option_p ],
+        [ :evas_object_box_append, [ :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_prepend (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_prepend, [ :evas_object_p, :evas_object_p ], :evas_object_box_option_p ],
+        [ :evas_object_box_prepend, [ :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_before (Evas_Object *o, Evas_Object *child, const Evas_Object *reference);
-        [ :evas_object_box_insert_before, [ :evas_object_p, :evas_object_p, :evas_object_p ], :evas_object_box_option_p ],
+        [ :evas_object_box_insert_before, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_after (Evas_Object *o, Evas_Object *child, const Evas_Object *referente);
-        [ :evas_object_box_insert_after, [ :evas_object_p, :evas_object_p, :evas_object_p ], :evas_object_box_option_p ],
+        [ :evas_object_box_insert_after, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_at (Evas_Object *o, Evas_Object *child, unsigned int pos);
-        [ :evas_object_box_insert_at, [ :evas_object_p, :evas_object_p, :uint ], :evas_object_box_option_p ],
+        [ :evas_object_box_insert_at, [ :evas_object, :evas_object, :uint ], :evas_object_box_option ],
         # EAPI Eina_Bool evas_object_box_remove (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_remove, [ :evas_object_p, :evas_object_p ], :eina_bool ],
+        [ :evas_object_box_remove, [ :evas_object, :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_at (Evas_Object *o, unsigned int pos);
-        [ :evas_object_box_remove_at, [ :evas_object_p, :uint ], :eina_bool ],
+        [ :evas_object_box_remove_at, [ :evas_object, :uint ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_all (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_box_remove_all, [ :evas_object_p, :eina_bool ], :eina_bool ],
+        [ :evas_object_box_remove_all, [ :evas_object, :bool ], :bool ],
         # EAPI Eina_Iterator *evas_object_box_iterator_new (const Evas_Object *o);
-        [ :evas_object_box_iterator_new, [ :evas_object_p ], :eina_iterator_p ],
+        [ :evas_object_box_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_box_accessor_new (const Evas_Object *o);
-        [ :evas_object_box_accessor_new, [ :evas_object_p ], :eina_accessor_p ],
+        [ :evas_object_box_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_box_children_get (const Evas_Object *o);
-        [ :evas_object_box_children_get, [ :evas_object_p ], :eina_list_p ],
+        [ :evas_object_box_children_get, [ :evas_object ], :eina_list ],
         # EAPI const char *evas_object_box_option_property_name_get (Evas_Object *o, int property);
-        [ :evas_object_box_option_property_name_get, [ :evas_object_p, :int ], :string ],
+        [ :evas_object_box_option_property_name_get, [ :evas_object, :int ], :string ],
         # EAPI int evas_object_box_option_property_id_get (Evas_Object *o, const char *name);
-        [ :evas_object_box_option_property_id_get, [ :evas_object_p, :string ], :int ],
+        [ :evas_object_box_option_property_id_get, [ :evas_object, :string ], :int ],
         # EAPI Eina_Bool evas_object_box_option_property_set (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_set, [ :evas_object_p, :evas_object_box_option_p, :int, :varargs ], :eina_bool ],
+        [ :evas_object_box_option_property_set, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vset (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vset, [ :evas_object_p, :evas_object_box_option_p, :int, :pointer ], :eina_bool ],
+        [ :evas_object_box_option_property_vset, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_get (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_get, [ :evas_object_p, :evas_object_box_option_p, :int, :varargs ], :eina_bool ],
+        [ :evas_object_box_option_property_get, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vget (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vget, [ :evas_object_p, :evas_object_box_option_p, :int, :pointer ], :eina_bool ],
+        [ :evas_object_box_option_property_vget, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Evas_Object *evas_object_table_add (Evas *evas);
-        [ :evas_object_table_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_table_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_table_add_to (Evas_Object *parent);
-        [ :evas_object_table_add_to, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_table_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_table_homogeneous_set (Evas_Object *o, Evas_Object_Table_Homogeneous_Mode homogeneous);
-        [ :evas_object_table_homogeneous_set, [ :evas_object_p, :evas_object_table_homogeneous_mode ], :void ],
+        [ :evas_object_table_homogeneous_set, [ :evas_object, :evas_object_table_homogeneous_mode ], :void ],
         # EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get (const Evas_Object *o);
-        [ :evas_object_table_homogeneous_get, [ :evas_object_p ], :evas_object_table_homogeneous_mode ],
+        [ :evas_object_table_homogeneous_get, [ :evas_object ], :evas_object_table_homogeneous_mode ],
         # EAPI void evas_object_table_padding_set (Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_table_padding_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_table_padding_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_table_padding_get (const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_table_padding_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_table_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_align_set (Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_table_align_set, [ :evas_object_p, :double, :double ], :void ],
+        [ :evas_object_table_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_table_align_get (const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_table_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
+        [ :evas_object_table_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_mirrored_set (Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_table_mirrored_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_table_mirrored_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_table_mirrored_get (const Evas_Object *o);
-        [ :evas_object_table_mirrored_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_table_mirrored_get, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack_get(Evas_Object *o, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan);
-        [ :evas_object_table_pack_get, [ :evas_object_p, :evas_object_p, :ushort_p, :ushort_p, :ushort_p, :ushort_p ], :eina_bool ],
+        [ :evas_object_table_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack (Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :evas_object_table_pack, [ :evas_object_p, :evas_object_p, :ushort, :ushort, :ushort, :ushort ], :eina_bool ],
+        [ :evas_object_table_pack, [ :evas_object, :evas_object, :ushort, :ushort, :ushort, :ushort ], :bool ],
         # EAPI Eina_Bool evas_object_table_unpack (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_table_unpack, [ :evas_object_p, :evas_object_p ], :eina_bool ],
+        [ :evas_object_table_unpack, [ :evas_object, :evas_object ], :bool ],
         # EAPI void evas_object_table_clear (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_table_clear, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_table_clear, [ :evas_object, :bool ], :void ],
         # EAPI void evas_object_table_col_row_size_get(const Evas_Object *o, int *cols, int *rows);
-        [ :evas_object_table_col_row_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_table_col_row_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Eina_Iterator *evas_object_table_iterator_new (const Evas_Object *o);
-        [ :evas_object_table_iterator_new, [ :evas_object_p ], :eina_iterator_p ],
+        [ :evas_object_table_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_table_accessor_new (const Evas_Object *o);
-        [ :evas_object_table_accessor_new, [ :evas_object_p ], :eina_accessor_p ],
+        [ :evas_object_table_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_table_children_get (const Evas_Object *o);
-        [ :evas_object_table_children_get, [ :evas_object_p ], :eina_list_p ],
+        [ :evas_object_table_children_get, [ :evas_object ], :eina_list ],
         # EAPI Evas_Object *evas_object_table_child_get (const Evas_Object *o, unsigned short col, unsigned short row);
-        [ :evas_object_table_child_get, [ :evas_object_p, :ushort, :ushort ], :evas_object_p ],
+        [ :evas_object_table_child_get, [ :evas_object, :ushort, :ushort ], :evas_object ],
         # EAPI Evas_Object *evas_object_grid_add (Evas *evas);
-        [ :evas_object_grid_add, [ :evas_p ], :evas_object_p ],
+        [ :evas_object_grid_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_grid_add_to (Evas_Object *parent);
-        [ :evas_object_grid_add_to, [ :evas_object_p ], :evas_object_p ],
+        [ :evas_object_grid_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_grid_size_set (Evas_Object *o, int w, int h);
-        [ :evas_object_grid_size_set, [ :evas_object_p, :int, :int ], :void ],
+        [ :evas_object_grid_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_grid_size_get (const Evas_Object *o, int *w, int *h);
-        [ :evas_object_grid_size_get, [ :evas_object_p, :int_p, :int_p ], :void ],
+        [ :evas_object_grid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_grid_mirrored_set (Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_grid_mirrored_set, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_grid_mirrored_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_mirrored_get (const Evas_Object *o);
-        [ :evas_object_grid_mirrored_get, [ :evas_object_p ], :eina_bool ],
+        [ :evas_object_grid_mirrored_get, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_grid_pack (Evas_Object *o, Evas_Object *child, int x, int y, int w, int h);
-        [ :evas_object_grid_pack, [ :evas_object_p, :evas_object_p, :int, :int, :int, :int ], :eina_bool ],
+        [ :evas_object_grid_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :bool ],
         # EAPI Eina_Bool evas_object_grid_unpack (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_grid_unpack, [ :evas_object_p, :evas_object_p ], :eina_bool ],
+        [ :evas_object_grid_unpack, [ :evas_object, :evas_object ], :bool ],
         # EAPI void evas_object_grid_clear (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_grid_clear, [ :evas_object_p, :eina_bool ], :void ],
+        [ :evas_object_grid_clear, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_pack_get (Evas_Object *o, Evas_Object *child, int *x, int *y, int *w, int *h);
-        [ :evas_object_grid_pack_get, [ :evas_object_p, :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
+        [ :evas_object_grid_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Iterator *evas_object_grid_iterator_new (const Evas_Object *o);
-        [ :evas_object_grid_iterator_new, [ :evas_object_p ], :eina_iterator_p ],
+        [ :evas_object_grid_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_grid_accessor_new (const Evas_Object *o);
-        [ :evas_object_grid_accessor_new, [ :evas_object_p ], :eina_accessor_p ],
+        [ :evas_object_grid_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_grid_children_get (const Evas_Object *o);
-        [ :evas_object_grid_children_get, [ :evas_object_p ], :eina_list_p ],
+        [ :evas_object_grid_children_get, [ :evas_object ], :eina_list ],
         # EAPI Eina_Bool evas_cserve_want_get (void);
-        [ :evas_cserve_want_get, [  ], :eina_bool ],
+        [ :evas_cserve_want_get, [  ], :bool ],
         # EAPI Eina_Bool evas_cserve_connected_get (void);
-        [ :evas_cserve_connected_get, [  ], :eina_bool ],
+        [ :evas_cserve_connected_get, [  ], :bool ],
         # EAPI Eina_Bool evas_cserve_stats_get (Evas_Cserve_Stats *stats);
-        [ :evas_cserve_stats_get, [ :evas_cserve_stats_p ], :eina_bool ],
+        [ :evas_cserve_stats_get, [ :evas_cserve_stats ], :bool ],
         # EAPI void evas_cserve_image_cache_contents_clean (Evas_Cserve_Image_Cache *cache);
-        [ :evas_cserve_image_cache_contents_clean, [ :evas_cserve_image_cache_p ], :void ],
+        [ :evas_cserve_image_cache_contents_clean, [ :evas_cserve_image_cache ], :void ],
         # EAPI Eina_Bool evas_cserve_config_get (Evas_Cserve_Config *config);
-        [ :evas_cserve_config_get, [ :evas_cserve_config_p ], :eina_bool ],
+        [ :evas_cserve_config_get, [ :evas_cserve_config ], :bool ],
         # EAPI Eina_Bool evas_cserve_config_set (const Evas_Cserve_Config *config);
-        [ :evas_cserve_config_set, [ :evas_cserve_config_p ], :eina_bool ],
+        [ :evas_cserve_config_set, [ :evas_cserve_config ], :bool ],
         # EAPI void evas_cserve_disconnect (void);
         [ :evas_cserve_disconnect, [  ], :void ],
         # EAPI const char *evas_load_error_str (Evas_Load_Error error);
         [ :evas_load_error_str, [ :evas_load_error ], :string ],
         # EAPI void evas_color_hsv_to_rgb (float h, float s, float v, int *r, int *g, int *b);
-        [ :evas_color_hsv_to_rgb, [ :float, :float, :float, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_color_hsv_to_rgb, [ :float, :float, :float, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_color_rgb_to_hsv (int r, int g, int b, float *h, float *s, float *v);
-        [ :evas_color_rgb_to_hsv, [ :int, :int, :int, :float_p, :float_p, :float_p ], :void ],
+        [ :evas_color_rgb_to_hsv, [ :int, :int, :int, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_color_argb_premul (int a, int *r, int *g, int *b);
-        [ :evas_color_argb_premul, [ :int, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_color_argb_premul, [ :int, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_color_argb_unpremul (int a, int *r, int *g, int *b);
-        [ :evas_color_argb_unpremul, [ :int, :int_p, :int_p, :int_p ], :void ],
+        [ :evas_color_argb_unpremul, [ :int, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_data_argb_premul (unsigned int *data, unsigned int len);
-        [ :evas_data_argb_premul, [ :uint_p, :uint ], :void ],
+        [ :evas_data_argb_premul, [ :pointer, :uint ], :void ],
         # EAPI void evas_data_argb_unpremul (unsigned int *data, unsigned int len);
-        [ :evas_data_argb_unpremul, [ :uint_p, :uint ], :void ],
+        [ :evas_data_argb_unpremul, [ :pointer, :uint ], :void ],
         # EAPI int evas_string_char_next_get (const char *str, int pos, int *decoded);
-        [ :evas_string_char_next_get, [ :string, :int, :int_p ], :int ],
+        [ :evas_string_char_next_get, [ :string, :int, :pointer ], :int ],
         # EAPI int evas_string_char_prev_get (const char *str, int pos, int *decoded);
-        [ :evas_string_char_prev_get, [ :string, :int, :int_p ], :int ],
+        [ :evas_string_char_prev_get, [ :string, :int, :pointer ], :int ],
         # EAPI int evas_string_char_len_get (const char *str);
         [ :evas_string_char_len_get, [ :string ], :int ],
         # EAPI const Evas_Modifier *evas_key_modifier_get (const Evas *e);
-        [ :evas_key_modifier_get, [ :evas_p ], :evas_modifier_p ],
+        [ :evas_key_modifier_get, [ :evas ], :evas_modifier ],
         # EAPI const Evas_Lock *evas_key_lock_get (const Evas *e);
-        [ :evas_key_lock_get, [ :evas_p ], :evas_lock_p ],
+        [ :evas_key_lock_get, [ :evas ], :evas_lock ],
         # EAPI Eina_Bool evas_key_modifier_is_set (const Evas_Modifier *m, const char *keyname);
-        [ :evas_key_modifier_is_set, [ :evas_modifier_p, :string ], :eina_bool ],
+        [ :evas_key_modifier_is_set, [ :evas_modifier, :string ], :bool ],
         # EAPI Eina_Bool evas_key_lock_is_set (const Evas_Lock *l, const char *keyname);
-        [ :evas_key_lock_is_set, [ :evas_lock_p, :string ], :eina_bool ],
+        [ :evas_key_lock_is_set, [ :evas_lock, :string ], :bool ],
         # EAPI void evas_key_modifier_add (Evas *e, const char *keyname);
-        [ :evas_key_modifier_add, [ :evas_p, :string ], :void ],
+        [ :evas_key_modifier_add, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_del (Evas *e, const char *keyname);
-        [ :evas_key_modifier_del, [ :evas_p, :string ], :void ],
+        [ :evas_key_modifier_del, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_add (Evas *e, const char *keyname);
-        [ :evas_key_lock_add, [ :evas_p, :string ], :void ],
+        [ :evas_key_lock_add, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_del (Evas *e, const char *keyname);
-        [ :evas_key_lock_del, [ :evas_p, :string ], :void ],
+        [ :evas_key_lock_del, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_on (Evas *e, const char *keyname);
-        [ :evas_key_modifier_on, [ :evas_p, :string ], :void ],
+        [ :evas_key_modifier_on, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_off (Evas *e, const char *keyname);
-        [ :evas_key_modifier_off, [ :evas_p, :string ], :void ],
+        [ :evas_key_modifier_off, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_on (Evas *e, const char *keyname);
-        [ :evas_key_lock_on, [ :evas_p, :string ], :void ],
+        [ :evas_key_lock_on, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_off (Evas *e, const char *keyname);
-        [ :evas_key_lock_off, [ :evas_p, :string ], :void ],
+        [ :evas_key_lock_off, [ :evas, :string ], :void ],
         # EAPI Evas_Modifier_Mask evas_key_modifier_mask_get (const Evas *e, const char *keyname);
-        [ :evas_key_modifier_mask_get, [ :evas_p, :string ], :ulong_long ],
+        [ :evas_key_modifier_mask_get, [ :evas, :string ], :ulong_long ],
         # EAPI Eina_Bool evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
-        [ :evas_object_key_grab, [ :evas_object_p, :string, :ulong_long, :ulong_long, :eina_bool ], :eina_bool ],
+        [ :evas_object_key_grab, [ :evas_object, :string, :ulong_long, :ulong_long, :bool ], :bool ],
         # EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
-        [ :evas_object_key_ungrab, [ :evas_object_p, :string, :ulong_long, :ulong_long ], :void ],
+        [ :evas_object_key_ungrab, [ :evas_object, :string, :ulong_long, :ulong_long ], :void ],
         # EAPI unsigned int evas_touch_point_list_count(Evas *e);
-        [ :evas_touch_point_list_count, [ :evas_p ], :uint ],
+        [ :evas_touch_point_list_count, [ :evas ], :uint ],
         # EAPI void evas_touch_point_list_nth_xy_get(Evas *e, unsigned int n, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_touch_point_list_nth_xy_get, [ :evas_p, :uint, :int_p, :int_p ], :void ],
+        [ :evas_touch_point_list_nth_xy_get, [ :evas, :uint, :pointer, :pointer ], :void ],
         # EAPI int evas_touch_point_list_nth_id_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_id_get, [ :evas_p, :uint ], :int ],
+        [ :evas_touch_point_list_nth_id_get, [ :evas, :uint ], :int ],
         # EAPI Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_state_get, [ :evas_p, :uint ], :evas_touch_point_state ],
+        [ :evas_touch_point_list_nth_state_get, [ :evas, :uint ], :evas_touch_point_state ],
         ]
         #
         attach_fcts fcts
diff --git a/spec/ecore_evas_spec.rb b/spec/ecore_evas_spec.rb
index 7ded12e..859e282 100644
--- a/spec/ecore_evas_spec.rb
+++ b/spec/ecore_evas_spec.rb
@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/eina_list'
+require 'efl/ecore'
 require 'efl/ecore_evas'
 require './spec/helper'
 #
@@ -29,7 +30,6 @@ describe 'Efl::EcoreEvas' do
         EcoreEvas.engines_free EcoreEvas.engines_get
         l = EcoreEvas.engines_list
         r = l.inject("\t") do |s,e| s+=e.read_string+' ' end
-        puts r
         EcoreEvas.engines_free l
     end
     #
@@ -52,16 +52,17 @@ describe 'Efl::EcoreEvas' do
             EcoreEvas.init.should == 2
         end
         before(:each) do
-            @e = EcoreEvas::REcoreEvas.new :engine_name=>"software_x11", :x=>10, :y=>10, :w=>100, :h=>120
+            @e = EcoreEvas::REcoreEvas.new :engine_name=>"software_x11", :x=>10, :y=>10, :w=>100, :h=>120 do
+                move 10, 10
+                show
+            end
             @canvas = @e.evas
-            @bg = @canvas.object_rectangle_add { |o|
-                o.color = 100, 100, 255, 255
-                o.size = @e.size
-            }
-            @bg.show
+            @bg = @canvas.object_rectangle_add do
+                color_set 100, 100, 255, 255
+                show
+            end
+            @bg.size = @e.size
             @e.object_associate @bg, :ecore_evas_object_associate_base
-            @e.move 10, 10
-            @e.show
         end
         after(:each) do
             @e.free
@@ -82,23 +83,34 @@ describe 'Efl::EcoreEvas' do
         it "move, resize move_resize and geometry_get  (and check association)" do
             @e.geometry_get.should == [10,10,100,120]
             @bg.geometry_get.should == [0,0,100,120]
-            @e.move 20, 20
+            @e.move 50, 50
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [20,100,120]
+            g[0].should >=50
+            g[0].should <=60
+            g[1].should >=60
+            g[1].should <=80
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [100,120]
             @bg.geometry_get.should == [0,0,100,120]
             @e.resize 200,150
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [20,200,150]
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [200,150]
             @bg.geometry_get.should == [0,0,200,150]
             @e.move_resize 10, 0, 130, 100
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [10,130,100]
+            g[0].should >=10
+            g[0].should <=20
+            g[1].should >=20
+            g[1].should <=30
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [130,100]
             @bg.geometry_get.should == [0,0,130,100]
             g = @e.geometry_get
         end
@@ -203,12 +215,6 @@ describe 'Efl::EcoreEvas' do
             bool_check @e, 'override'
         end
         #
-        # FIXME maximized
-        # ecore/src/lib/ecore_evas/ecore_evas.c => ecore_evas_maximized_set => IFC => return
-        it "maximized set/get " do
-            bool_check @e, 'maximized', 5
-        end
-        #
         it "fullscreen set/get " do
             bool_check @e, 'fullscreen', 5
         end
diff --git a/spec/edje_spec.rb b/spec/edje_spec.rb
index 896c6bc..5ba5b8c 100644
--- a/spec/edje_spec.rb
+++ b/spec/edje_spec.rb
@@ -17,7 +17,6 @@ else
 end
 #
 require 'efl/eina_list'
-require 'efl/evas'
 require 'efl/edje'
 require './spec/helper'
 #
@@ -43,6 +42,14 @@ describe "Efl::Edje #{Efl::Edje.version.full}" do
         Edje.shutdown.should == @init
     end
     #
+    it "enum edje_external_param_flags should be correct" do
+        [ :edje_external_param_flags_none, :edje_external_param_flags_get,
+            :edje_external_param_flags_set, :edje_external_param_flags_state,
+            :edje_external_param_flags_constructor, :edje_external_param_flags_regular ].zip([0,1,2,4,8,7]) do |s,v|
+            Efl::Native.enum_value(s).should == v
+        end
+    end
+    #
     it "frametime get/set " do
         Edje.frametime_set 10
         Edje.frametime_get.should == 10
diff --git a/spec/eina_hash_spec.rb b/spec/eina_hash_spec.rb
index 736dae9..2d17680 100644
--- a/spec/eina_hash_spec.rb
+++ b/spec/eina_hash_spec.rb
@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl'
 require 'efl/eina_hash'
 #
 describe 'Efl::EinaHash' do
diff --git a/spec/eina_list_spec.rb b/spec/eina_list_spec.rb
index 50db525..8bef1ac 100644
--- a/spec/eina_list_spec.rb
+++ b/spec/eina_list_spec.rb
@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina'
 require 'efl/eina_list'
 #
 describe 'Efl::EinaList' do
diff --git a/spec/eina_log_spec.rb b/spec/eina_log_spec.rb
index 62d54a1..03c51dd 100644
--- a/spec/eina_log_spec.rb
+++ b/spec/eina_log_spec.rb
@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina'
 require 'efl/eina_log'
 require './spec/helper'
 #
@@ -21,6 +20,16 @@ describe 'Efl::EinaLog' do
         EinaLog.level.should == 3
     end
     #
+    it "eina_log_level enum should be well defined" do
+        Efl::Native.enum_value(:eina_log_level_critical).should == 0
+        Efl::Native.enum_value(:eina_log_level_err).should == 1
+        Efl::Native.enum_value(:eina_log_level_warn).should == 2
+        Efl::Native.enum_value(:eina_log_level_info).should == 3
+        Efl::Native.enum_value(:eina_log_level_dbg).should == 4
+        Efl::Native.enum_value(:eina_log_levels).should == 5
+        Efl::Native.enum_value(:eina_log_level_unknown).should == (-2147483647-1)
+    end
+    #
     it "color_disable set/get" do
         bool_check EinaLog, 'color_disable'
     end
@@ -60,12 +69,5 @@ describe 'Efl::EinaLog' do
         EinaLog.main_thread_check.should be_true
         EinaLog.threads_enable
     end
-    # EAPI void eina_log_threads_enable(void);
-    # EAPI void eina_log_print_cb_set(Eina_Log_Print_Cb cb, void *data);
     #
-    # EAPI void eina_log_print(int domain, Eina_Log_Level level, const char *file, const char *function, int line, const char *fmt, ...);
-    # EAPI void eina_log_vprint(int domain, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, va_list args);
-    # EAPI void eina_log_print_cb_stdout(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-    # EAPI void eina_log_print_cb_stderr(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-    # EAPI void eina_log_print_cb_file(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
 end
diff --git a/spec/elm_spec.rb b/spec/elm_spec.rb
index 0ae7d93..45cf42c 100644
--- a/spec/elm_spec.rb
+++ b/spec/elm_spec.rb
@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/elementary'
+require 'efl/ecore'
+require 'efl/elementary_all'
 require './spec/helper'
 #
 describe "Efl::Elm #{Efl::Elm.version.full}" do
@@ -81,10 +82,6 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
         it "fullscreen set/get" do
             bool_check @win, 'fullscreen', 4
         end
-        # FIXME depends on issue: ecore-2
-        it "maximized set/get" do
-            bool_check @win, 'maximized', 3
-        end
         #
         it "iconified set/get" do
             bool_check @win, 'iconified'
@@ -176,28 +173,7 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
             o2 = @win.inlined_image_object
             o1.should === o2
         end
-        # TODO EAPI void elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params);;
-        # TODO EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
-        #
-        describe 'Efl::Elm::ElmInWin' do
-            it "activate, content set/get/unset" do
-                @iwin = @win.inwin_add
-                o1 = @win.evas.object_rectangle_add
-                o2 = @win.evas.object_rectangle_add
-                @iwin.activate
-                @iwin.content_set o1
-                @iwin.content.should == o1.to_ptr
-                @iwin.content_get.should === o1.to_ptr
-                @iwin.content= o2
-                @iwin.content.should === o2.to_ptr
-                @iwin.content_get.should === o2.to_ptr
-                @iwin.content_unset
-                @iwin.content.should == FFI::Pointer::NULL
-                @iwin.content_get.should == FFI::Pointer::NULL
-                o1.free
-                o2.free
-            end
-        end
+        #
     end
     #
     describe 'Efl::Elm::ElmBg' do
@@ -228,7 +204,7 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
             @bg.color_get.should == [12,24,36]
             @bg.color= 2,4,8
             @bg.color.should == [2,4,8]
-            @bg.class.superclass.instance_method(:color).bind(@bg).call.should == [200,255,100,150]
+#            @bg.class.superclass.instance_method(:color_get).bind(@bg).call.should == [200,255,100,150]
         end
         #
     end
@@ -283,82 +259,5 @@ describe "Efl::Elm #{Efl::Elm.version.full}" do
         end
     end
     #
-    describe 'Efl::Elm::ElmPager' do
-        #
-        before(:all) {
-            realize_win
-            @p = Elm::ElmPager.new @win
-            @os = []
-            0.upto(3) do
-                @os << @win.evas.object_rectangle_add
-            end
-        }
-        after(:all) {
-            @p.free
-            @bg.free
-            @win.free
-        }
-        #
-        it "content push pop promote bottom_get top_get" do
-            @os.each do |o|
-                @p.content_push o
-            end
-            @p.content_top_get.should == @os[-1].to_ptr
-            @p.content_bottom_get.should == @os[0].to_ptr
-            @p.content_pop
-            @p.content_top_get.should == @os[-2].to_ptr
-            @p.content_bottom_get.should == @os[0].to_ptr
-            @p.content_promote @os[0]
-            @p.content_top_get.should == @os[0].to_ptr
-            @p.content_bottom_get.should == @os[1].to_ptr
-        end
-    end
-    #
-    describe 'Efl::Elm::ElmPanel' do
-        #
-        before(:all) {
-            realize_win
-            @p = Elm::ElmPanel.new @win
-            @os = []
-        }
-        after(:all) {
-            @p.free
-            @bg.free
-            @win.free
-        }
-        #
-        it "orient set/get" do
-            @p.orient_set :elm_panel_orient_bottom
-            @p.orient_get.should == :elm_panel_orient_bottom
-            @p.orient= :elm_panel_orient_top
-            @p.orient.should == :elm_panel_orient_top
-        end
-        #
-        it "content set/get/unset" do
-            o = @win.evas.object_rectangle_add
-            @p.content_set o
-            @p.content_get.should == o.to_ptr
-            @p.content_unset.should == o.to_ptr
-            o.free
-            o = @win.evas.object_rectangle_add
-            @p.content= o
-            @p.content.should == o.to_ptr
-            @p.content_unset.should == o.to_ptr
-            o.free
-        end
-        #
-        it "hidden set/get toggle" do
-            @p.hidden_set true
-            @p.hidden_get.should be_true
-            @p.hidden=false
-            @p.hidden.should be_false
-            @p.toggle
-            @p.hidden_get.should be_true
-            @p.hidden.should be_true
-            @p.toggle
-            @p.hidden_get.should be_false
-            @p.hidden.should be_false
-        end
-    end
 end
 
diff --git a/spec/evas_spec.rb b/spec/evas_spec.rb
index f00a6ef..e7dbdf9 100644
--- a/spec/evas_spec.rb
+++ b/spec/evas_spec.rb
@@ -1,8 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina_list'
-require 'efl/ecore'
 require 'efl/evas'
 require './spec/helper'
 #
@@ -29,6 +27,13 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
         Evas.shutdown.should == @init
     end
     #
+    it "enum evas_bidi_direction should be correct" do
+        Efl::Native.enum_value(:evas_bidi_direction_natural).should == 0
+        Efl::Native.enum_value(:evas_bidi_direction_neutral).should == 0
+        Efl::Native.enum_value(:evas_bidi_direction_ltr).should == 1
+        Efl::Native.enum_value(:evas_bidi_direction_rtl).should == 2
+    end
+    #
     it "evas alloc error enum is ok" do
         Native.enum_value(:evas_alloc_error_none).should == 0
         Native.enum_value(:evas_alloc_error_fatal).should == 1
@@ -68,8 +73,9 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
         end
         #
         it "should be able to create and destroy evas" do
-            e1 = Evas::REvas.new
-            e1.address.should_not == 0
+            e1 = Evas::REvas.new do
+                address.should_not == 0
+            end
             e2 = Evas::REvas.new e1.to_ptr
             e1.address.should == e2.address
             (e1==e2).should be_false
@@ -208,16 +214,6 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @e.pointer_inside.should be_false
         end
         #
-        # TODO evas_event_feed_*
-        #   evas_event_feed_multi_down
-        #   evas_event_feed_multi_up
-        #   evas_event_feed_multi_move
-        #   evas_event_feed_mouse_cancel
-        #   evas_event_feed_mouse_wheel
-        #   evas_event_feed_key_down
-        #   evas_event_feed_key_up
-        #   evas_event_feed_hold
-        #
         it "add/del event callback " do
             @cb = false
             kd_cb = Proc.new do |data, e, obj, event_info|
@@ -290,8 +286,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @e.object_name_find("name").should == @o.to_ptr
             @o.free
         end
-        # TODO evas_object_top_at_xy_get, evas_object_top_at_pointer_get, evas_object_top_in_rectangle_get
-        # TODO evas_objects_at_xy_get, evas_objects_in_rectangle_get, evas_object_bottom_get, evas_object_top_get
+        #
     end
     #
     describe 'Efl::Evas::REvasObject' do
@@ -634,7 +629,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @t.horiz_advance_get.should > 0
             @t.vert_advance_get.should > 0
             @t.inset_get.should > 0
-            @t.direction_get.should == :evas_bidi_direction_neutral
+            @t.direction_get.should == :evas_bidi_direction_ltr
             @t.style_pad_get.length.should == 4
             @t.ascent.should > 0
             @t.descent.should > 0
@@ -643,7 +638,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @t.horiz_advance.should > 0
             @t.vert_advance.should > 0
             @t.inset.should > 0
-            @t.direction.should == :evas_bidi_direction_neutral
+            @t.direction.should == :evas_bidi_direction_ltr
             @t.style_pad.length.should == 4
         end
         #
@@ -752,232 +747,6 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
             @b.padding.should == [30,20]
         end
         #
-
-        # EAPI void evas_object_box_smart_set (Evas_Object_Box_Api *api);
-        # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get (void);
-        # EAPI void evas_object_box_layout_set (Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-
-        # EAPI void evas_object_box_layout_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_homogeneous_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_homogeneous_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_homogeneous_max_size_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_flow_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_flow_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        # EAPI void evas_object_box_layout_stack (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-
-        # EAPI Eina_Iterator *evas_object_box_iterator_new (const Evas_Object *o);
-        # EAPI Eina_Accessor *evas_object_box_accessor_new (const Evas_Object *o);
-
-        # EAPI const char *evas_object_box_option_property_name_get (Evas_Object *o, int property);
-
-        # EAPI int evas_object_box_option_property_id_get (Evas_Object *o, const char *name);
-        # EAPI Eina_Bool evas_object_box_option_property_set (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        # EAPI Eina_Bool evas_object_box_option_property_vset (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        # EAPI Eina_Bool evas_object_box_option_property_get (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        # EAPI Eina_Bool evas_object_box_option_property_vget (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
     end
     #
-        # EAPI Evas_Object *evas_object_image_filled_add (Evas *e);
-        # EAPI void evas_object_image_memfile_set (Evas_Object *obj, void *data, int size, char *format, char *key);
-        # EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key);
-        # EAPI void evas_object_image_file_get (const Evas_Object *obj, const char **file, const char **key);
-        # EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b);
-        # EAPI void evas_object_image_border_get (const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        # EAPI void evas_object_image_border_center_fill_set (Evas_Object *obj, Evas_Border_Fill_Mode fill);
-        # EAPI Evas_Border_Fill_Mode evas_object_image_border_center_fill_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_filled_set (Evas_Object *obj, Eina_Bool setting);
-        # EAPI Eina_Bool evas_object_image_filled_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_border_scale_set (Evas_Object *obj, double scale);
-        # EAPI double evas_object_image_border_scale_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        # EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        # EAPI void evas_object_image_fill_spread_set (Evas_Object *obj, Evas_Fill_Spread spread);
-        # EAPI Evas_Fill_Spread evas_object_image_fill_spread_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h);
-        # EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h);
-        # EAPI int evas_object_image_stride_get (const Evas_Object *obj);
-        # EAPI Evas_Load_Error evas_object_image_load_error_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_data_set (Evas_Object *obj, void *data);
-        # EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
-        # EAPI void *evas_object_image_data_get (const Evas_Object *obj, Eina_Bool for_writing);
-        # EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data);
-        # EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h);
-        # EAPI void evas_object_image_alpha_set (Evas_Object *obj, Eina_Bool has_alpha);
-        # EAPI Eina_Bool evas_object_image_alpha_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth_scale);
-        # EAPI Eina_Bool evas_object_image_smooth_scale_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_preload (Evas_Object *obj, Eina_Bool cancel);
-        # EAPI void evas_object_image_reload (Evas_Object *obj);
-        # EAPI Eina_Bool evas_object_image_save (const Evas_Object *obj, const char *file, const char *key, const char *flags);
-        # EAPI Eina_Bool evas_object_image_pixels_import (Evas_Object *obj, Evas_Pixel_Import_Source *pixels);
-        # EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data);
-        # EAPI void evas_object_image_pixels_dirty_set (Evas_Object *obj, Eina_Bool dirty);
-        # EAPI Eina_Bool evas_object_image_pixels_dirty_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_load_dpi_set (Evas_Object *obj, double dpi);
-        # EAPI double evas_object_image_load_dpi_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_load_size_set (Evas_Object *obj, int w, int h);
-        # EAPI void evas_object_image_load_size_get (const Evas_Object *obj, int *w, int *h);
-        # EAPI void evas_object_image_load_scale_down_set (Evas_Object *obj, int scale_down);
-        # EAPI int evas_object_image_load_scale_down_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_load_region_set (Evas_Object *obj, int x, int y, int w, int h);
-        # EAPI void evas_object_image_load_region_get (const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        # EAPI void evas_object_image_colorspace_set (Evas_Object *obj, Evas_Colorspace cspace);
-        # EAPI Evas_Colorspace evas_object_image_colorspace_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_native_surface_set (Evas_Object *obj, Evas_Native_Surface *surf);
-        # EAPI Evas_Native_Surface *evas_object_image_native_surface_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_scale_hint_set (Evas_Object *obj, Evas_Image_Scale_Hint hint);
-        # EAPI Evas_Image_Scale_Hint evas_object_image_scale_hint_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_content_hint_set (Evas_Object *obj, Evas_Image_Content_Hint hint);
-        # EAPI Evas_Image_Content_Hint evas_object_image_content_hint_get (const Evas_Object *obj);
-        # EAPI void evas_object_image_alpha_mask_set (Evas_Object *obj, Eina_Bool ismask);
-        # EAPI Eina_Bool evas_object_image_source_set (Evas_Object *obj, Evas_Object *src);
-        # EAPI Evas_Object *evas_object_image_source_get (Evas_Object *obj);
-        # EAPI Eina_Bool evas_object_image_source_unset (Evas_Object *obj);
-        # EAPI Evas_Object *evas_object_textblock_add(Evas *e);
-        # EAPI const char *evas_textblock_escape_string_get(const char *escape);
-        # EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret);
-        # EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end);
-        # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
-        # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
-        # EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
-        # EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts);
-        # EAPI void evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-        # EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj);
-        # EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
-        # EAPI const char *evas_object_textblock_replace_char_get(Evas_Object *obj);
-        # EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
-        # EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
-        # EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        # EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Object *obj);
-        # EAPI void evas_object_textblock_newline_mode_set(Evas_Object *obj, Eina_Bool mode);
-        # EAPI Eina_Bool evas_object_textblock_newline_mode_get(const Evas_Object *obj);
-        # EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text);
-        # EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        # EAPI const char *evas_object_textblock_text_markup_get(const Evas_Object *obj);
-        # EAPI const Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
-        # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(Evas_Object *obj);
-        # EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur);
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_first_get(const Evas_Object *obj);
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_last_get(const Evas_Object *obj);
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n);
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n);
-        # EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n);
-        # EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n);
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur);
-        # EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *cur);
-        # EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
-        # EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur);
-        # EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
-        # EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
-        # EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        # EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
-        # EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
-        # EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        # EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
-        # EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
-        # EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
-        # EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
-        # EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur);
-        # EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur);
-        # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
-        # EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur);
-        # EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype);
-        # EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        # EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch);
-        # EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        # EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
-        # EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
-        # EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        # EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        # EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
-        # EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        # EAPI void evas_object_textblock_clear(Evas_Object *obj);
-        # EAPI void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        # EAPI void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        # EAPI void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        # EAPI void evas_smart_free (Evas_Smart *s);
-        # EAPI Evas_Smart *evas_smart_class_new (const Evas_Smart_Class *sc);
-        # EAPI const Evas_Smart_Class *evas_smart_class_get (const Evas_Smart *s);
-        # EAPI void *evas_smart_data_get (const Evas_Smart *s);
-        # EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count);
-        # EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name);
-        # EAPI Eina_Bool evas_smart_class_inherit_full (Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size);
-        # EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s);
-        # EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj);
-        # EAPI void evas_object_smart_member_del (Evas_Object *obj);
-        # EAPI Evas_Object *evas_object_smart_parent_get (const Evas_Object *obj);
-        # EAPI Eina_Bool evas_object_smart_type_check (const Evas_Object *obj, const char *type);
-        # EAPI Eina_Bool evas_object_smart_type_check_ptr (const Evas_Object *obj, const char *type);
-        # EAPI Eina_List *evas_object_smart_members_get (const Evas_Object *obj);
-        # EAPI Evas_Smart *evas_object_smart_smart_get (const Evas_Object *obj);
-        # EAPI void *evas_object_smart_data_get (const Evas_Object *obj);
-        # EAPI void evas_object_smart_data_set (Evas_Object *obj, void *data);
-        # EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        # EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, Evas_Smart_Cb func);
-        # EAPI void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info);
-        # EAPI Eina_Bool evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions);
-        # EAPI void evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count);
-        # EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description);
-        # EAPI void evas_object_smart_changed (Evas_Object *obj);
-        # EAPI void evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value);
-        # EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
-        # EAPI void evas_object_smart_calculate (Evas_Object *obj);
-        # EAPI void evas_smart_objects_calculate (Evas *e);
-        # EAPI Evas_Object *evas_object_smart_clipped_clipper_get (Evas_Object *obj);
-        # EAPI void evas_object_smart_clipped_smart_set (Evas_Smart_Class *sc);
-        # EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get (void);
-        # EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
-        # EAPI Evas_Object *evas_object_table_add (Evas *evas);
-        # EAPI Evas_Object *evas_object_table_add_to (Evas_Object *parent);
-        # EAPI void evas_object_table_homogeneous_set (Evas_Object *o, Evas_Object_Table_Homogeneous_Mode homogeneous);
-        # EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get (const Evas_Object *o);
-        # EAPI void evas_object_table_padding_set (Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        # EAPI void evas_object_table_padding_get (const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        # EAPI void evas_object_table_align_set (Evas_Object *o, double horizontal, double vertical);
-        # EAPI void evas_object_table_align_get (const Evas_Object *o, double *horizontal, double *vertical);
-        # EAPI void evas_object_table_mirrored_set (Evas_Object *o, Eina_Bool mirrored);
-        # EAPI Eina_Bool evas_object_table_mirrored_get (const Evas_Object *o);
-        # EAPI Eina_Bool evas_object_table_pack (Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        # EAPI Eina_Bool evas_object_table_unpack (Evas_Object *o, Evas_Object *child);
-        # EAPI void evas_object_table_clear (Evas_Object *o, Eina_Bool clear);
-        # EAPI void evas_object_table_col_row_size_get(const Evas_Object *o, int *cols, int *rows);
-        # EAPI Eina_Iterator *evas_object_table_iterator_new (const Evas_Object *o);
-        # EAPI Eina_Accessor *evas_object_table_accessor_new (const Evas_Object *o);
-        # EAPI Eina_List *evas_object_table_children_get (const Evas_Object *o);
-        # EAPI Evas_Object *evas_object_table_child_get (const Evas_Object *o, unsigned short col, unsigned short row);
-        # EAPI Eina_Bool evas_object_filter_mode_set (Evas_Object *o, Evas_Filter_Mode mode);
-        # EAPI Evas_Filter_Mode evas_object_filter_mode_get (Evas_Object *o);
-        # EAPI Eina_Bool evas_object_filter_set (Evas_Object *o, Evas_Filter filter);
-        # EAPI Evas_Filter evas_object_filter_get (Evas_Object *o);
-        # EAPI Eina_Bool evas_object_filter_param_int_set (Evas_Object *o, const char *param, int val);
-        # EAPI int evas_object_filter_param_int_get (Evas_Object *o, const char *param);
-        # EAPI Eina_Bool evas_object_filter_param_str_set (Evas_Object *o, const char *param, const char *val);
-        # EAPI const char *evas_object_filter_param_str_get (Evas_Object *o, const char *param);
-        # EAPI Eina_Bool evas_object_filter_param_obj_set (Evas_Object *o, const char *param, Evas_Object *val);
-        # EAPI Evas_Object *evas_object_filter_param_obj_get (Evas_Object *o, const char *param);
-        # EAPI Eina_Bool evas_object_filter_param_float_set(Evas_Object *o, const char *param, double val);
-        # EAPI double evas_object_filter_param_float_get(Evas_Object *o, const char *param);
-        # EAPI Eina_Bool evas_cserve_want_get (void);
-        # EAPI Eina_Bool evas_cserve_connected_get (void);
-        # EAPI Eina_Bool evas_cserve_stats_get (Evas_Cserve_Stats *stats);
-        # EAPI void evas_cserve_image_cache_contents_clean (Evas_Cserve_Image_Cache *cache);
-        # EAPI Eina_Bool evas_cserve_config_get (Evas_Cserve_Config *config);
-        # EAPI Eina_Bool evas_cserve_config_set (const Evas_Cserve_Config *config);
-        # EAPI void evas_cserve_disconnect (void);
 end
diff --git a/spec/helper.rb b/spec/helper.rb
index efdc2b3..eb98117 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -1,18 +1,19 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina'
-require 'efl/evas'
-require 'efl/ecore'
+require 'efl/eina_log'
+Efl::Eina.init
+Efl::EinaLog.level_set :eina_log_level_critical
 #
 def realize_evas
     width = 300
     height = 200
     @pixels = FFI::MemoryPointer.new :int, width*height
-    @e = Efl::Evas::REvas.new
-    @e.output_method_set Efl::Evas::render_method_lookup("buffer")
-    @e.output_viewport_set 0, 0, width, height
-    @e.output_size_set width, height
+    @e = Efl::Evas::REvas.new do
+        output_method_set Efl::Evas::render_method_lookup("buffer")
+        output_viewport_set 0, 0, width, height
+        output_size_set width, height
+    end
     einfo = Efl::Native::EngineInfoBufferStruct.new @e.engine_info
     einfo[:info][:depth_type] = Efl::Evas::EVAS_ENGINE_BUFFER_DEPTH_ARGB32
     einfo[:info][:dest_buffer] = @pixels
@@ -58,15 +59,15 @@ def char_check t, fct, delay=nil
 end
 #
 def realize_win
-    @win = Elm::ElmWin.new(nil, 'TEST') do |w|
-        w.title= 'spec win'
-        w.move 100, 100
-        w.resize 100, 100
+    @win = Elm::ElmWin.new(nil, 'TEST') do
+        title= 'spec win'
+        move 100, 100
+        resize 100, 100
     end
-    @bg = Elm::ElmBg.new(@win) do |bg|
-        bg.size_hint_weight_set 1.0, 1.0
-        bg.evas_object_color_set 200,255,100,150
-        bg.show
+    @bg = Elm::ElmBg.new(@win) do
+        size_hint_weight_set 1.0, 1.0
+        evas_object_color_set 200,255,100,150
+        show
     end
     @win.show
 end
diff --git a/test/test_elementary.rb b/test/test_elementary.rb
deleted file mode 100644
index 4e2e2ef..0000000
--- a/test/test_elementary.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'efl/elementary'
-require 'efl/edje'
-require 'efl'
-#
-PREFIX=`pkg-config --variable=prefix ecore`.strip
-if PREFIX.empty?
-    puts "unable to determine Efl::PREFIX using pkg-config, images will not be available"
-end
-PACKAGE_DATA_DIR = File.join PREFIX, 'share', 'elementary'
-
-Dir.glob( File.join File.dirname(__FILE__), 'tests', '*.rb').each do |f|
-    load f
-end
-#
-include Efl;
-#
-TESTS = [
-    [ 'Bg Plain', :test_bg_plain ],
-    [ 'Bg Image', :test_bg_image ],
-    [ 'Bg Options', :test_bg_options ],
-    [ 'Icon Transparent', :test_icon ],
-    [ 'Icon Animation', :test_icon_animated ],
-    [ 'Box Vert', :test_box_vert ],
-    [ 'Box Vert 2', :test_box_vert2 ],
-    [ 'Box Horiz', :test_box_horiz ],
-    [ 'Box Transition', :test_box_transition ],
-    [ 'Buttons', :test_button ],
-    [ 'Transit', :test_transit ],
-    [ 'Transit 2', :test_transit2 ],
-    [ 'Transit 3', :test_transit3 ],
-    [ 'Transit 4', :test_transit4 ],
-    [ 'Transit 5', :test_transit5 ],
-    [ 'Transit 6', :test_transit6 ],
-    [ 'Transit 7', :test_transit7 ],
-    [ 'Transit 8', :test_transit8 ],
-    [ 'Transit 9', :test_transit9 ],
-    [ 'File Selector Button', :test_fileselector_button ],
-    [ 'File Selector Entry', :test_fileselector_entry ],
-    [ 'Toggles', :test_toggle ],
-    [ 'Table', :test_table ],
-    [ 'Table Homogeneous', :test_table2 ],
-    [ 'Table 3', :test_table3 ],
-    [ 'Table 4', :test_table4 ],
-    [ 'Table 5', :test_table5 ],
-    [ 'Table 6', :test_table6 ],
-    [ 'Clock', :test_clock ],
-    [ 'Clock 2', :test_clock2 ],
-    [ 'Layout', :test_layout ],
-    [ 'Hover', :test_hover ],
-    [ 'Hover 2', :test_hover2 ],
-    [ 'Entry', :test_entry ],
-    [ 'Entry Scrolled', :test_entry_scrolled ],
-    [ 'Entry 3', :test_entry3 ],
-    [ 'Entry 4', :test_entry4 ],
-    [ 'Entry 5', :test_entry5 ],
-    [ 'Entry Notepad', :test_entry_notepad ],
-    [ 'Anchorview', :test_anchorview ],
-    [ 'Anchorblock', :test_anchorblock ],
-    [ 'Toolbar', :test_toolbar ],
-    [ 'Toolbar 2', :test_toolbar2 ],
-    [ 'Toolbar 3', :test_toolbar3 ],
-    [ 'Toolbar 4', :test_toolbar4 ],
-    [ 'Toolbar 5', :test_toolbar5 ],
-    [ 'Toolbar 6', :test_toolbar6 ],
-    [ 'Hoversel', :test_hoversel ],
-    [ 'List', :test_list ],
-    [ 'List - Horizontal', :test_list_horizontal ],
-    [ 'List 2', :test_list2 ],
-    [ 'List 3', :test_list3 ],
-    [ 'List 4', :test_list4 ],
-    [ 'List 5', :test_list5 ],
-    [ 'Inwin', :test_inwin ],
-    [ 'Inwin 2', :test_inwin2 ],
-    [ 'Scaling', :test_scaling ],
-    [ 'Scaling 2', :test_scaling2 ],
-    [ 'Slider', :test_slider ],
-    [ 'Actionslider', :test_actionslider ],
-    [ 'Genlist', :test_genlist ],
-    [ 'Genlist 2', :test_genlist2 ],
-    [ 'Genlist 3', :test_genlist3 ],
-    [ 'Genlist 4', :test_genlist4 ],
-    [ 'Genlist 5', :test_genlist5 ],
-    [ 'Genlist 7', :test_genlist7 ],
-    [ 'Genlist Tree', :test_genlist6 ],
-    [ 'Genlist Group', :test_genlist8 ],
-    [ 'Genlist Group Tree', :test_genlist9 ],
-    [ 'Genlist Mode', :test_genlist10 ],
-    [ 'Genlist Reorder Mode', :test_genlist11 ],
-    [ 'Genlist Eio', :test_eio ],
-    [ 'GenGrid', :test_gengrid ],
-    [ 'GenGrid 2', :test_gengrid2 ],
-    [ 'Checks', :test_check ],
-    [ 'Radios', :test_radio ],
-    [ 'Pager', :test_pager ],
-    [ 'Pager Slide', :test_pager_slide ],
-    [ 'Window States', :test_win_state ],
-    [ 'Window States 2', :test_win_state2 ],
-    [ 'Progressbar', :test_progressbar ],
-    [ 'File Selector', :test_fileselector ],
-    [ 'Separator', :test_separator ],
-    [ 'Scroller', :test_scroller ],
-    [ 'Scroller 2', :test_scroller2 ],
-    [ 'Spinner', :test_spinner ],
-    [ 'Index', :test_index ],
-    [ 'Index 2', :test_index2 ],
-    [ 'Photocam', :test_photocam ],
-    [ 'Photo', :test_photo ],
-    [ 'Thumb', :test_thumb ],
-    [ 'Icon Desktops', :test_icon_desktops ],
-    [ 'Notify', :test_notify ],
-    [ 'Slideshow', :test_slideshow ],
-    [ 'Menu', :test_menu ],
-    [ 'Panel', :test_panel ],
-    [ 'Panes', :test_panes ],
-    [ 'Map', :test_map ],
-    [ 'Weather', :test_weather ],
-    [ 'Flip', :test_flip ],
-    [ 'Flip 2', :test_flip2 ],
-    [ 'Flip 3', :test_flip3 ],
-    [ 'Flip Interactive', :test_flip4 ],
-    [ 'Flip Page', :test_flip_page ],
-    [ 'Label', :test_label ],
-    [ 'Conformant', :test_conformant ],
-    [ 'Conformant 2', :test_conformant2 ],
-    [ 'Multi Touch', :test_multi ],
-    [ 'Floating Objects', :test_floating ],
-    [ 'Launcher', :test_launcher ],
-    [ 'Launcher 2', :test_launcher2 ],
-    [ 'Launcher 3', :test_launcher3 ],
-    [ 'Animation', :test_anim ],
-    [ 'Calendar', :test_calendar ],
-    [ 'Calendar 2', :test_calendar2 ],
-    [ 'Tooltip', :test_tooltip ],
-    [ 'Tooltip2', :test_tooltip2 ],
-    [ 'Cursor', :test_cursor ],
-    [ 'Cursor 2', :test_cursor2 ],
-    [ 'Cursor 3', :test_cursor3 ],
-    [ 'Focus', :test_focus ],
-    [ 'Focus 2', :test_focus2 ],
-    [ 'Focus 3', :test_focus3 ],
-    [ 'Flip Selector', :test_flipselector ],
-    [ 'Disk Selector', :test_diskselector ],
-    [ 'Color Selector', :test_colorselector ],
-    [ 'Ctxpopup', :test_ctxpopup ],
-    [ 'Bubble', :test_bubble ],
-    [ 'Segment Control', :test_segment_control ],
-    [ 'Store', :test_store ],
-    [ 'Window Inline', :test_win_inline ],
-    [ 'Grid', :test_grid ],
-    [ 'GLViewSimple', :test_glview_simple ],
-    [ 'GLView', :test_glview ],
-    [ '3D', :test_3d ],
-    [ 'Gesture Layer', :test_gesture_layer ],
-    [ 'Naviframe', :test_naviframe ],
-    [ 'Factory', :test_factory ],
-]
-#
-class TestWin < Elm::ElmWin
-    #
-    def initialize name, title
-        super FFI::MemoryPointer::NULL, name
-        self.title = title
-        feed
-        smart_callback_add 'delete,request', method(:on_delete)
-    end
-    #
-    def feed
-        @bg = Elm::ElmBg.new self do |bg|
-            bg.size_hint_weight_expand
-            resize_object_add bg
-            bg.show
-        end
-        @bx0 = Elm::ElmBox.new self do |bx|
-            bx.size_hint_weight_expand
-            resize_object_add bx
-            bx.show
-        end
-        @fr =  Elm::ElmFrame.new self do |fr|
-            fr.text = 'Information'
-            @bx0.pack_end fr
-            fr.show
-        end
-        Elm::ElmLabel.new self do |lb|
-            lb.text = 'Please select a test from the list below<br>by clicking the test button to show the<br>test window.'
-            @fr.content = lb
-            lb.show
-        end
-        Elm::ElmCheck.new self do |tg|
-            tg.style = 'toggle'
-            tg.text = 'UI-Mirroring:'
-            tg.state = Native.elm_mirrored_get
-            tg.smart_callback_add 'changed', method(:tg_changed)
-            @bx0.pack_end tg
-            tg.show
-        end
-        @li = Elm::ElmList.new self do |li|
-            li.always_select_mode = true
-            li.size_hint_weight_expand
-            li.size_hint_align_set_fill
-            @bx0.pack_end li
-        end
-        @idx = Elm::ElmIndex.new self do |idx|
-            idx.smart_callback_add 'delay,changed', method(:index_changed)
-            idx.size_hint_weight_expand
-            resize_object_add idx
-            idx.show
-        end
-        ch = nil
-        TESTS.sort.each do |l,m|
-            icon = nil
-            if Tests.respond_to? m
-                icon = Elm::ElmIcon.new self
-                icon.file = "#{PACKAGE_DATA_DIR}/images/icon_00.png", nil
-                icon.size_hint_min = 20,20
-            end
-            it = @li.item_append l, nil, icon, method(:try_test), FFI::MemoryPointer.from_string(m.to_s)
-            it.del_cb_set method(:free_list_item)
-            if l[0]!=ch
-                ch = l[0]
-                @idx.item_append ch.to_s, it
-            end
-        end
-        @idx.item_go 0
-        @li.go
-        @li.show
-    end
-    #
-    def try_test data, evas_obj, event_info
-        fct = data.read_string
-        begin
-            Tests.send fct
-        rescue NoMethodError
-            puts "#{fct} not implemeneted yet"
-        end
-    end
-    #
-    def tg_changed data, evas_obj, event_info
-        Native.elm_mirrored_set Native.elm_check_state_get evas_obj
-    end
-    #
-    def index_changed data, evas_obj, event_info
-        Native.elm_list_item_show event_info
-    end
-    #
-    def free_list_item data, evas_obj, event_info
-        # free FFI::MemoryPointer.from_string m.to_s
-        data.free
-    end
-    #
-    def on_delete data, evas_object, event_info
-        Elm.exit
-    end
-end
-#
-def elm_main
-    win = TestWin.new 'test_elementary', 'Elementary Tests'
-    win.evas_object_resize 320, 480
-    win.show
-end
-#
-Elm.init
-#
-Native.elm_app_info_set elm_main, 'elementary', 'images/logo.png'
-#
-Elm.run
-Elm.shutdown
-#
-# EOF
diff --git a/test/test_elm_win-native.rb b/test/test_elm_win-native.rb
index 318c3cd..0dbf9e0 100644
--- a/test/test_elm_win-native.rb
+++ b/test/test_elm_win-native.rb
@@ -1,12 +1,14 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/native'        # requires efl/native/* which populates Efl::Native
-require 'efl/elementary'    # for Efl::Elm.init convenience
+require 'efl/native/elm/elm_win'
+require 'efl/native/elm/elm_bg'
+require 'efl/native/elm/elm_label'
+require 'efl/native/elm/elm_object'
 #
 include Efl::Native
 #
-Efl::Elm.init
+elm_init 0, FFI::MemoryPointer::NULL
 #
 win_del = Proc.new { |data,evas_object,event_info|
     elm_exit();
diff --git a/test/test_elm_win.rb b/test/test_elm_win.rb
index b9abcf2..9bf00ca 100644
--- a/test/test_elm_win.rb
+++ b/test/test_elm_win.rb
@@ -1,32 +1,33 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/elementary'
+require 'efl/elm/elm_win'
+require 'efl/elm/elm_bg'
+require 'efl/elm/elm_label'
 #
 include Efl
 #
 class MyWin < Elm::ElmWin
     #
-    def initialize name, title
-        super FFI::MemoryPointer::NULL, name
+    def initialize name, title, &block
+        super FFI::MemoryPointer::NULL, name, &block
         title = title
         feed
         smart_callback_add "delete,request", method(:on_delete), FFI::MemoryPointer.from_string("my data")
     end
     def feed
-        @bg = Elm::ElmBg.new(self) do |bg|
-#            bg.color = 200,255,100
-            bg.size_hint_weight_expand
-            bg.evas_object_color = 200,255,100,150
-            bg.show
+        @bg = Elm::ElmBg.new(self) do
+            size_hint_weight_expand
+            evas_object_color_set 200,255,100,150
+            show
         end
         resize_object_add @bg
-        @lb = Elm::ElmLabel.new(self) do |lb|
-            lb.text = "Hello World!"
-            lb.size_hint_align_fill
-            lb.size_hint_weight_expand
+        @lb = Elm::ElmLabel.new(self) do
+            text_set "Hello World!"
+            size_hint_align_fill
+            size_hint_weight_expand
+            show
         end
-        @lb.show
         resize_object_add @lb
     end
     def on_delete data, evas_object, event_info
@@ -37,11 +38,11 @@ end
 #
 Elm.init
 #
-win = MyWin.new "App name", "Window Title" do |w|
-    w.alpha = true
-    w.move 300, 300
-    w.resize 200, 100
-    w.show
+win = MyWin.new "App name", "Window Title" do
+    alpha_set true
+    resize 200, 100
+    center_set 600, 300
+    show
 end
 #
 Elm.run
diff --git a/test/test_evas.rb b/test/test_evas.rb
index c3eadf7..c70f4d9 100644
--- a/test/test_evas.rb
+++ b/test/test_evas.rb
@@ -59,19 +59,19 @@ h = 240
 #
 canvas, pixels = create_canvas w, h
 #
-bg = canvas.object_rectangle_add do |b|
-    b.color = 255, 255, 255, 255
-    b.move 0, 0
-    b.resize w, h
+bg = canvas.object_rectangle_add do
+    color_set 255, 255, 255, 255
+    move 0, 0
+    resize w, h
 end
 bg.show
 #
 draw_scene canvas
 #
-r1 = canvas.object_rectangle_add do |r|
-    r.color = 255, 0, 0, 255
-    r.move 10, 10
-    r.resize 100, 100
+r1 = canvas.object_rectangle_add do
+    color_set 0, 0, 0, 255
+    move 10, 10
+    resize 100, 100
 end
 r1.show
 #
@@ -82,10 +82,10 @@ r2 = canvas.object_rectangle_add do |r|
 end
 r2.show
 #
-r3 = canvas.object_rectangle_add do |r|
-    r.color = 0, 128, 0, 255
-    r.move 60, 60
-    r.resize 50, 50
+r3 = canvas.object_rectangle_add do
+    color_set 0, 128, 0, 255
+    move 60, 60
+    resize 50, 50
 end
 r3.show
 #
diff --git a/test/tests/test_actionslider.rb b/test/tests/test_actionslider.rb
deleted file mode 100644
index a04f380..0000000
--- a/test/tests/test_actionslider.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-module Tests
-    #
-    class TestActionSlider < Efl::Elm::ElmWin
-        def initialize name, title, fct
-            super nil, name
-            self.title = title
-            self.autodel = true
-            self.send fct
-            self.resize 320, 400
-            self.show
-        end
-        def simple
-            @bg = Elm::ElmBg.new self do |bg|
-                bg.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                self.resize_object_add bg
-                bg.show
-            end
-            @bx = Elm::ElmBox.new self do |bx|
-                bx.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                self.resize_object_add bx
-                bx.show
-            end
-            as_pos = Native.enum_type :elm_actionslider_pos
-            # standards calls
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.part_text = "left", "Snooze"
-                as.part_text = "center", nil
-                as.part_text = "right", "Stop"
-                as.indicator_pos = :elm_actionslider_right
-                as.magnet_pos = :elm_actionslider_right
-                as.enabled_pos = as_pos[:elm_actionslider_left]|as_pos[:elm_actionslider_right]
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.smart_callback_add "pos_changed", method(:cb_position_change_magnetic)
-                as.show
-            end
-            @bx.pack_end as
-            # use xxx_set helpers
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.texts_set "Snooze", nil, "Stop"
-                as.indicator_set 'c'
-                as.magnet_set 'c'
-                as.enabled_set 'lr'
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.show
-            end
-            @bx.pack_end as
-            # use xxx = helpers
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.style = "bar"
-                as.texts = nil, "Accept", "Reject"
-                as.indicator = 'l'
-                as.magnet = 'cr'
-                as.enabled = 'cr'
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.show
-            end
-            @bx.pack_end as
-            # use setup
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.style = "bar"
-                as.text = "Go"
-                as.setup [nil, "Accept", "Reject"], 'l', 'l', 'a'
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.smart_callback_add "pos_changed", method(:cb_position_change_magnetic)
-                as.show
-            end
-            @bx.pack_end as
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.text = "Go"
-                as.setup ["Left", "Center", "right"], 'l', 'a'
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.show
-            end
-            @bx.pack_end as
-            as = Elm::ElmActionSlider.new self do |as|
-                as.size_hint_weight_set Evas::EVAS_HINT_EXPAND, 0
-                as.size_hint_align_set Evas::EVAS_HINT_FILL, 0
-                as.text = "Go"
-                as.setup ["Enable", "Magnet", "Disable"], 'c', 'c'
-                as.smart_callback_add "selected", method(:cb_pos_selected)
-                as.smart_callback_add "pos_changed", method(:cb_magnet_enable_disable)
-                as.show
-            end
-            @bx.pack_end as
-        end
-        def cb_pos_selected data, evas_obj, event_info
-            as = Elm::ElmActionSlider.new evas_obj
-            puts "Selection #{event_info.null? ? 'NULL' : event_info.read_string}"
-            puts "   label: #{Elm::ElmActionSlider.new(evas_obj).selected_label}"
-        end
-        def cb_position_change_magnetic data, evas_obj, event_info
-            as = Elm::ElmActionSlider.new evas_obj
-            return if event_info.null?
-            case event_info.read_string
-            when "left"
-                as.magnet_pos = :elm_actionslider_left
-            when "right"
-                as.magnet_pos = :elm_actionslider_right
-            end
-        end
-        def cb_magnet_enable_disable data, evas_obj, event_info
-            as = Elm::ElmActionSlider.new evas_obj
-            return if event_info.null?
-            case event_info.read_string
-            when "left"
-                as.magnet_pos = :elm_actionslider_center
-            when "right"
-                as.magnet_pos = :elm_actionslider_none
-            end
-        end
-    end
-    #
-    def self.test_actionslider
-        TestActionSlider.new 'actionslider', 'Actionslider', :simple
-    end
-    #
-end
-#
-# EOF
diff --git a/test/tests/test_bg.rb b/test/tests/test_bg.rb
deleted file mode 100644
index 2739bdf..0000000
--- a/test/tests/test_bg.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-module Tests
-    #
-    class TestBg < Efl::Elm::ElmWin
-        def initialize name, title, fct
-            super nil, name
-            self.title = title
-            self.autodel = true
-            self.send fct
-            @bg.size_hint_min = 160, 160
-            @bg.size_hint_max = 640, 640
-            self.resize 320, 230
-            self.show
-        end
-        def plain_bg
-            @bg = Elm::ElmBg.new self do |bg|
-                bg.size_hint_weight_expand
-                self.resize_object_add bg
-                bg.show
-            end
-        end
-        def image_bg
-            @bg = Elm::ElmBg.new self do |bg|
-                bg.file =  "#{PACKAGE_DATA_DIR}/images/plant_01.jpg", nil
-                bg.size_hint_weight_expand
-                self.resize_object_add bg
-                bg.show
-            end
-        end
-        def options_bg
-            plain_bg
-            @bx = Elm::ElmBox.new self do |bx|
-                bx.size_hint_weight_expand
-                self.resize_object_add bx
-                bx.show
-            end
-            @o_bg = Elm::ElmBg.new self do |bg|
-                bg.file =  "#{PACKAGE_DATA_DIR}/images/plant_01.jpg", nil
-                bg.size_hint_weight_expand
-                bg.size_hint_align_fill
-                @bx.pack_end bg
-                bg.show
-            end
-            @hbx = Elm::ElmBox.new self do |bx|
-                bx.horizontal = true
-                bx.size_hint_weight_expand_fill
-                bx.size_hint_align_fill
-            end
-            @rdg = Elm::ElmRadio.new self do |r|
-                r.state_value = :elm_bg_option_center
-                r.text = "Center"
-                r.size_hint_weight_expand_fill
-                r.smart_callback_add "changed", method(:cb_radio_changed)
-                @hbx.pack_end r
-                r.show
-            end
-            Elm::ElmRadio.new self do |r|
-                r.state_value = :elm_bg_option_scale
-                r.group_add @rdg
-                r.text = "Scale"
-                r.size_hint_weight_expand_fill
-                r.smart_callback_add "changed", method(:cb_radio_changed)
-                @hbx.pack_end r
-                r.show
-            end
-            Elm::ElmRadio.new self do |r|
-                r.state_value = :elm_bg_option_stretch
-                r.group_add @rdg
-                r.text = "Stretch"
-                r.size_hint_weight_expand_fill
-                r.smart_callback_add "changed", method(:cb_radio_changed)
-                @hbx.pack_end r
-                r.show
-            end
-            Elm::ElmRadio.new self do |r|
-                r.state_value = :elm_bg_option_tile
-                r.group_add @rdg
-                r.text = "Tile"
-                r.size_hint_weight_expand_fill
-                r.smart_callback_add "changed", method(:cb_radio_changed)
-                @hbx.pack_end r
-                r.show
-            end
-            @rdg.value_set :elm_bg_option_scale
-            Elm::ElmCheck.new self do |ck|
-                ck.text = "Show Overlay"
-                ck.size_hint_weight_expand_fill
-                ck.smart_callback_add "changed", method(:cb_overlay_changed)
-                @hbx.pack_end ck
-                ck.show
-            end
-            Elm::ElmSpinner.new self do |sp|
-                sp.style = "vertical"
-                sp.min_max = 1, 4
-                sp.label_format = "%.0f"
-                sp.editable = false
-                sp.special_value_add 1, "White"
-                sp.special_value_add 2, "Red"
-                sp.special_value_add 3, "Blue"
-                sp.special_value_add 4, "Green"
-                sp.size_hint_weight_expand
-                sp.size_hint_align_fill
-                sp.smart_callback_add "changed", method(:cb_color_changed)
-                @hbx.pack_end sp
-                sp.show
-            end
-            @bx.pack_end @hbx
-            @hbx.show
-        end
-        def cb_radio_changed data, evas_obj, event_info
-            @o_bg.option = Elm::ElmRadio.new(evas_obj).value
-        end
-        def cb_overlay_changed data, evas_obj, event_info
-            if Elm::ElmCheck.new(evas_obj).state
-                over = @o_bg.parent_widget.evas.edje_object_add
-                over.file = "#{PACKAGE_DATA_DIR}/objects/test.edj", "bg_overlay"
-                @o_bg.content = over
-            else
-                @o_bg.content = FFI::Pointer::NULL
-            end
-        end
-        def cb_color_changed data, evas_obj, event_info
-            case Elm::ElmSpinner.new(evas_obj).value
-            when 1.0
-                @o_bg.color = 255, 255, 255
-            when 2.0
-                @o_bg.color = 255, 0, 0
-            when 3.0
-                @o_bg.color = 0, 0, 255
-            when 4.0
-                @o_bg.color = 0, 255, 0
-            end
-        end
-    end
-    #
-    def self.test_bg_plain
-        TestBg.new 'bg-plain', 'Bg Plain', :plain_bg
-    end
-    #
-    def self.test_bg_image
-        TestBg.new 'bg-image', 'Bg Image', :image_bg
-    end
-    def self.test_bg_options
-        TestBg.new 'bg-options', 'Bg Options', :options_bg
-    end
-    #
-end
-#
-# EOF
diff --git a/test/tests/test_box.rb b/test/tests/test_box.rb
deleted file mode 100644
index 11665ed..0000000
--- a/test/tests/test_box.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-module Tests
-    #
-    class TestBox < Efl::Elm::ElmWin
-        def initialize name, title, fct
-            super nil, name
-            self.title = title
-            self.autodel = true
-            @bg = Elm::ElmBg.new self do |bg|
-                bg.size_hint_weight_expand
-                self.resize_object_add bg
-                bg.show
-            end
-            self.send fct
-            self.show
-        end
-        #
-        def box_vert
-            @bx = Elm::ElmBox.new self do |bx|
-                bx.size_hint_weight_expand
-                self.resize_object_add bx
-                bx.show
-            end
-            icons = []
-            (0..2).each do
-                icons << Elm::ElmIcon.new(self) do |ico|
-                    ico.file = "#{PACKAGE_DATA_DIR}/images/logo_small.png", nil
-                    ico.scale = false, false
-                    @bx.pack_end ico
-                    ico.show
-                end
-            end
-            icons[0].size_hint_align = 0.5, 0.5
-            icons[1].size_hint_align = 0.0, 0.5
-            icons[2].size_hint_align = Efl::Evas::EVAS_HINT_EXPAND, 0.5
-        end
-        #
-        def box_vert2
-            @bx = Elm::ElmBox.new self do |bx|
-                bx.padding = 10, 10
-                self.resize_object_add bx
-                bx.size_hint_weight_expand
-                bx.show
-            end
-            (1..5).each do |n|
-                bt = Efl::Elm::ElmButton.new self
-                bt.text = "Button #{n}"
-                bt.size_hint_align_fill
-                bt.size_hint_weight = 0.0, 0.0
-                bt.smart_callback_add "clicked", method(:del_cb)
-                @bx.pack_end bt
-                bt.show
-            end
-        end
-        #
-        def del_cb data, evas_obj, event_info
-            o = Efl::Elm::ElmObject.new(evas_obj)
-            @bx.unpack o
-            o.move 0, 0
-            o.color = 128, 64, 0, 128
-        end
-        #
-        def box_horiz
-            @bx = Elm::ElmBox.new self do |bx|
-                bx.horizontal = true
-                self.resize_object_add bx
-                bx.size_hint_weight_expand
-                bx.show
-            end
-            icons = []
-            (0..2).each do
-                icons << Elm::ElmIcon.new(self) do |ico|
-                    ico.file = "#{PACKAGE_DATA_DIR}/images/logo_small.png", nil
-                    ico.scale = false, false
-                    @bx.pack_end ico
-                    ico.show
-                end
-            end
-            icons[0].size_hint_align = 0.5, 0.5
-            icons[1].size_hint_align = 0.5, 0.0
-            icons[2].size_hint_align = 0.0, Efl::Evas::EVAS_HINT_EXPAND
-        end
-        #
-        def box_transition
-            @bx = Elm::ElmBox.new self do |bx|
-                self.resize_object_add bx
-                bx.size_hint_weight_expand
-                bx.show
-            end
-            (1..3).each do |n|
-                bt = Efl::Elm::ElmButton.new self
-                bt.text = "Button #{n}"
-                bt.size_hint_weight_expand
-#                bt.size_hint_align_fill
-                bt.smart_callback_add "clicked", method(:del_cb)
-                @bx.pack_end bt
-                bt.resize 100, 100
-                bt.show
-            end
-            @idx = 0
-            @transitions = [
-                Efl::Native.find_variable('evas_object_box_layout_vertical'),
-                Efl::Native.find_variable('evas_object_box_layout_horizontal'),
-                Efl::Native.find_variable('evas_object_box_layout_stack'),
-                Efl::Native.find_variable('evas_object_box_layout_homogeneous_vertical'),
-                Efl::Native.find_variable('evas_object_box_layout_homogeneous_horizontal'),
-                Efl::Native.find_variable('evas_object_box_layout_flow_vertical'),
-                Efl::Native.find_variable('evas_object_box_layout_flow_horizontal'),
-                Efl::Native.find_variable('evas_object_box_layout_stack'),
-            ]
-            self.resize 300, 300
-            @bx.resize 300, 300
-            @bx.layout =  @transitions[@idx], nil, nil
-            self.show
-            transition_change
-        end
-        #
-        def transition_change data=nil
-            last_layout = @transitions[@idx]
-            @idx = (@idx+1) % @transitions.length
-            next_layout = @transitions[@idx]
-            transition = Efl::Native.elm_box_transition_new 1.0, last_layout, nil, nil, next_layout, nil, nil, method(:transition_change), nil
-            transition_fct = Efl::Native.find_variable('elm_box_layout_transition')
-            transition_free = Efl::Native.find_variable('elm_box_transition_free')
-            @bx.layout = transition_fct, transition, transition_free
-        end
-        #
-    end
-    #
-    def self.test_box_vert
-        TestBox.new 'box-vert', 'Box Vert', :box_vert
-    end
-    def self.test_box_vert2
-        TestBox.new 'box-vert', 'Box Vert', :box_vert2
-    end
-    def self.test_box_horiz
-        TestBox.new 'box-horiz', 'Box Horiz', :box_horiz
-    end
-    def self.test_box_transition
-        TestBox.new 'box-transition', 'Box Transition', :box_transition
-    end
-    #
-end
-#
-# EOF
diff --git a/test/tests/test_buttons.rb b/test/tests/test_buttons.rb
deleted file mode 100644
index c0e2bb1..0000000
--- a/test/tests/test_buttons.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-module Tests
-    #
-    class TestBg < Efl::Elm::ElmWin
-        def initialize name, title, fct
-            super nil, name
-            self.title = title
-            self.autodel = true
-            @bg = Elm::ElmBg.new self do |bg|
-                bg.size_hint_weight_expand
-                self.resize_object_add bg
-                bg.show
-            end
-            self.send fct
-            self.resize 320, 480
-            self.show
-        end
-        #
-        def __create_butt_ico txt=nil, do_icon=true
-            if do_icon
-                ico = Elm::ElmIcon.new self
-                ico.file = "#{PACKAGE_DATA_DIR}/images/logo_small.png", nil
-            else
-                ico = nil
-            end
-            bt = Efl::Elm::ElmButton.new self
-            bt.text = txt unless txt.nil?
-            bt.content = ico if ico
-            bt.smart_callback_add "clicked", method(:bt_clicked_cb)
-            bt.smart_callback_add "unpressed", method(:bt_unpressed_cb)
-            @bx.pack_end bt
-            @buttons << bt
-            ico.show if ico
-            bt.show
-            [bt,ico]
-        end
-        #
-        def buttons
-            @scr = Efl::Elm::ElmScroller.new self do |scr|
-                scr.bounce = false, true
-                scr.policy = :elm_scroller_policy_off, :elm_scroller_policy_auto
-                self.resize_object_add scr
-                scr.size_hint_weight_expand
-                scr.show
-            end
-            @bx = Efl::Elm::ElmBox.new self do |bx|
-                bx.size_hint_weight_expand
-                @scr.content = bx
-                bx.show
-            end
-            #
-            @buttons = []
-            #
-            bt,ico = __create_butt_ico "Icon sized to button"
-            ico.size_hint_aspect = :evas_aspect_control_vertical, 1, 1
-            #
-            bt,ico = __create_butt_ico "Icon no scale"
-            ico.scale = false, false
-            #
-            bt,ico = __create_butt_ico "Disabled Button"
-            bt.disabled = true
-            ico.size_hint_aspect = :evas_aspect_control_vertical, 1, 1
-            #
-            bt,ico = __create_butt_ico
-            bt.disabled = true
-            ico.size_hint_aspect = :evas_aspect_control_vertical, 1, 1
-            #
-            bt,ico = __create_butt_ico "Label Only", false
-            bt.smart_callback_add "repeated", method(:bt_repeated_cb)
-            bt.autorepeat = true
-            bt.autorepeat_gap_timeout = 0.5
-            bt.autorepeat_initial_timeout = 2.0
-            #
-            bt,ico = __create_butt_ico
-            ico.scale = false, false
-            #
-            bt,ico = __create_butt_ico "Anchor style", false
-            bt.style = "anchor"
-            #
-            bt,ico = __create_butt_ico
-            ico.size_hint_aspect = :evas_aspect_control_vertical, 1, 1
-            bt.style = "anchor"
-            #
-            bt,ico = __create_butt_ico
-            ico.size_hint_aspect = :evas_aspect_control_vertical, 1, 1
-            bt.style = "anchor"
-            bt.disabled = true
-            bt.access_info_set "This is some custom text describing this widget"
-        end
-        #
-        def bt_clicked_cb data, evas_obj, event_info
-            idx = @buttons.index @buttons.find { |b| b.to_ptr==evas_obj }
-            puts "clicked event on Button: #{idx+1}"
-        end
-        #
-        def bt_unpressed_cb data, evas_obj, event_info
-            idx = @buttons.index @buttons.find { |b| b.to_ptr==evas_obj }
-            puts "unpressed event on Button: #{idx+1}"
-        end
-        #
-        def bt_repeated_cb data, evas_obj, event_info
-            @count = ((@count||=0)+1)%1000
-            Efl::Elm::ElmButton.new(evas_obj).text = "count = #{@count}"
-        end
-    end
-    #
-    def self.test_button
-        TestBg.new 'buttons', 'Buttons', :buttons
-    end
-end
-#
-# EOF
diff --git a/tools/check_loading b/tools/check_loading
index d53be77..4d4cc64 100755
--- a/tools/check_loading
+++ b/tools/check_loading
@@ -9,17 +9,18 @@ parentdir=${abspath%/*/*}
 #
 function run () {
     echo -n "    ${1##*/}"
-    $RUBY -I $parentdir/lib $1 2>/dev/null && echo -e "$GREEN OK$RESET" || echo -e "$RED KO$RESET"
+    outf=/tmp/ffi-efl-${1##*/}
+    $RUBY -I $parentdir/lib $1 2>>$outf && rm $outf && echo -e "$GREEN OK$RESET" || echo -e "$RED KO$RESET"
 }
 #
 function each () {
     echo $($RUBY --version)
     echo "  lib/efl/native/*.rb"
-    for native in $parentdir/lib/efl/native/*.rb; do
+    for native in $(find $parentdir/lib/efl/native/ -name *.rb); do
         run $native
     done
     echo "  lib/efl/*.rb"
-    for wrapper in $parentdir/lib/efl/e*.rb; do
+    for wrapper in $(find $parentdir/lib/efl/ -name e*.rb); do
         run $wrapper
     done
 }
diff --git a/tools/extract-api.sh b/tools/extract-api.sh
index 372a8ff..af7945b 100755
--- a/tools/extract-api.sh
+++ b/tools/extract-api.sh
@@ -43,6 +43,31 @@ for header in \
     "${INCLUDE}/ecore-1/Ecore_File.h" \
     "${INCLUDE}/EMap.h" \
     "${INCLUDE}/elementary-0/Elementary.h" \
+    "${INCLUDE}/elementary-0/elm_general.h" \
+    "${INCLUDE}/elementary-0/elm_tooltip.h" \
+    "${INCLUDE}/elementary-0/elm_object_item.h" \
+    "${INCLUDE}/elementary-0/elm_icon.h" \
+    "${INCLUDE}/elementary-0/elm_scroller.h" \
+    "${INCLUDE}/elementary-0/elm_entry.h" \
+    "${INCLUDE}/elementary-0/elm_list.h" \
+    "${INCLUDE}/elementary-0/elm_win.h" \
+    "${INCLUDE}/elementary-0/elm_bg.h" \
+    "${INCLUDE}/elementary-0/elm_label.h" \
+    "${INCLUDE}/elementary-0/elm_object.h" \
+    "${INCLUDE}/elementary-0/elm_box.h" \
+    "${INCLUDE}/elementary-0/elm_button.h" \
+    "${INCLUDE}/elementary-0/elm_frame.h" \
+    "${INCLUDE}/elementary-0/elm_panel.h" \
+    "${INCLUDE}/elementary-0/elm_image.h" \
+    "${INCLUDE}/elementary-0/elm_grid.h" \
+    "${INCLUDE}/elementary-0/elm_menu.h" \
+    "${INCLUDE}/elementary-0/elm_check.h" \
+    "${INCLUDE}/elementary-0/elm_clock.h" \
+    "${INCLUDE}/elementary-0/elm_calendar.h" \
+    "${INCLUDE}/elementary-0/elm_bubble.h" \
+    "${INCLUDE}/elementary-0/elm_layout.h" \
+    "${INCLUDE}/elementary-0/elm_cursor.h" \
+    "${INCLUDE}/elementary-0/elm_notify.h" \
     ; do
     #
     if [ ! -e "$header" ]; then
diff --git a/tools/genruby.rb b/tools/genruby.rb
index 2eae0e7..f6980fb 100755
--- a/tools/genruby.rb
+++ b/tools/genruby.rb
@@ -1,146 +1,38 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-path = File.dirname __FILE__
-lib_path = File.join path, '..', 'lib', 'efl', 'native'
-#
-# header, module name, fct prefix, lib
-libraries = [
-    # HEADER            MODUE NAME      FCT PREFIX      LIB             OUTPUT              REQUIRES
-    [ 'eina_types.h',   'Eina',         'eina',         'eina',         'eina_types.rb' ],
-    [ 'eina_main.h',    'Eina',         'eina',         'eina',         'eina.rb' ],
-    [ 'eina_xattr.h',   'EinaXattr',    'eina_xattr',   'eina',         'eina_xattr.rb' ],
-    [ 'eina_log.h',     'EinaLog',      'eina_log',     'eina',         'eina_log.rb' ],
-    [ 'eina_list.h',    'EinaList',     'eina_list',    'eina',         'eina_list.rb' ],
-    [ 'eina_hash.h',    'EinaHash',     'eina_hash',    'eina',         'eina_hash.rb' ],
-    [ 'Eet.h',          'Eet',          'eet',          'eet',          'eet.rb',           [ 'efl/native/eina_xattr' ] ],
-    [ 'Evas.h',         'Evas',         'evas',         'evas',         'evas.rb' ],
-#    [ 'Evas_GL.h',      'EvasGl',       'evas_gl',      'evas',         'evas/evas_gl.rb' ],
-    [ 'Edje.h',         'Edje',         'edje',         'edje',         'edje.rb' ],
-    [ 'Ecore.h',        'Ecore',        'ecore',        'ecore',        'ecore.rb' ],
-#    [ 'Ecore_Con.h',    'EcoreCon',     'ecore_con',    'ecore',        'ecore/ecore_con.rb' ],
-    [ 'Ecore_Input.h',  'EcoreInput',   'ecore_event',  'ecore_input',  'ecore_input.rb' ],
-    [ 'Ecore_Getopt.h', 'EcoreGetopt',  'ecore_getopt', 'ecore',        'ecore_getopt.rb' ],
-    [ 'Ecore_Evas.h',   'EcoreEvas',    'ecore_evas',   'ecore_evas',   'ecore_evas.rb' ],
-#    [ 'Ecore_Fb.h',     'EcoreFb',      'ecore',        'ecore',        'ecore/ecore_fb.rb' ],
-#    [ 'Ecore_File.h',   'EcoreFile',    'ecore',        'ecore',        'ecore/ecore_file.rb' ],
-    [ 'EMap.h',         'EMap',         'emap',         'emap',         'emap.rb' ],
-    [ 'Elementary.h',   'Elm',          'elm',          'libelementary-ver-pre-svn-09.so.0',    'elementary.rb' ],
-]
 #
 INDENT=' '*8
+WRAP_LEN=150
 #
-REQUIRES=['efl/ffi']
-#
-HEADER =<<-EOF
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-REQUIRES
-#
-module Efl
-    #
-    module MNAME
-        #
-        FCT_PREFIX = 'MY_FCT_PREFIX_'
-        #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.\#{m} *args, &block; r=Efl::Native.\#{sym}(\#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
-        end
-        #
-    end
-    #
-    module Native
-EOF
-FOOTER =<<-EOF
-    end
-end
-#
-# EOF
-EOF
-#
-TYPES = {
-    'int' => ':int',
-    'char' => ':char',
-    'void' => ':void',
-    'long' => ':long',
-    'short' => ':short',
-    'float' => ':float',
-    'pid_t' => ':ulong',
-    'time_t' => ':ulong',
-    'size_t' => ':ulong',
-    'ssize_t' => ':long',
-    'double' => ':double',
-    'long int' => ':long',
-    'long long' => ':long_long',
-    'unsigned int' => ':uint',
-    'unsigned char' => ':uchar',
-    'unsigned short' => ':ushort',
-    'unsigned long long' => ':ulong_long',
-    'int *' => ':int_p',
-    'void *' => ':void_p',
-    'short *' => ':short_p',
-    'float *' => ':float_p',
-    'size_t *' => ':ulong_p',
-    'ssize_t *' => ':long_p',
-    'double *' => ':double_p',
-    'unsigned int *' => ':uint_p',
-    'unsigned char *' => ':uchar_p',
-    'unsigned short *' => ':ushort_p',
-    'char *' => ':string',                                              # FIXME ?!?!
-    'char **' => ':string_array',                                       # FIXME ?!?!
-    'char ***' => ':string_array_p',                                    # FIXME ?!?!
-    'fd_set *' => ':pointer',
-    'FILE *' => ':pointer',
-    'va_list' => ':pointer',                                            # FIXME ?!?!
-    'struct tm *' => ':pointer',
-    'struct timeval *' => ':pointer',
-    'struct sockaddr *' => ':pointer',
-    # Efl BASE TYPES
-    'Eina_Bool' => ':eina_bool',
-    'Eina_Bool *' => ':eina_bool_p',
-    'Eina_Inlist *' => ':pointer',
-    'Eina_Iterator' => ':eina_iterator',
-    'Eina_Iterator *' => ':eina_iterator_p',
-    'Eina_Accessor' => ':eina_accessor',
-    'Eina_Accessor *' => ':eina_accessor_p',
-    'Evas_GL_API *' => ':evas_gl_api_p',
-}
-#
-TYPES_USAGE = {}
-#
-def set_type t, v, cb=false
-    return 'bool' if t =~/Eina_Bool/
-    v = v.downcase.sub(/(const|struct|enum|union) /,' ').strip
-    if not TYPES[t].nil?
-        puts "type already exists >#{t}< #{v}"
-        exit 1
-    end
-    r = TYPES[v]
-    v = r[1..-1] if not r.nil?
-    TYPES[t]=':'+v
-    if cb
-        TYPES[t+' *']=':'+v
+def set_type t, sym
+    return ETYPES['Eina_Bool'] if t=='Eina_Bool'
+    if ETYPES[t].nil?
+#        v = ( ETYPES[sym].nil? ? ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] ) : ETYPES[sym] )
+        v = ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] )
+        ETYPES[t] = v
+        printf "\033[0;35m%40s\033[0m => \033[0;36m%s\033[0m\n",t,v
+        return v
     else
-        TYPES[t+' *']=':'+v+'_p'
-        TYPES[t+' **']=':'+v+'_pp'
-        TYPES[t+' ***']=':'+v+'_ppp'
+        printf "\033[0;31mERROR type #{t} => #{sym} alredy exists!\033[0m\n"
+        exit 1
     end
-    v
 end
 #
 def get_type t
     k = t.gsub(/(const|enum|union)/, '').strip
-    k.sub!(/\*/,' *') if k=~/\w+\*/
     r = TYPES[k]
-    if r.nil?
-        puts "unknown type >#{k}< #{t}"
+    return r unless r.nil?
+    r = ETYPES[k]
+    return r unless r.nil?
+    if not k=~ /\*/
+        printf "\033[0;31munknown type >#{k}< #{t}\033[0m\n"
         exit 1
     end
-    TYPES_USAGE[k]||=true
-    r
+    k = k.gsub(/[ \*]*/, '').strip
+    r = ETYPES[k]
+    return ':'+k.downcase if r==':pointer'
+    ':pointer'
 end
 #
 def get_type_from_arg arg, l
@@ -152,39 +44,66 @@ def get_type_from_arg arg, l
     end
     k = arg.gsub(/const/,'').gsub(/\s{2,}/,' ').strip
     if k=~/(.*?)(\w+)$/
-        return get_type $1
+        return get_type $1.strip
     end
     # try with unchanged argument string
     t = get_type k
     if t.nil?
-        puts "wrong arg >#{k}< #{arg} (#{l})"
+        printf "\033[0;31mwrong arg >#{k}< #{arg} (#{l})\033[0m\n"
         exit 1
     end
     t
 end
 #
 def wrap_text txt, indent
-    txt.gsub( /(.{1,#{170}})(?: +|$\n?)|(.{1,#{170}})/,"\\1\\2\n#{indent}").sub(/\n\s+$/,'')
+    txt.gsub( /(.{1,#{150}})(?: +|$\n?)|(.{1,#{150}})/,"\\1\\2\n#{indent}").sub(/\n\s+$/,'')
 end
 #
 def gen_enums path, indent
     r = []
     open(path+'-enums','r').readlines.each do |l|
         l.strip!
-        if not l=~/(typedef enum(?: \w+)?) \{([-A-Z0-9_=, ]+)\} (\w+);/
+        if not l=~/((?:typedef )?enum(?: \w+)?) \{(.*)\} (\w+)/
+            printf "\033[0;31mFIXME : #{l}\n#{indent}# FIXME\033[0m\n"
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
         end
-        typedef = $1
-        values = $2
-        typename = $3
-        v = set_type typename, typename
-        args = values.split(',').collect { |cst| ':'+cst.strip.downcase }.join(', ').gsub(/=/,',').gsub(/ ,/,',')
+        typedef = $1.strip
+        values = $2.strip
+        typename = $3.strip
+        tsym = set_type typename, typename
+        syms, vals = [], []
+        values.split(',').each do |define|
+            s,v = define.gsub(/ /,'').split(/=/)
+            syms << s
+            vals << v
+        end
+        if vals.count(nil) == vals.length
+            args = syms.collect{ |sym| ':'+sym.strip.downcase }.join(', ')
+        else
+            i=0
+            h={}
+            syms.zip(vals) do |s,v|
+                sym=':'+s.downcase
+                if h.has_key? v
+                    h[s]=h[v]
+                elsif v.nil?
+                    h[s]=i
+                    i+=1
+                elsif v=~/\|/
+                    els = v.gsub(/[\(\)]/,'').split(/\|/)
+                    v = els.inject('') { |s,e| s+="#{h[e]}|" }[0..-2]
+                    h[s]=v
+                    i=eval(v).to_i+1
+                else
+                    h[s]=v
+                    i=eval(v).to_i+1
+                end
+            end
+            args = syms.inject(''){|r,s| r+=":#{s.strip.downcase}, #{h[s]}, " }.sub(/, $/,'')
+        end
         r << indent+"# #{typedef} {...} #{typename};"
-        r << wrap_text( indent+"enum :#{v}, [ #{args} ]", indent+' '*4 )
-        r << [ typename+' *', indent+"typedef :pointer, :#{v}_p" ]
-        r << [ typename+' **', indent+"typedef :pointer, :#{v}_pp" ]
-        r << [ typename+' ***', indent+"typedef :pointer, :#{v}_ppp" ]
+        r << wrap_text( indent+"enum #{tsym}, [ #{args} ]", indent+' '*4 )
     end
     r
 end
@@ -193,23 +112,22 @@ def gen_typedefs path, indent
     r = []
     open(path+'-types','r').readlines.each do |l|
         l.strip!
-        if l=~/typedef (struct|enum|union) _\w+ (\w+);/
-            t = $2
-            v = 'pointer'
-            set_type t, t
+        if l=~/typedef (struct|union) _?\w+ (\w+);/
+            t = $2.strip
+            sym = 'pointer'
+        elsif l=~/typedef enum/
+            # nothing todo
+            next
         elsif l =~/typedef\s+((?:\w+\**\s)+)(\w+);/
-            t = $2
-            v = $1
-            v = set_type t, v
+            t = $2.strip
+            sym = $1.strip
         else
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
         end
+        tsym = set_type t, sym
         r << indent+"# #{l}"
-        r << indent+"typedef :#{v}, :#{t.downcase}"
-        r << [ t+' *', indent+"typedef :pointer, :#{t.downcase}_p" ]
-        r << [ t+' **', indent+"typedef :pointer, :#{t.downcase}_pp" ]
-        r << [ t+' ***', indent+"typedef :pointer, :#{t.downcase}_ppp" ]
+        r << indent+"typedef #{tsym}, :#{t.downcase}"
     end
     r
 end
@@ -219,17 +137,18 @@ def gen_callbacks path, indent
     open(path+'-callbacks','r').readlines.each do |l|
         l.strip!
         if not l=~/^\s*typedef\s+(.*)((?:\(\*?\w+\)| \*?\w+))\s*\((.*)\);/
+            printf "\033[0;31m# #{l}\n#{indent}# FIXME\033[0m\n"
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
         end
-        ret = $1
+        ret = $1.strip
         name = $2.strip
         args = $3.split(',').collect { |arg| get_type_from_arg arg, l }.join ', '
-        k = name.sub(/\(/,'').sub(/\)/,'').sub(/\*/,'')
-        t = name.downcase.sub(/\(/,'').sub(/\)/,'').sub(/\*/,'')
-        t = set_type k, t, true
+        t = name.sub(/\(/,'').sub(/\)/,'').sub(/\*/,'')
+        sym = ( t.downcase=~/_cb$/ ? t : t+'_cb' )
+        tsym = set_type t, sym
         r << indent+"# #{l}"
-        r << wrap_text(indent+"callback :#{t}, [ #{args} ], #{get_type ret}", indent+' '*4 )
+        r << wrap_text(indent+"callback #{tsym}, [ #{args} ], #{get_type ret}", indent+' '*4 )
     end
     r
 end
@@ -239,11 +158,12 @@ def gen_variables path, indent
     open(path+'-variables','r').readlines.each do |l|
         l.strip!
         if not l=~ /EAPI\s+extern\s+(\w+\s+\*?)(\w+)/
+            printf "\033[0;31m# #{l}\n#{indent}# FIXME\033[0m\n"
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
         end
-        var = $2
-        t = $1
+        var = $2.strip
+        t = $1.strip
         r << indent+"# #{l}"
         r << wrap_text(indent+"attach_variable :#{var}, #{get_type t}", indent+' '*4)
     end
@@ -255,12 +175,13 @@ def gen_functions path, indent
     r << indent+"fcts = ["
     open(path+'-functions','r').readlines.each do |l|
         l.strip!
-        if not l=~ /EAPI ([a-zA-Z0-9_\* ]+?)(\w+) ?\(([a-zA-Z0-9_ \*,\.]+)\)( *[A-Z]{2,})?/
+        if not l=~ /EAPI ([a-zA-Z0-9_\* ]+?)(\w+) ?\(([a-zA-Z0-9_ \*,\.]*)\)( *[A-Z]{2,})?/
+            printf "\033[0;31m# #{l}\n#{indent}# FIXME\033[0m\n"
             r << indent+"# #{l}\n#{indent}# FIXME"
             next
         end
-        ret = $1
-        func = $2.downcase
+        ret = $1.strip
+        func = $2.strip.downcase
         args = $3.split(',').collect { |arg| get_type_from_arg arg, l }.join ', '
         r << indent+"# #{l}"
         r << wrap_text(indent+"[ :#{func}, [ #{args} ], #{get_type ret} ],", indent+' '*4)
@@ -269,47 +190,332 @@ def gen_functions path, indent
     r
 end
 #
+NATIVE='efl/native'
+#
+HEADER =<<-EOF
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require '#{NATIVE}'REQUIRES
+#
+module Efl
+    #
+    module MNAME
+        #
+        FCT_PREFIX = 'MY_FCT_PREFIX_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+EOF
+#
+FOOTER =<<-EOF
+    end
+end
+#
+# EOF
+EOF
+#
+TYPES = {
+    'int' => ':int',
+    'char' => ':char',
+    'void' => ':void',
+    'long' => ':long',
+    'short' => ':short',
+    'float' => ':float',
+    'pid_t' => ':ulong',
+    'time_t' => ':ulong',
+    'size_t' => ':ulong',
+    'ssize_t' => ':long',
+    'uintptr_t' => ':pointer',
+    'double' => ':double',
+    'long int' => ':long',
+    'long long' => ':long_long',
+    'unsigned int' => ':uint',
+    'unsigned char' => ':uchar',
+    'unsigned short' => ':ushort',
+    'unsigned long long' => ':ulong_long',
+    'char *' => ':string',                                              # FIXME ?!?!
+    'fd_set *' => ':pointer',
+    'FILE *' => ':pointer',
+    'va_list' => ':pointer',                                            # FIXME ?!?!
+    'struct tm *' => ':pointer',
+    'struct timeval *' => ':pointer',
+    'struct sockaddr *' => ':pointer',
+}
+ETYPES = {
+    'Eina_Bool' => ':bool'
+}
+# Evas.h
+EVAS_LAYER_MIN=-32768
+EVAS_LAYER_MAX=32767
+#
+path = File.dirname __FILE__
+lib_path = File.join path, '..', 'lib', 'efl', 'native'
+#
+libs = []
+libs << {
+    :lib=>'eina', :header=>'eina_types.h',
+    :modname=>'Eina', :prefix=>'eina', :outfile=>'eina_types.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eina', :header=>'eina_main.h',
+    :modname=>'Eina', :prefix=>'eina', :outfile=>'eina.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eina', :header=>'eina_xattr.h',
+    :modname=>'EinaXattr', :prefix=>'eina_xattr', :outfile=>'eina_xattr.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eina', :header=>'eina_log.h',
+    :modname=>'EinaLog', :prefix=>'eina_log', :outfile=>'eina_log.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eina', :header=>'eina_list.h',
+    :modname=>'EinaList', :prefix=>'eina_list', :outfile=>'eina_list.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eina', :header=>'eina_hash.h',
+    :modname=>'EinaHash', :prefix=>'eina_hash', :outfile=>'eina_hash.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'eet', :header=>'Eet.h',
+    :modname=>'Eet', :prefix=>'eet', :outfile=>'eet.rb',
+    :requires=>["#{NATIVE}/eina_xattr","#{NATIVE}/eina_list"], :constants=>[]
+}
+libs << {
+    :lib=>'evas', :header=>'Evas.h',
+    :modname=>'Evas', :prefix=>'evas', :outfile=>'evas.rb',
+    :requires=>["#{NATIVE}/eina_list"], :constants=>['EVAS_LAYER_MIN','EVAS_LAYER_MAX']
+}
+libs << {
+    :lib=>'edje', :header=>'Edje.h',
+    :modname=>'Edje', :prefix=>'edje', :outfile=>'edje.rb',
+    :requires=>["#{NATIVE}/evas"], :constants=>[]
+}
+libs << {
+    :lib=>'ecore', :header=>'Ecore.h',
+    :modname=>'Ecore', :prefix=>'ecore', :outfile=>'ecore.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'ecore_input', :header=>'Ecore_Input.h',
+    :modname=>'EcoreInput', :prefix=>'ecore_event', :outfile=>'ecore_input.rb',
+    :requires=>[], :constants=>[]
+}
+libs << {
+    :lib=>'ecore', :header=>'Ecore_Getopt.h',
+    :modname=>'EcoreGetopt', :prefix=>'ecore_getopt', :outfile=>'ecore_getopt.rb',
+    :requires=>["#{NATIVE}/eina_list"], :constants=>[]
+}
+libs << {
+    :lib=>'ecore_evas', :header=>'Ecore_Evas.h',
+    :modname=>'EcoreEvas', :prefix=>'ecore_evas', :outfile=>'ecore_evas.rb',
+    :requires=>["#{NATIVE}/ecore_getopt","#{NATIVE}/evas"], :constants=>[]
+}
+libs << {
+    :lib=>'emap', :header=>'EMap.h',
+    :modname=>'Emap', :prefix=>'emap', :outfile=>'emap.rb',
+    :requires=>["#{NATIVE}/eina_list"], :constants=>[]
+}
+ELM_LIB='elementary-ver-pre-svn-09.so.0'
+libs << {
+    :lib=>ELM_LIB,:header=>'Elementary.h',
+    :modname=>'Elm', :prefix=>'elm', :outfile=>'elementary.rb',
+    :requires=>["#{NATIVE}/elm/elm_general","#{NATIVE}/elm/elm_tooltip"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_general.h',
+    :modname=>'Elm', :prefix=>'elm', :outfile=>'elm/elm_general.rb',
+    :requires=>["#{NATIVE}/evas","#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_tooltip.h',
+    :modname=>'ElmTooltip', :prefix=>'elm', :outfile=>'elm/elm_tooltip.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_object_item.h',
+    :modname=>'ElmObjectItem', :prefix=>'elm_object_item', :outfile=>'elm/elm_object_item.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_icon.h',
+    :modname=>'ElmIcon', :prefix=>'elm_icon', :outfile=>'elm/elm_icon.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_scroller.h',
+    :modname=>'ElmScroller', :prefix=>'elm_scroller', :outfile=>'elm/elm_scroller.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_entry.h',
+    :modname=>'ElmEntry', :prefix=>'elm_entry', :outfile=>'elm/elm_entry.rb',
+    :requires=>["#{NATIVE}/edje","#{NATIVE}/elementary","#{NATIVE}/elm/elm_icon","#{NATIVE}/elm/elm_scroller"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_list.h',
+    :modname=>'ElmList', :prefix=>'elm_list', :outfile=>'elm/elm_list.rb',
+    :requires=>["#{NATIVE}/elementary","#{NATIVE}/elm/elm_scroller"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_win.h',
+    :modname=>'ElmWin', :prefix=>'elm_win', :outfile=>'elm/elm_win.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_bg.h',
+    :modname=>'ElmBg', :prefix=>'elm_bg', :outfile=>'elm/elm_bg.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_label.h',
+    :modname=>'ElmLabel', :prefix=>'elm_label', :outfile=>'elm/elm_label.rb',
+    :requires=>["#{NATIVE}/elementary","#{NATIVE}/elm/elm_entry"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_object.h',
+    :modname=>'ElmObject', :prefix=>'elm_object', :outfile=>'elm/elm_object.rb',
+    :requires=>["#{NATIVE}/edje","#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_box.h',
+    :modname=>'ElmBox', :prefix=>'elm_box', :outfile=>'elm/elm_box.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_button.h',
+    :modname=>'ElmButton', :prefix=>'elm_button', :outfile=>'elm/elm_button.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_frame.h',
+    :modname=>'ElmFrame', :prefix=>'elm_frame', :outfile=>'elm/elm_frame.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_panel.h',
+    :modname=>'ElmPanel', :prefix=>'elm_panel', :outfile=>'elm/elm_panel.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_image.h',
+    :modname=>'ElmImage', :prefix=>'elm_image', :outfile=>'elm/elm_image.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_grid.h',
+    :modname=>'ElmGrid', :prefix=>'elm_grid', :outfile=>'elm/elm_grid.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_menu.h',
+    :modname=>'ElmMenu', :prefix=>'elm_menu', :outfile=>'elm/elm_menu.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_check.h',
+    :modname=>'ElmCheck', :prefix=>'elm_check', :outfile=>'elm/elm_check.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_clock.h',
+    :modname=>'ElmClock', :prefix=>'elm_clock', :outfile=>'elm/elm_clock.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_calendar.h',
+    :modname=>'ElmCalendar', :prefix=>'elm_calendar', :outfile=>'elm/elm_calendar.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_bubble.h',
+    :modname=>'ElmBubble', :prefix=>'elm_bubble', :outfile=>'elm/elm_bubble.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_layout.h',
+    :modname=>'ElmLayout', :prefix=>'elm_layout', :outfile=>'elm/elm_layout.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_cursor.h',
+    :modname=>'ElmCursor', :prefix=>'elm_cursor', :outfile=>'elm/elm_cursor.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+libs << {
+    :lib=>ELM_LIB,:header=>'elm_notify.h',
+    :modname=>'ElmNotify', :prefix=>'elm_notify', :outfile=>'elm/elm_notify.rb',
+    :requires=>["#{NATIVE}/elementary"], :constants=>[]
+}
+#
 Dir.mkdir lib_path unless (File.exists? lib_path)
 #
-libraries.collect do |header,module_name,fct_prefix,lib, output, requires|
-    base = File.join path, 'api', header
-    output = File.join lib_path, output
-    Dir.mkdir File.dirname(output) unless File.exists? File.dirname(output)
-    printf "%-60s", "parse #{base}-*"
-    r = [lib, output, module_name, fct_prefix, requires ]
-    print "enums, "
-    r << gen_enums(base, INDENT)
-    print "typedefs, "
-    r << gen_typedefs(base, INDENT)
-    print "callbacks, "
-    r << gen_callbacks(base, INDENT)
-    print "variables, "
-    r << gen_variables(base, INDENT)
-    puts "functions."
-    r << gen_functions(base, INDENT)
-    r
-end.each do |lib, output, module_name, fct_prefix, requires, enums, typedefs, callbacks, variables, functions|
-    printf "%-60s", "generate #{output}"
-    open(output,'w:utf-8') do |f|
-        requires||=[]
-        reqs =  REQUIRES.concat(requires).collect{|r| "require '#{r}'" }.join ("\n")
-        f << HEADER.gsub(/MNAME/,module_name).sub(/MY_FCT_PREFIX/,fct_prefix).sub(/REQUIRES/,reqs)
-        f << "#{INDENT}#\n#{INDENT}ffi_lib '#{lib}'"
-        f << "\n#{INDENT}#\n#{INDENT}# ENUMS"
+libs.each do |lib|
+    base = File.join path, 'api', lib[:header]
+    printf "\033[1;33mparse \033[0;32m%s-*\033[0;0m\n",base
+    printf " \033[0;33menums...\033[0;0m\n"
+    lib[:enums]=gen_enums(base, INDENT)
+    printf " \033[0;33mtypedefs...\033[0;0m\n"
+    lib[:typedefs]=gen_typedefs(base, INDENT)
+    printf " \033[0;33mcallbacks...\033[0;0m\n"
+    lib[:callbacks]=gen_callbacks(base, INDENT)
+    printf " \033[0;33mvariables...\033[0;0m\n"
+    lib[:variables]=gen_variables(base, INDENT)
+    printf " \033[0;33mfunctions...\033[0;0m\n"
+    lib[:functions]=gen_functions(base, INDENT)
+    printf "\033[1;33mdone\033[0;0m\n"
+end
+libs.each do |lib|
+    printf "\033[1;33mgenerate\033[0;0m %-50s\033[0;0m",lib[:outpath]
+    outpath = File.join lib_path, lib[:outfile]
+    outdir = File.dirname outpath
+    Dir.mkdir outdir unless File.exists? outdir
+    open(File.join(outpath),'w:utf-8') do |f|
+        reqs = ( lib[:requires].nil? ? '' : lib[:requires].inject('') {|s,e| s+="\nrequire '#{e}'"})
+        f << HEADER.gsub(/MNAME/,lib[:modname]).sub(/MY_FCT_PREFIX/,lib[:prefix]).sub(/REQUIRES/,reqs)
+        f << "#{INDENT}#\n#{INDENT}ffi_lib '#{lib[:lib]}'"
+        if not lib[:constants].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# CONSTANTS"
+            f << "\n"+lib[:constants].collect { |cst| INDENT+cst+"="+eval(cst).to_s}.compact.join("\n")
+        end
         print "enums, "
-        f << "\n"+enums.collect { |t| ( t.is_a?(Array) ? ( TYPES_USAGE[t[0]] ? t[1] : nil ) : t ) }.compact.join("\n") unless enums.empty?
-        f << "\n#{INDENT}#\n#{INDENT}# TYPEDEFS"
+        if not lib[:enums].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# ENUMS"
+            f << "\n"+lib[:enums].collect { |t| ( t.is_a?(Array) ? t[1] : t ) }.compact.join("\n")
+        end
         print "typedefs, "
-        f << "\n"+typedefs.collect { |t| ( t.is_a?(Array) ? ( TYPES_USAGE[t[0]] ? t[1] : nil ) : t ) }.compact.join("\n") unless typedefs.empty?
-        f << "\n#{INDENT}#\n#{INDENT}# CALLBACKS"
+        if not lib[:typedefs].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# TYPEDEFS"
+            f << "\n"+lib[:typedefs].collect { |t| ( t.is_a?(Array) ? t[1]  : t ) }.compact.join("\n")
+        end
         print "callbacks, "
-        f << "\n"+callbacks.join("\n") unless callbacks.empty?
-        f << "\n#{INDENT}#\n#{INDENT}# VARIABLES"
+        if not lib[:callbacks].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# CALLBACKS"
+            f << "\n"+lib[:callbacks].join("\n")
+        end
         print "variables, "
-        f << "\n"+variables.join("\n") unless variables.empty?
-        f << "\n#{INDENT}#\n#{INDENT}# FUNCTIONS"
+        if not lib[:variables].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# VARIABLES"
+            f << "\n"+lib[:variables].join("\n")
+        end
         puts "functions."
-        f << "\n"+functions.join("\n") unless functions.empty?
+        if not lib[:functions].empty?
+            f << "\n#{INDENT}#\n#{INDENT}# FUNCTIONS"
+            f << "\n"+lib[:functions].join("\n")
+        end
         f << "\n#{INDENT}#\n#{INDENT}attach_fcts fcts\n#{INDENT}#\n"
         f << FOOTER
     end
diff --git a/tools/sed-enums b/tools/sed-enums
index 14738ac..aa44675 100644
--- a/tools/sed-enums
+++ b/tools/sed-enums
@@ -1,15 +1,15 @@
 # drop if don't start with (typedef)? enum
 /^\s*(typedef\s)?\s*enum/ ! b
 #
-s/^\s*(typedef\s)?\s*(enum(\s+\w+)?).*$/typedef \2 { /
+s/^\s*(typedef\s)?\s*(enum(\s+\w+)?).*$/\1\2 { /
 # drop if substitution fail, copy pattern to  hold space
 T;h
 :attrs;n
 # read again if {
 /^\s*\{/ b attrs
-# append each item
-s/^\s*([A-Z0-9_]+)(\s*=\s*-?[0-9]+)?.*$/\1\2, /
-# goto next if subsitution fails, append pattern, loop
+# append each item finished by , or \/
+s/^\s*([A-Z0-9_]+)(\s*=\s*[^,\/]+)?\s*([,|\)])?[\/]?.*$/\1\2\3 /
+# goto next if subsitution fails, append pattern, loop to attrs
 T next;H;b attrs
 :next
 # try again if } not found
@@ -29,4 +29,5 @@ H;x
 s/\n//g
 # replace multi spaces with one
 s/ {2,}/ /g
-s/, }/ }/p
+s/, }/ }/
+p