1 files changed, 94 insertions, 6 deletions

diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 1ac0bfe..2131bd8 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -22,8 +22,11 @@
 # include <Eio.h>
 
 // Evas internal EO APIs
+# include "Evas.h"
 # include "Evas_Internal.h"
 
+#include "Elementary.h"
+#include "Efl_Ui.h"
 # ifdef EAPI
 #  undef EAPI
 # endif
@@ -61,12 +64,97 @@
 # define EWAPI EAPI EAPI_WEAK
 
 # include "elm_widget.h"
-# include "elm_access.eo.h"
 # include "elm_code_private.h"
+#include "elm_access_eo.h"
+#include "elm_actionslider_eo.h"
+#include "elm_box_eo.h"
+#include "elm_bubble_eo.h"
+#include "elm_calendar_eo.h"
+#include "elm_calendar_item_eo.h"
+#include "elm_clock_eo.h"
+#include "elm_code_widget_legacy_eo.h"
+#include "elm_color_item_eo.h"
+#include "elm_colorselector_eo.h"
+#include "elm_conformant_eo.h"
+#include "elm_ctxpopup_eo.h"
+#include "elm_ctxpopup_item_eo.h"
+#include "elm_dayselector_eo.h"
+#include "elm_dayselector_item_eo.h"
+#include "elm_diskselector_eo.h"
+#include "elm_diskselector_item_eo.h"
+#include "elm_entry_eo.h"
+#include "elm_fileselector_button_eo.h"
+#include "elm_fileselector_entry_eo.h"
+#include "elm_fileselector_eo.h"
+#include "elm_flipselector_eo.h"
+#include "elm_flipselector_item_eo.h"
+#include "elm_gengrid_eo.h"
+#include "elm_gengrid_item_eo.h"
+#include "elm_gengrid_pan_eo.h"
+#include "elm_genlist_eo.h"
+#include "elm_genlist_item_eo.h"
+#include "elm_genlist_pan_eo.h"
+#include "elm_gesture_layer_eo.h"
+#include "elm_glview_eo.h"
+#include "elm_grid_eo.h"
+#include "elm_hover_eo.h"
+#include "elm_hoversel_eo.h"
+#include "elm_hoversel_item_eo.h"
+#include "elm_icon_eo.h"
+#include "elm_image_eo.h"
+#include "elm_index_eo.h"
+#include "elm_index_item_eo.h"
+#include "elm_interface_fileselector_eo.h"
+#include "elm_inwin_eo.h"
+#include "elm_label_eo.h"
+#include "elm_list_eo.h"
+#include "elm_list_item_eo.h"
+#include "elm_mapbuf_eo.h"
+#include "elm_map_eo.h"
+#include "elm_map_pan_eo.h"
+#include "elm_menu_eo.h"
+#include "elm_menu_item_eo.h"
+#include "elm_multibuttonentry_eo.h"
+#include "elm_multibuttonentry_item_eo.h"
+#include "elm_naviframe_eo.h"
+#include "elm_naviframe_item_eo.h"
+#include "elm_notify_eo.h"
+#include "elm_panel_eo.h"
+#include "elm_pan_eo.h"
+#include "elm_photo_eo.h"
+#include "elm_player_eo.h"
+#include "elm_plug_eo.h"
+#include "elm_popup_eo.h"
+#include "elm_popup_item_eo.h"
+#include "elm_prefs_eo.h"
+#include "elm_route_eo.h"
+#include "elm_scroller_eo.h"
+#include "elm_segment_control_eo.h"
+#include "elm_segment_control_item_eo.h"
+#include "elm_separator_eo.h"
+#include "elm_slider_eo.h"
+#include "elm_slider_part_indicator_eo.h"
+#include "elm_slideshow_eo.h"
+#include "elm_slideshow_item_eo.h"
+#include "elm_spinner_eo.h"
+#include "elm_sys_notify_dbus_eo.h"
+#include "elm_sys_notify_eo.h"
+#include "elm_sys_notify_interface_eo.h"
+#include "elm_systray_eo.h"
+#include "elm_table_eo.h"
+#include "elm_thumb_eo.h"
+#include "elm_toolbar_eo.h"
+#include "elm_toolbar_item_eo.h"
+#include "elm_web_eo.h"
+#include "elm_widget_item_container_eo.h"
+#include "elm_widget_item_eo.h"
+#include "elm_widget_item_static_focus_eo.h"
+#include "elm_win_eo.h"
+
 # include "efl_ui_focus_parent_provider.eo.h"
 # include "efl_ui_widget_focus_manager.eo.h"
 # include "efl_ui_focus_parent_provider_standard.eo.h"
-# include "elm_widget_item_static_focus.eo.h"
+# include "elm_widget_item_static_focus_eo.h"
 # include "efl_ui_selection_manager.eo.h"
 # include "efl_datetime_manager.eo.h"
 # include "efl_ui_size_model.eo.h"
@@ -177,7 +265,7 @@ struct _Efl_Ui_Theme_Data
  * the users config doesn't need to be wiped - simply new values need
  * to be put in
  */
-# define ELM_CONFIG_FILE_GENERATION 0x0014
+# define ELM_CONFIG_FILE_GENERATION 0x0015
 # define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
 # define ELM_CONFIG_VERSION         ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
                                      ELM_CONFIG_FILE_GENERATION)
@@ -589,7 +677,7 @@ void                 _elm_win_standard_init(Eo *win);
 
 Ecore_X_Window       _elm_ee_xwin_get(const Ecore_Evas *ee);
 
-Efl_Ui_Theme_Apply_Result      _elm_theme_object_set(Evas_Object *parent,
+Eina_Error      _elm_theme_object_set(Evas_Object *parent,
                                            Evas_Object *o,
                                            const char *clas,
                                            const char *group,
@@ -597,7 +685,7 @@ Efl_Ui_Theme_Apply_Result      _elm_theme_object_set(Evas_Object *parent,
 Eina_Bool            _elm_theme_object_icon_set(Evas_Object *o,
                                                 const char *group,
                                                 const char *style);
-Efl_Ui_Theme_Apply_Result      _elm_theme_set(Elm_Theme *th,
+Eina_Error      _elm_theme_set(Elm_Theme *th,
                                     Evas_Object *o,
                                     const char *clas,
                                     const char *group,
@@ -878,7 +966,7 @@ void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double button_y)
 
 # define ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(_pfx, _typ) \
 EOLIAN static Eina_Bool \
-_##_pfx##_efl_ui_widget_widget_event(Eo *obj, _typ *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) \
+_##_pfx##_efl_ui_widget_widget_input_event_handler(Eo *obj, _typ *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) \
 { \
    Evas_Event_Key_Down *ev; \
    if (eo_event->desc != EFL_EVENT_KEY_DOWN) return EINA_FALSE; \