1 files changed, 8 insertions, 9 deletions

diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 9922985..0b8a5df 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -305,6 +305,7 @@ typedef void                  (*Elm_Widget_Item_Signal_Cb)(void *data, Elm_Objec
 typedef void (*Elm_Access_On_Highlight_Cb)(void *data);
 
 #include "efl_ui_widget.eo.h"
+#include "elm_widget_item_container_eo.h"
 
 /**
  * @addtogroup Widget
@@ -352,6 +353,7 @@ typedef struct _Elm_Widget_Smart_Data
 
    int                           child_drag_x_locked;
    int                           child_drag_y_locked;
+   int                           disabled;
 
    Eina_Inlist                  *translate_strings;
    Eina_List                    *focus_chain;
@@ -363,7 +365,6 @@ typedef struct _Elm_Widget_Smart_Data
    Efl_Ui_Scrollable_On_Show_Region on_show_region;
    Eina_Free_Cb                  on_show_region_data_free;
 
-   int                           orient_mode; /* -1 is disabled */
    Elm_Focus_Move_Policy         focus_move_policy;
    Elm_Focus_Region_Show_Mode    focus_region_show_mode;
 
@@ -386,7 +387,6 @@ typedef struct _Elm_Widget_Smart_Data
    Eina_Bool                     scroll_y_locked : 1;
 
    Eina_Bool                     can_focus : 1;
-   Eina_Bool                     child_can_focus : 1;
    Eina_Bool                     focused : 1;
    Eina_Bool                     top_win_focused : 1;
    Eina_Bool                     tree_unfocusable : 1;
@@ -394,7 +394,6 @@ typedef struct _Elm_Widget_Smart_Data
    Eina_Bool                     highlight_ignore : 1;
    Eina_Bool                     highlight_in_theme : 1;
    Eina_Bool                     access_highlight_in_theme : 1;
-   Eina_Bool                     disabled : 1;
    Eina_Bool                     is_mirrored : 1;
    Eina_Bool                     mirrored_auto_mode : 1; /* This is TRUE by default */
    Eina_Bool                     still_in : 1;
@@ -580,7 +579,7 @@ struct _Elm_Widget_Item_Data
 
 EAPI Eina_Bool        elm_widget_api_check(int ver);
 EAPI Eina_Bool        elm_widget_access(Evas_Object *obj, Eina_Bool is_access);
-EAPI Efl_Ui_Theme_Apply_Result  elm_widget_theme(Evas_Object *obj);
+EAPI Eina_Error  elm_widget_theme(Evas_Object *obj);
 EAPI void             elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
 EAPI void             elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb data_free);
 EAPI Eina_Bool        elm_widget_sub_object_parent_add(Evas_Object *sobj);
@@ -604,7 +603,7 @@ EAPI Eina_Bool        elm_widget_highlight_in_theme_get(const Evas_Object *obj);
 EAPI void             elm_widget_access_highlight_in_theme_set(Evas_Object *obj, Eina_Bool highlight);
 EAPI Eina_Bool        elm_widget_access_highlight_in_theme_get(const Evas_Object *obj);
 EAPI Eina_Bool        elm_widget_highlight_get(const Evas_Object *obj);
-EAPI Evas_Object     *elm_widget_top_get(const Evas_Object *obj);
+EAPI Eo              *elm_widget_top_get(const Eo *obj);
 EAPI Eina_Bool        elm_widget_is(const Evas_Object *obj);
 EAPI Evas_Object     *elm_widget_parent_widget_get(const Evas_Object *obj);
 EAPI void             elm_widget_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
@@ -647,7 +646,7 @@ EAPI void             elm_widget_scroll_freeze_pop(Evas_Object *obj);
 EAPI int              elm_widget_scroll_freeze_get(const Evas_Object *obj);
 EAPI void             elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);
 EAPI Elm_Theme       *elm_widget_theme_get(const Evas_Object *obj);
-EAPI Efl_Ui_Theme_Apply_Result  elm_widget_style_set(Evas_Object *obj, const char *style);
+EAPI Eina_Error  elm_widget_style_set(Evas_Object *obj, const char *style);
 EAPI const char      *elm_widget_style_get(const Evas_Object *obj);
 EAPI void             elm_widget_type_set(Evas_Object *obj, const char *type);
 EAPI const char      *elm_widget_type_get(const Evas_Object *obj);
@@ -659,7 +658,7 @@ EAPI void             elm_widget_scroll_lock_set(Evas_Object *obj, Efl_Ui_Scroll
 EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj);
 EAPI int              elm_widget_scroll_child_locked_x_get(const Evas_Object *obj);
 EAPI int              elm_widget_scroll_child_locked_y_get(const Evas_Object *obj);
-EAPI Efl_Ui_Theme_Apply_Result  elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);
+EAPI Eina_Error  elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);
 EAPI Eina_Bool        elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func);
 EAPI Evas_Object     *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse);
 EAPI Eina_List       *elm_widget_stringlist_get(const char *str);
@@ -688,7 +687,7 @@ EAPI Eina_Bool        elm_widget_theme_element_set(Evas_Object *obj, const char
 EAPI const char      *elm_widget_theme_element_get(const Evas_Object *obj);
 EAPI Eina_Bool        elm_widget_theme_style_set(Evas_Object *obj, const char *name);
 EAPI const char      *elm_widget_theme_style_get(const Evas_Object *obj);
-EAPI Efl_Ui_Theme_Apply_Result elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
+EAPI Eina_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
 
 /* debug function. don't use it unless you are tracking parenting issues */
 EAPI void             elm_widget_tree_dump(const Evas_Object *top);
@@ -802,6 +801,6 @@ const char *efl_ui_widget_default_text_part_get(const Eo *obj);
 
 
 #define ELM_WIDGET_ITEM_PROTECTED
-#include "elm_widget_item.eo.h"
+#include "elm_widget_item_eo.h"
 
 #endif