follow C API

6 files changed, 483 insertions, 351 deletions

diff --git a/lib/efl/native/ecore.rb b/lib/efl/native/ecore.rb
index 46cf83b..683904b 100644
--- a/lib/efl/native/ecore.rb
+++ b/lib/efl/native/ecore.rb
@@ -182,41 +182,41 @@ module Efl
         [ :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 ],
-        # EAPI void * ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
+        # 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 ],
         # 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);
+        # 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 ],
-        # EAPI void * ecore_event_handler_del(Ecore_Event_Handler *event_handler);
+        # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
         [ :ecore_event_handler_del, [ :ecore_event_handler_p ], :void_p ],
-        # EAPI Ecore_Event * ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
+        # 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 ],
-        # EAPI void * ecore_event_del(Ecore_Event *event);
+        # EAPI void *ecore_event_del(Ecore_Event *event);
         [ :ecore_event_del, [ :ecore_event_p ], :void_p ],
-        # EAPI void * ecore_event_handler_data_get(Ecore_Event_Handler *eh);
+        # EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
         [ :ecore_event_handler_data_get, [ :ecore_event_handler_p ], :void_p ],
-        # EAPI void * ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
+        # 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 ],
         # 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);
+        # 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 ],
-        # EAPI void * ecore_event_filter_del(Ecore_Event_Filter *ef);
+        # EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
         [ :ecore_event_filter_del, [ :ecore_event_filter_p ], :void_p ],
         # EAPI int ecore_event_current_type_get(void);
         [ :ecore_event_current_type_get, [  ], :int ],
-        # EAPI void * ecore_event_current_event_get(void);
+        # EAPI void *ecore_event_current_event_get(void);
         [ :ecore_event_current_event_get, [  ], :void_p ],
         # 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);
+        # EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
         [ :ecore_exe_run, [ :string, :void_p ], :ecore_exe_p ],
-        # EAPI Ecore_Exe * ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
+        # 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 ],
         # 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 ],
@@ -226,23 +226,23 @@ module Efl
         [ :ecore_exe_close_stdin, [ :ecore_exe_p ], :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 ],
-        # EAPI Ecore_Exe_Event_Data * ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
+        # 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 ],
         # EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
         [ :ecore_exe_event_data_free, [ :ecore_exe_event_data_p ], :void ],
-        # EAPI void * ecore_exe_free(Ecore_Exe *exe);
+        # EAPI void *ecore_exe_free(Ecore_Exe *exe);
         [ :ecore_exe_free, [ :ecore_exe_p ], :void_p ],
         # EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
         [ :ecore_exe_pid_get, [ :ecore_exe_p ], :ulong ],
         # EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
         [ :ecore_exe_tag_set, [ :ecore_exe_p, :string ], :void ],
-        # EAPI const char * ecore_exe_tag_get(const Ecore_Exe *exe);
+        # EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
         [ :ecore_exe_tag_get, [ :ecore_exe_p ], :string ],
-        # EAPI const char * ecore_exe_cmd_get(const Ecore_Exe *exe);
+        # EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
         [ :ecore_exe_cmd_get, [ :ecore_exe_p ], :string ],
-        # EAPI void * ecore_exe_data_get(const Ecore_Exe *exe);
+        # EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
         [ :ecore_exe_data_get, [ :ecore_exe_p ], :void_p ],
-        # EAPI void * ecore_exe_data_set(Ecore_Exe *exe, void *data);
+        # EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
         [ :ecore_exe_data_set, [ :ecore_exe_p, :void_p ], :void_p ],
         # EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe);
         [ :ecore_exe_flags_get, [ :ecore_exe_p ], :ecore_exe_flags ],
@@ -262,11 +262,11 @@ module Efl
         [ :ecore_exe_signal, [ :ecore_exe_p, :int ], :void ],
         # EAPI void ecore_exe_hup(Ecore_Exe *exe);
         [ :ecore_exe_hup, [ :ecore_exe_p ], :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);
+        # 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 ],
         # 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 ],
-        # EAPI void * ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
+        # EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
         [ :ecore_main_fd_handler_del, [ :ecore_fd_handler_p ], :void_p ],
         # EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
         [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler_p ], :int ],
@@ -274,9 +274,9 @@ module Efl
         [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :eina_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 ],
-        # EAPI Ecore_Win32_Handler * ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
+        # 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 ],
-        # EAPI void * ecore_main_win32_handler_del(Ecore_Win32_Handler *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 ],
         # EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
         [ :ecore_poller_poll_interval_set, [ :ecore_poller_type, :double ], :void ],
@@ -286,15 +286,15 @@ module Efl
         [ :ecore_poller_poller_interval_set, [ :ecore_poller_p, :int ], :eina_bool ],
         # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
         [ :ecore_poller_poller_interval_get, [ :ecore_poller_p ], :int ],
-        # EAPI Ecore_Poller * ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
+        # 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 ],
         # EAPI void *ecore_poller_del(Ecore_Poller *poller);
         [ :ecore_poller_del, [ :ecore_poller_p ], :void_p ],
         # EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
         [ :ecore_animator_add, [ :ecore_task_cb, :void_p ], :ecore_animator_p ],
-        # EAPI Ecore_Animator * ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
+        # 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 ],
-        # EAPI void * ecore_animator_del(Ecore_Animator *animator);
+        # EAPI void *ecore_animator_del(Ecore_Animator *animator);
         [ :ecore_animator_del, [ :ecore_animator_p ], :void_p ],
         # EAPI void ecore_animator_freeze(Ecore_Animator *animator);
         [ :ecore_animator_freeze, [ :ecore_animator_p ], :void ],
@@ -322,11 +322,11 @@ module Efl
         [ :ecore_time_unix_get, [  ], :double ],
         # 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);
+        # 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 ],
-        # EAPI Ecore_Timer * ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
+        # 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 ],
-        # EAPI void * ecore_timer_del(Ecore_Timer *timer);
+        # EAPI void *ecore_timer_del(Ecore_Timer *timer);
         [ :ecore_timer_del, [ :ecore_timer_p ], :void_p ],
         # EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
         [ :ecore_timer_interval_set, [ :ecore_timer_p, :double ], :void ],
@@ -338,31 +338,33 @@ module Efl
         [ :ecore_timer_thaw, [ :ecore_timer_p ], :void ],
         # EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
         [ :ecore_timer_delay, [ :ecore_timer_p, :double ], :void ],
+        # EAPI void ecore_timer_reset(Ecore_Timer *timer);
+        [ :ecore_timer_reset, [ :ecore_timer_p ], :void ],
         # EAPI double ecore_timer_pending_get(Ecore_Timer *timer);
         [ :ecore_timer_pending_get, [ :ecore_timer_p ], :double ],
         # EAPI double ecore_timer_precision_get(void);
         [ :ecore_timer_precision_get, [  ], :double ],
         # EAPI void ecore_timer_precision_set(double precision);
         [ :ecore_timer_precision_set, [ :double ], :void ],
-        # EAPI char * ecore_timer_dump(void);
+        # EAPI char *ecore_timer_dump(void);
         [ :ecore_timer_dump, [  ], :string ],
-        # EAPI Ecore_Idler * ecore_idler_add(Ecore_Task_Cb func, const void *data);
+        # EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
         [ :ecore_idler_add, [ :ecore_task_cb, :void_p ], :ecore_idler_p ],
-        # EAPI void * ecore_idler_del(Ecore_Idler *idler);
+        # EAPI void *ecore_idler_del(Ecore_Idler *idler);
         [ :ecore_idler_del, [ :ecore_idler_p ], :void_p ],
-        # EAPI Ecore_Idle_Enterer * ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
+        # 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 ],
-        # EAPI Ecore_Idle_Enterer * ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
+        # 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 ],
-        # EAPI void * ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
+        # EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
         [ :ecore_idle_enterer_del, [ :ecore_idle_enterer_p ], :void_p ],
-        # EAPI Ecore_Idle_Exiter * ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
+        # 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 ],
-        # EAPI void * ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
+        # EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
         [ :ecore_idle_exiter_del, [ :ecore_idle_exiter_p ], :void_p ],
-        # EAPI Ecore_Thread * ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data);
+        # 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 ],
-        # 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);
+        # 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 ],
         # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
         [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ],
@@ -390,25 +392,25 @@ module Efl
         [ :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 ],
-        # EAPI void * ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
+        # 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 ],
-        # EAPI void * ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
+        # EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
         [ :ecore_thread_local_data_find, [ :ecore_thread_p, :string ], :void_p ],
         # 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 ],
         # 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 ],
-        # EAPI void * ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
+        # 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 ],
-        # EAPI void * ecore_thread_global_data_find(const char *key);
+        # EAPI void *ecore_thread_global_data_find(const char *key);
         [ :ecore_thread_global_data_find, [ :string ], :void_p ],
         # EAPI Eina_Bool ecore_thread_global_data_del(const char *key);
         [ :ecore_thread_global_data_del, [ :string ], :eina_bool ],
-        # EAPI void * ecore_thread_global_data_wait(const char *key, double seconds);
+        # EAPI void *ecore_thread_global_data_wait(const char *key, double seconds);
         [ :ecore_thread_global_data_wait, [ :string, :double ], :void_p ],
-        # EAPI Ecore_Pipe * ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
+        # EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
         [ :ecore_pipe_add, [ :ecore_pipe_cb, :void_p ], :ecore_pipe_p ],
-        # EAPI void * ecore_pipe_del(Ecore_Pipe *p);
+        # EAPI void *ecore_pipe_del(Ecore_Pipe *p);
         [ :ecore_pipe_del, [ :ecore_pipe_p ], :void_p ],
         # 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 ],
@@ -422,9 +424,9 @@ module Efl
         [ :ecore_pipe_freeze, [ :ecore_pipe_p ], :void ],
         # EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
         [ :ecore_pipe_wait, [ :ecore_pipe_p, :int, :double ], :int ],
-        # EAPI Ecore_Job * ecore_job_add(Ecore_Cb func, const void *data);
+        # EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
         [ :ecore_job_add, [ :ecore_cb, :void_p ], :ecore_job_p ],
-        # EAPI void * ecore_job_del(Ecore_Job *job);
+        # EAPI void *ecore_job_del(Ecore_Job *job);
         [ :ecore_job_del, [ :ecore_job_p ], :void_p ],
         # EAPI void ecore_app_args_set(int argc, const char **argv);
         [ :ecore_app_args_set, [ :int, :string_array ], :void ],
diff --git a/lib/efl/native/ecore_evas.rb b/lib/efl/native/ecore_evas.rb
index e42181b..cb53c26 100644
--- a/lib/efl/native/ecore_evas.rb
+++ b/lib/efl/native/ecore_evas.rb
@@ -91,6 +91,10 @@ module Efl
         attach_variable :ECORE_EVAS_EWS_EVENT_FULLSCREEN_CHANGE, :int
         # EAPI extern int ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE;
         attach_variable :ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE, :int
+        # EAPI extern int ECORE_EVAS_EXTN_CLIENT_ADD;
+        attach_variable :ECORE_EVAS_EXTN_CLIENT_ADD, :int
+        # EAPI extern int ECORE_EVAS_EXTN_CLIENT_DEL;
+        attach_variable :ECORE_EVAS_EXTN_CLIENT_DEL, :int
         #
         # FUNCTIONS
         fcts = [
@@ -442,6 +446,14 @@ module Efl
         [ :ecore_evas_ews_manager_set, [ :void_p ], :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 ],
         ]
         if RUBY_PLATFORM =~ /darwin/
             # EAPI Ecore_Evas *ecore_evas_cocoa_new(const char* name, int w, int h);
diff --git a/lib/efl/native/eet.rb b/lib/efl/native/eet.rb
index 6f32661..dac5522 100644
--- a/lib/efl/native/eet.rb
+++ b/lib/efl/native/eet.rb
@@ -161,6 +161,8 @@ module Efl
         [ :eet_delete, [ :eet_file_p, :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 ],
+        # EAPI const char * eet_file_get(Eet_File *ef);
+        [ :eet_file_get, [ :eet_file_p ], :string ],
         # EAPI const char * eet_alias_get(Eet_File *ef, const char *name);
         [ :eet_alias_get, [ :eet_file_p, :string ], :string ],
         # EAPI char ** eet_list(Eet_File *ef, const char *glob, int *count_ret);
diff --git a/lib/efl/native/eina_hash.rb b/lib/efl/native/eina_hash.rb
index b2c4386..383c182 100644
--- a/lib/efl/native/eina_hash.rb
+++ b/lib/efl/native/eina_hash.rb
@@ -104,7 +104,7 @@ module Efl
         [ :eina_hash_iterator_data_new, [ :eina_hash_p ], :eina_iterator_p ],
         # EAPI Eina_Iterator *eina_hash_iterator_tuple_new(const Eina_Hash *hash);
         [ :eina_hash_iterator_tuple_new, [ :eina_hash_p ], :eina_iterator_p ],
-        # EAPI void eina_hash_foreach(const Eina_Hash *hash, Eina_Hash_Foreach cb, const void *fdata);
+        # 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 ],
         # EAPI int eina_hash_superfast(const char *key, int len);
         [ :eina_hash_superfast, [ :string, :int ], :int ],
diff --git a/lib/efl/native/elementary.rb b/lib/efl/native/elementary.rb
index fe12be1..9f9daed 100644
--- a/lib/efl/native/elementary.rb
+++ b/lib/efl/native/elementary.rb
@@ -63,8 +63,14 @@ module Efl
         # 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, :elm_image_rotate_90_cw, :elm_image_rotate_180_cw, :elm_image_rotate_90_ccw, :elm_image_flip_horizontal,
-            :elm_image_flip_vertical, :elm_image_flip_transpose, :elm_image_flip_transverse ]
+        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
@@ -96,11 +102,14 @@ module Efl
             ]
         # 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_last ]
+            :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;
@@ -308,6 +317,9 @@ module Efl
         # 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);
@@ -316,16 +328,18 @@ module Efl
         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 char *(*Elm_Gen_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_label_get_cb, [ :void_p, :evas_object_p, :string ], :string
+        # 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_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gengrid_item_label_get_cb, [ :void_p, :evas_object_p, :string ], :string
+        # 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);
@@ -350,10 +364,8 @@ module Efl
         callback :elm_web_console_message, [ :void_p, :evas_object_p, :string, :uint, :string ], :void
         # 
         # FIXME
-        # 
-        # FIXME
-        # typedef char *(*Elm_Genlist_Item_Label_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_genlist_item_label_get_cb, [ :void_p, :evas_object_p, :string ], :string
+        # 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);
@@ -406,6 +418,8 @@ module Efl
         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;
@@ -485,34 +499,36 @@ module Efl
         [ :elm_policy_get, [ :uint ], :int ],
         # EAPI void elm_language_set(const char *lang);
         [ :elm_language_set, [ :string ], :void ],
-        # EAPI void elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label);
-        [ :elm_object_text_part_set, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_text_part_get, [ :evas_object_p, :string ], :string ],
+        # 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_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content);
-        [ :elm_object_content_part_set, [ :evas_object_p, :string, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_content_part_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part);
-        [ :elm_object_content_part_unset, [ :evas_object_p, :string ], :evas_object_p ],
+        # 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_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
-        [ :elm_object_item_content_part_set, [ :elm_object_item_p, :string, :evas_object_p ], :void ],
+        # 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_content_part_unset(Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_content_part_unset, [ :elm_object_item_p, :string ], :evas_object_p ],
-        # EAPI void elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label);
-        [ :elm_object_item_text_part_set, [ :elm_object_item_p, :string, :string ], :void ],
-        # EAPI const char *elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_text_part_get, [ :elm_object_item_p, :string ], :string ],
-        # 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_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);
@@ -521,6 +537,10 @@ module Efl
         [ :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);
@@ -689,9 +709,9 @@ module Efl
         [ :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);;
+        # 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);;
+        # 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 ],
@@ -861,6 +881,8 @@ module Efl
         [ :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);
@@ -933,6 +955,14 @@ module Efl
         [ :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);
@@ -983,7 +1013,7 @@ module Efl
         [ :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);;
+        # 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 ],
@@ -1075,6 +1105,30 @@ module Efl
         [ :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);
@@ -1305,48 +1359,6 @@ module Efl
         [ :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 void elm_gen_clear(Evas_Object *obj);
-        [ :elm_gen_clear, [ :evas_object_p ], :void ],
-        # EAPI void elm_gen_item_selected_set(Elm_Gen_Item *it, Eina_Bool selected);
-        [ :elm_gen_item_selected_set, [ :elm_gen_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gen_item_selected_get(const Elm_Gen_Item *it);
-        [ :elm_gen_item_selected_get, [ :elm_gen_item_p ], :eina_bool ],
-        # EAPI void elm_gen_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
-        [ :elm_gen_always_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gen_always_select_mode_get(const Evas_Object *obj);
-        [ :elm_gen_always_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gen_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
-        [ :elm_gen_no_select_mode_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_gen_no_select_mode_get(const Evas_Object *obj);
-        [ :elm_gen_no_select_mode_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void elm_gen_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_gen_bounce_set, [ :evas_object_p, :eina_bool, :eina_bool ], :void ],
-        # EAPI void elm_gen_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_gen_bounce_get, [ :evas_object_p, :eina_bool_p, :eina_bool_p ], :void ],
-        # EAPI void elm_gen_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
-        [ :elm_gen_page_relative_set, [ :evas_object_p, :double, :double ], :void ],
-        # EAPI void elm_gen_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel);
-        [ :elm_gen_page_relative_get, [ :evas_object_p, :double_p, :double_p ], :void ],
-        # EAPI void elm_gen_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
-        [ :elm_gen_page_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gen_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_gen_current_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gen_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_gen_last_page_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void elm_gen_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_gen_page_show, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void elm_gen_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_gen_page_bring_in, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI Elm_Gen_Item *elm_gen_first_item_get(const Evas_Object *obj);
-        [ :elm_gen_first_item_get, [ :evas_object_p ], :elm_gen_item_p ],
-        # EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj);
-        [ :elm_gen_last_item_get, [ :evas_object_p ], :elm_gen_item_p ],
-        # EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it);
-        [ :elm_gen_item_next_get, [ :elm_gen_item_p ], :elm_gen_item_p ],
-        # EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it);
-        [ :elm_gen_item_prev_get, [ :elm_gen_item_p ], :elm_gen_item_p ],
-        # EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it);
-        [ :elm_gen_item_widget_get, [ :elm_gen_item_p ], :evas_object_p ],
         # 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);
@@ -1378,14 +1390,50 @@ module Efl
         # 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);
@@ -1400,6 +1448,10 @@ module Efl
         [ :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);
@@ -1420,10 +1472,10 @@ module Efl
         [ :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_size_restrict_disable(Elm_Gengrid_Item *item, Eina_Bool disable);
-        [ :elm_gengrid_item_tooltip_size_restrict_disable, [ :elm_gengrid_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_gengrid_item_tooltip_size_restrict_disabled_get(const Elm_Gengrid_Item *item);
-        [ :elm_gengrid_item_tooltip_size_restrict_disabled_get, [ :elm_gengrid_item_p ], :eina_bool ],
+        # 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);
@@ -1438,6 +1490,8 @@ module Efl
         [ :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);
@@ -1903,12 +1957,6 @@ module Efl
         [ :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_icon_set(Evas_Object *obj, Evas_Object *icon);
-        [ :elm_hoversel_icon_set, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_hoversel_icon_get(const Evas_Object *obj);
-        [ :elm_hoversel_icon_get, [ :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_hoversel_icon_unset(Evas_Object *obj);
-        [ :elm_hoversel_icon_unset, [ :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);
@@ -1919,20 +1967,16 @@ module Efl
         [ :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_Hoversel_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_hoversel_item_p ],
-        # EAPI void elm_hoversel_item_del(Elm_Hoversel_Item *item);
-        [ :elm_hoversel_item_del, [ :elm_hoversel_item_p ], :void ],
-        # EAPI void elm_hoversel_item_del_cb_set(Elm_Hoversel_Item *it, Evas_Smart_Cb func);
-        [ :elm_hoversel_item_del_cb_set, [ :elm_hoversel_item_p, :evas_smart_cb ], :void ],
-        # EAPI void *elm_hoversel_item_data_get(const Elm_Hoversel_Item *it);
-        [ :elm_hoversel_item_data_get, [ :elm_hoversel_item_p ], :void_p ],
-        # EAPI const char *elm_hoversel_item_label_get(const Elm_Hoversel_Item *it);
-        [ :elm_hoversel_item_label_get, [ :elm_hoversel_item_p ], :string ],
-        # EAPI void elm_hoversel_item_icon_set(Elm_Hoversel_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type);
-        [ :elm_hoversel_item_icon_set, [ :elm_hoversel_item_p, :string, :string, :elm_icon_type ], :void ],
-        # EAPI void elm_hoversel_item_icon_get(const Elm_Hoversel_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type);
-        [ :elm_hoversel_item_icon_get, [ :elm_hoversel_item_p, :string_array, :string_array, :elm_icon_type_p ], :void ],
+        # 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);
@@ -1951,66 +1995,54 @@ module Efl
         [ :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_Toolbar_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_toolbar_item_p ],
-        # EAPI Elm_Toolbar_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_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_before, [ :evas_object_p, :elm_toolbar_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Toolbar_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_after, [ :evas_object_p, :elm_toolbar_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_first_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_first_item_get, [ :evas_object_p ], :elm_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_last_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_last_item_get, [ :evas_object_p ], :elm_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_item_next_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_next_get, [ :elm_toolbar_item_p ], :elm_toolbar_item_p ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_item_prev_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_prev_get, [ :elm_toolbar_item_p ], :elm_toolbar_item_p ],
-        # EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_toolbar_get, [ :elm_toolbar_item_p ], :evas_object_p ],
-        # EAPI void elm_toolbar_item_priority_set(Elm_Toolbar_Item *item, int priority);
-        [ :elm_toolbar_item_priority_set, [ :elm_toolbar_item_p, :int ], :void ],
-        # EAPI int elm_toolbar_item_priority_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_priority_get, [ :elm_toolbar_item_p ], :int ],
-        # EAPI const char *elm_toolbar_item_label_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_label_get, [ :elm_toolbar_item_p ], :string ],
-        # EAPI void elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label);
-        [ :elm_toolbar_item_label_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI void *elm_toolbar_item_data_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_data_get, [ :elm_toolbar_item_p ], :void_p ],
-        # EAPI void elm_toolbar_item_data_set(Elm_Toolbar_Item *item, const void *data);
-        [ :elm_toolbar_item_data_set, [ :elm_toolbar_item_p, :void_p ], :void ],
-        # EAPI Elm_Toolbar_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_toolbar_item_p ],
-        # EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_selected_get, [ :elm_toolbar_item_p ], :eina_bool ],
-        # EAPI void elm_toolbar_item_selected_set(Elm_Toolbar_Item *item, Eina_Bool selected);
-        [ :elm_toolbar_item_selected_set, [ :elm_toolbar_item_p, :eina_bool ], :void ],
-        # EAPI Elm_Toolbar_Item *elm_toolbar_selected_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_selected_item_get, [ :evas_object_p ], :elm_toolbar_item_p ],
-        # EAPI void elm_toolbar_item_icon_set(Elm_Toolbar_Item *item, const char *icon);
-        [ :elm_toolbar_item_icon_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_icon_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_icon_get, [ :elm_toolbar_item_p ], :string ],
-        # EAPI Evas_Object *elm_toolbar_item_object_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_object_get, [ :elm_toolbar_item_p ], :evas_object_p ],
-        # EAPI Evas_Object *elm_toolbar_item_icon_object_get(Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_icon_object_get, [ :elm_toolbar_item_p ], :evas_object_p ],
-        # EAPI Eina_Bool elm_toolbar_item_icon_memfile_set(Elm_Toolbar_Item *item, const void *img, size_t size, const char *format, const char *key);
-        [ :elm_toolbar_item_icon_memfile_set, [ :elm_toolbar_item_p, :void_p, :ulong, :string, :string ], :eina_bool ],
-        # EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_del, [ :elm_toolbar_item_p ], :void ],
-        # EAPI void elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *item, Evas_Smart_Cb func);
-        [ :elm_toolbar_item_del_cb_set, [ :elm_toolbar_item_p, :evas_smart_cb ], :void ],
-        # EAPI Eina_Bool elm_toolbar_item_disabled_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_disabled_get, [ :elm_toolbar_item_p ], :eina_bool ],
-        # EAPI void elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled);
-        [ :elm_toolbar_item_disabled_set, [ :elm_toolbar_item_p, :eina_bool ], :void ],
-        # EAPI void elm_toolbar_item_separator_set(Elm_Toolbar_Item *item, Eina_Bool separator);
-        [ :elm_toolbar_item_separator_set, [ :elm_toolbar_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_separator_get, [ :elm_toolbar_item_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);
@@ -2027,48 +2059,48 @@ module Efl
         [ :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_Toolbar_Item *item, Eina_Bool menu);
-        [ :elm_toolbar_item_menu_set, [ :elm_toolbar_item_p, :eina_bool ], :void ],
-        # EAPI Evas_Object *elm_toolbar_item_menu_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_menu_get, [ :elm_toolbar_item_p ], :evas_object_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_add(Elm_Toolbar_Item *item, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_state_add, [ :elm_toolbar_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_toolbar_item_state_p ],
-        # EAPI Eina_Bool elm_toolbar_item_state_del(Elm_Toolbar_Item *item, Elm_Toolbar_Item_State *state);
-        [ :elm_toolbar_item_state_del, [ :elm_toolbar_item_p, :elm_toolbar_item_state_p ], :eina_bool ],
-        # EAPI Eina_Bool elm_toolbar_item_state_set(Elm_Toolbar_Item *it, Elm_Toolbar_Item_State *state);
-        [ :elm_toolbar_item_state_set, [ :elm_toolbar_item_p, :elm_toolbar_item_state_p ], :eina_bool ],
-        # EAPI void elm_toolbar_item_state_unset(Elm_Toolbar_Item *it);
-        [ :elm_toolbar_item_state_unset, [ :elm_toolbar_item_p ], :void ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_get(const Elm_Toolbar_Item *it);
-        [ :elm_toolbar_item_state_get, [ :elm_toolbar_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_next(Elm_Toolbar_Item *it);
-        [ :elm_toolbar_item_state_next, [ :elm_toolbar_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_prev(Elm_Toolbar_Item *it);
-        [ :elm_toolbar_item_state_prev, [ :elm_toolbar_item_p ], :elm_toolbar_item_state_p ],
-        # EAPI void elm_toolbar_item_tooltip_text_set(Elm_Toolbar_Item *item, const char *text);
-        [ :elm_toolbar_item_tooltip_text_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_content_cb_set(Elm_Toolbar_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_toolbar_item_tooltip_content_cb_set, [ :elm_toolbar_item_p, :elm_tooltip_item_content_cb, :void_p, :evas_smart_cb ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_unset(Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_tooltip_unset, [ :elm_toolbar_item_p ], :void ],
-        # EAPI void elm_toolbar_item_tooltip_style_set(Elm_Toolbar_Item *item, const char *style);
-        [ :elm_toolbar_item_tooltip_style_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_tooltip_style_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_tooltip_style_get, [ :elm_toolbar_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_set(Elm_Toolbar_Item *item, const char *cursor);
-        [ :elm_toolbar_item_cursor_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_cursor_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_cursor_get, [ :elm_toolbar_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_unset(Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_cursor_unset, [ :elm_toolbar_item_p ], :void ],
-        # EAPI void elm_toolbar_item_cursor_style_set(Elm_Toolbar_Item *item, const char *style);
-        [ :elm_toolbar_item_cursor_style_set, [ :elm_toolbar_item_p, :string ], :void ],
-        # EAPI const char *elm_toolbar_item_cursor_style_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_cursor_style_get, [ :elm_toolbar_item_p ], :string ],
-        # EAPI void elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only);
-        [ :elm_toolbar_item_cursor_engine_only_set, [ :elm_toolbar_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item);
-        [ :elm_toolbar_item_cursor_engine_only_get, [ :elm_toolbar_item_p ], :eina_bool ],
+        # 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);
@@ -2093,10 +2125,10 @@ module Efl
         [ :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_tooltip_size_restrict_disable(Evas_Object *obj, Eina_Bool disable);;
-        [ :elm_tooltip_size_restrict_disable, [ :evas_object_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_tooltip_size_restrict_disabled_get(const Evas_Object *obj);;
-        [ :elm_tooltip_size_restrict_disabled_get, [ :evas_object_p ], :eina_bool ],
+        # 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);
@@ -2127,60 +2159,44 @@ module Efl
         [ :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_Menu_Item *it);
-        [ :elm_menu_item_object_get, [ :elm_menu_item_p ], :evas_object_p ],
-        # EAPI Elm_Menu_Item *elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_menu_item_add, [ :evas_object_p, :elm_menu_item_p, :string, :string, :evas_smart_cb, :void_p ], :elm_menu_item_p ],
-        # EAPI Elm_Menu_Item *elm_menu_item_add_object(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data);
-        [ :elm_menu_item_add_object, [ :evas_object_p, :elm_menu_item_p, :evas_object_p, :evas_smart_cb, :void_p ], :elm_menu_item_p ],
-        # EAPI void elm_menu_item_label_set(Elm_Menu_Item *item, const char *label);
-        [ :elm_menu_item_label_set, [ :elm_menu_item_p, :string ], :void ],
-        # EAPI const char *elm_menu_item_label_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_label_get, [ :elm_menu_item_p ], :string ],
-        # EAPI void elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, const char *icon);
-        [ :elm_menu_item_object_icon_name_set, [ :elm_menu_item_p, :string ], :void ],
-        # EAPI const char *elm_menu_item_object_icon_name_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_object_icon_name_get, [ :elm_menu_item_p ], :string ],
-        # EAPI Eina_Bool elm_menu_item_object_content_set(Elm_Menu_Item *item, Evas_Object *obj);
-        [ :elm_menu_item_object_content_set, [ :elm_menu_item_p, :evas_object_p ], :eina_bool ],
-        # EAPI Evas_Object *elm_menu_item_object_content_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_object_content_get, [ :elm_menu_item_p ], :evas_object_p ],
-        # EAPI void elm_menu_item_selected_set(Elm_Menu_Item *item, Eina_Bool selected);
-        [ :elm_menu_item_selected_set, [ :elm_menu_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_selected_get, [ :elm_menu_item_p ], :eina_bool ],
-        # EAPI void elm_menu_item_disabled_set(Elm_Menu_Item *item, Eina_Bool disabled);
-        [ :elm_menu_item_disabled_set, [ :elm_menu_item_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool elm_menu_item_disabled_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_disabled_get, [ :elm_menu_item_p ], :eina_bool ],
-        # EAPI Elm_Menu_Item *elm_menu_item_separator_add(Evas_Object *obj, Elm_Menu_Item *parent);
-        [ :elm_menu_item_separator_add, [ :evas_object_p, :elm_menu_item_p ], :elm_menu_item_p ],
-        # EAPI Eina_Bool elm_menu_item_is_separator(Elm_Menu_Item *item);
-        [ :elm_menu_item_is_separator, [ :elm_menu_item_p ], :eina_bool ],
-        # EAPI void elm_menu_item_del(Elm_Menu_Item *item);
-        [ :elm_menu_item_del, [ :elm_menu_item_p ], :void ],
-        # EAPI void elm_menu_item_del_cb_set(Elm_Menu_Item *it, Evas_Smart_Cb func);
-        [ :elm_menu_item_del_cb_set, [ :elm_menu_item_p, :evas_smart_cb ], :void ],
-        # EAPI void *elm_menu_item_data_get(const Elm_Menu_Item *it);
-        [ :elm_menu_item_data_get, [ :elm_menu_item_p ], :void_p ],
-        # EAPI void elm_menu_item_data_set(Elm_Menu_Item *item, const void *data);
-        [ :elm_menu_item_data_set, [ :elm_menu_item_p, :void_p ], :void ],
-        # EAPI const Eina_List *elm_menu_item_subitems_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_subitems_get, [ :elm_menu_item_p ], :eina_list_p ],
-        # EAPI unsigned int elm_menu_item_index_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_index_get, [ :elm_menu_item_p ], :uint ],
-        # EAPI Evas_Object *elm_menu_item_menu_get(const Elm_Menu_Item *item);
-        [ :elm_menu_item_menu_get, [ :elm_menu_item_p ], :evas_object_p ],
-        # EAPI Elm_Menu_Item *elm_menu_selected_item_get(const Evas_Object * obj);
-        [ :elm_menu_selected_item_get, [ :evas_object_p ], :elm_menu_item_p ],
-        # EAPI Elm_Menu_Item *elm_menu_last_item_get(const Evas_Object * obj);
-        [ :elm_menu_last_item_get, [ :evas_object_p ], :elm_menu_item_p ],
-        # EAPI Elm_Menu_Item *elm_menu_first_item_get(const Evas_Object * obj);
-        [ :elm_menu_first_item_get, [ :evas_object_p ], :elm_menu_item_p ],
-        # EAPI Elm_Menu_Item *elm_menu_item_next_get(const Elm_Menu_Item *it);
-        [ :elm_menu_item_next_get, [ :elm_menu_item_p ], :elm_menu_item_p ],
-        # EAPI Elm_Menu_Item *elm_menu_item_prev_get(const Elm_Menu_Item *it);
-        [ :elm_menu_item_prev_get, [ :elm_menu_item_p ], :elm_menu_item_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);
@@ -2269,10 +2285,10 @@ module Efl
         [ :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_size_restrict_disable(Elm_List_Item *item, Eina_Bool disable);
-        [ :elm_list_item_tooltip_size_restrict_disable, [ :elm_list_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_list_item_tooltip_size_restrict_disabled_get(const Elm_List_Item *item);
-        [ :elm_list_item_tooltip_size_restrict_disabled_get, [ :elm_list_item_p ], :eina_bool ],
+        # 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);
@@ -2351,6 +2367,8 @@ module Efl
         [ :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);
@@ -2359,6 +2377,14 @@ module Efl
         [ :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);
@@ -2367,6 +2393,10 @@ module Efl
         [ :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);
@@ -2409,14 +2439,28 @@ module Efl
         [ :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);
@@ -2455,6 +2499,12 @@ module Efl
         [ :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);
@@ -2469,10 +2519,10 @@ module Efl
         [ :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_size_restrict_disable(Elm_Genlist_Item *item, Eina_Bool disable);
-        [ :elm_genlist_item_tooltip_size_restrict_disable, [ :elm_genlist_item_p, :eina_bool ], :eina_bool ],
-        # EAPI Eina_Bool elm_genlist_item_tooltip_size_restrict_disabled_get(const Elm_Genlist_Item *item);
-        [ :elm_genlist_item_tooltip_size_restrict_disabled_get, [ :elm_genlist_item_p ], :eina_bool ],
+        # 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);
@@ -2535,12 +2585,12 @@ module Efl
         [ :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_Slideshow_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_slideshow_item_p ],
-        # EAPI Elm_Slideshow_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_slideshow_item_p ],
-        # EAPI void elm_slideshow_show(Elm_Slideshow_Item *item);
-        [ :elm_slideshow_show, [ :elm_slideshow_item_p ], :void ],
+        # 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);
@@ -2563,16 +2613,14 @@ module Efl
         [ :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_Slideshow_Item *item);
-        [ :elm_slideshow_item_del, [ :elm_slideshow_item_p ], :void ],
-        # EAPI void *elm_slideshow_item_data_get(const Elm_Slideshow_Item *item);
-        [ :elm_slideshow_item_data_get, [ :elm_slideshow_item_p ], :void_p ],
-        # EAPI Elm_Slideshow_Item *elm_slideshow_item_current_get(const Evas_Object *obj);
-        [ :elm_slideshow_item_current_get, [ :evas_object_p ], :elm_slideshow_item_p ],
-        # EAPI Evas_Object* elm_slideshow_item_object_get(const Elm_Slideshow_Item* item);
-        [ :elm_slideshow_item_object_get, [ :elm_slideshow_item_p ], :evas_object_p ],
-        # EAPI Elm_Slideshow_Item *elm_slideshow_item_nth_get(const Evas_Object *obj, unsigned int nth);
-        [ :elm_slideshow_item_nth_get, [ :evas_object_p, :uint ], :elm_slideshow_item_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);
@@ -2695,20 +2743,20 @@ module Efl
         [ :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 void *elm_index_item_selected_get(const Evas_Object *obj, int level);
-        [ :elm_index_item_selected_get, [ :evas_object_p, :int ], :void_p ],
+        # 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 void *relative);
-        [ :elm_index_item_append_relative, [ :evas_object_p, :string, :void_p, :void_p ], :void ],
-        # EAPI void elm_index_item_prepend_relative(Evas_Object *obj, const char *letter, const void *item, const void *relative);
-        [ :elm_index_item_prepend_relative, [ :evas_object_p, :string, :void_p, :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, const void *item);
-        [ :elm_index_item_del, [ :evas_object_p, :void_p ], :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);
@@ -3143,18 +3191,8 @@ module Efl
         [ :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 void elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
-        [ :elm_ctxpopup_item_disabled_set, [ :elm_object_item_p, :eina_bool ], :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 Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it);
-        [ :elm_ctxpopup_item_icon_get, [ :elm_object_item_p ], :evas_object_p ],
-        # EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon);
-        [ :elm_ctxpopup_item_icon_set, [ :elm_object_item_p, :evas_object_p ], :void ],
-        # EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_Item *it);
-        [ :elm_ctxpopup_item_label_get, [ :elm_object_item_p ], :string ],
-        # EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label);
-        [ :elm_ctxpopup_item_label_set, [ :elm_object_item_p, :string ], :void ],
         # 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 ],
@@ -3409,6 +3447,64 @@ module Efl
         [ :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/evas.rb b/lib/efl/native/evas.rb
index a87ed14..e730b08 100644
--- a/lib/efl/native/evas.rb
+++ b/lib/efl/native/evas.rb
@@ -31,7 +31,7 @@ module Efl
             :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_last ]
+            :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 ]
         # typedef enum _Evas_Event_Flags {...} Evas_Event_Flags;
@@ -339,6 +339,10 @@ module Efl
         [ :evas_output_viewport_set, [ :evas_p, :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 ],
+        # 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 ],
+        # 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 ],
         # EAPI Evas_Coord evas_coord_screen_x_to_world (const Evas *e, int x);
         [ :evas_coord_screen_x_to_world, [ :evas_p, :int ], :int ],
         # EAPI Evas_Coord evas_coord_screen_y_to_world (const Evas *e, int y);
@@ -371,6 +375,10 @@ module Efl
         [ :evas_post_event_callback_remove, [ :evas_p, :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 ],
+        # EAPI void evas_event_default_flags_set (Evas *e, Evas_Event_Flags flags);
+        [ :evas_event_default_flags_set, [ :evas_p, :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 ],
         # EAPI void evas_event_freeze (Evas *e);
         [ :evas_event_freeze, [ :evas_p ], :void ],
         # EAPI void evas_event_thaw (Evas *e);
@@ -809,6 +817,8 @@ module Efl
         [ :evas_object_image_colorspace_set, [ :evas_object_p, :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 ],
+        # EAPI Eina_Bool evas_object_image_region_support_get (const Evas_Object *obj);
+        [ :evas_object_image_region_support_get, [ :evas_object_p ], :eina_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 ],
         # EAPI Evas_Native_Surface *evas_object_image_native_surface_get (const Evas_Object *obj);
@@ -919,6 +929,10 @@ module Efl
         [ :evas_textblock_string_escape_get, [ :string, :int_p ], :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 ],
+        # 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 ],
         # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
         [ :evas_textblock_style_new, [  ], :evas_textblock_style_p ],
         # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
@@ -997,6 +1011,10 @@ module Efl
         [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor_p ], :eina_bool ],
         # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
         [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor_p ], :eina_bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor_p ], :eina_bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor_p ], :eina_bool ],
         # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
         [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor_p ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
@@ -1031,6 +1049,8 @@ module Efl
         [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor_p ], :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 ],
+        # 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 ],
         # 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 ],
         # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);