diff --git a/legacy/elementary/src/lib/.gitignore b/legacy/elementary/src/lib/.gitignore index 067696739e..a355dee521 100644 --- a/legacy/elementary/src/lib/.gitignore +++ b/legacy/elementary/src/lib/.gitignore @@ -1,2 +1,4 @@ /Elementary.h /elm_intro.h +/*.eo.c +/*.eo.h diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 15b846af57..a6b6ca3bff 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES= +EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ + include $(top_srcdir)/Makefile_Eolian_Helper.am AM_CPPFLAGS = \ @@ -519,3 +521,14 @@ EXTRA_DIST = \ elm_factory.h \ elm_factory.c \ elm_intro.h.in + +BUILT_SOURCES = \ + elm_widget.eo.c \ + elm_widget.eo.h + +EXTRA_DIST += \ + elm_widget.eo + +nodist_includesunstable_HEADERS = \ + elm_widget.eo.h + diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 65271928a3..ca466da0a5 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -44,7 +44,7 @@ _elm_ctxpopup_smart_translate(Eo *obj, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -625,7 +625,7 @@ _elm_ctxpopup_smart_sub_object_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list Eina_Bool *ret = va_arg(*list, Eina_Bool *); Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_add(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_add(sobj, &int_ret)); if (ret) *ret = int_ret; } @@ -750,7 +750,7 @@ _elm_ctxpopup_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; elm_widget_theme_object_set @@ -1088,7 +1088,7 @@ _elm_ctxpopup_smart_disable(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; if (sd->list) elm_object_disabled_set(sd->list, elm_widget_disabled_get(obj)); @@ -1530,16 +1530,16 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_ctxpopup_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_ctxpopup_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_ctxpopup_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_ctxpopup_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_ctxpopup_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_ctxpopup_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_ctxpopup_smart_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_ctxpopup_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_ctxpopup_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_ctxpopup_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_ctxpopup_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_ctxpopup_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_ctxpopup_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_ctxpopup_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_ctxpopup_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_ctxpopup_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_ctxpopup_smart_sub_object_add), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_ctxpopup_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_ctxpopup_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_ctxpopup_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_ctxpopup_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_ctxpopup_smart_translate), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_ctxpopup_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_ctxpopup_smart_content_get), diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index d6c3e6d3c8..7011bfa6be 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -96,7 +96,7 @@ _elm_fileselector_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; style = elm_widget_style_get(obj); @@ -1445,7 +1445,7 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted); #undef HANDLER_ADD - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } static void @@ -1619,7 +1619,7 @@ _buttons_ok_cancel_set(Eo *obj, void *_pd, va_list *list) sd->ok_button = bt; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } else if (!visible) { @@ -2012,7 +2012,7 @@ _mime_types_filter_append(Eo *obj, void *_pd, va_list *list) _populate(obj, sd->path, NULL, NULL); if (need_theme) - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); int_ret = EINA_TRUE; @@ -2067,7 +2067,7 @@ _custom_filter_append(Eo *obj, void *_pd, va_list *list) _populate(obj, sd->path, NULL, NULL); if (need_theme) - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); int_ret = EINA_TRUE; end: @@ -2319,10 +2319,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_fileselector_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_fileselector_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_fileselector_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_SET), _elm_fileselector_smart_text_set), diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 3cad328825..ba31c3b32f 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -50,7 +50,7 @@ _elm_fileselector_button_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *li /* file selector button's style has an extra bit */ eina_stringshare_replace(&(wd->style), buf); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; eina_stringshare_replace(&(wd->style), style); @@ -185,7 +185,7 @@ _elm_fileselector_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED evas_object_smart_callback_add(obj, "clicked", _button_clicked, priv); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); elm_widget_can_focus_set(obj, EINA_TRUE); } @@ -499,7 +499,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_button_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_button_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_button_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_button_smart_theme), EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_fileselector_button_smart_admits_autorepeat_get), diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index 2a56981445..f8bba2de1c 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -181,7 +181,7 @@ _elm_fileselector_entry_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; style = elm_widget_style_get(obj); @@ -214,7 +214,7 @@ _elm_fileselector_entry_smart_disable(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; val = elm_widget_disabled_get(obj); @@ -716,11 +716,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_entry_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_entry_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_fileselector_entry_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_entry_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_entry_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_fileselector_entry_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_entry_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_fileselector_entry_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_entry_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_entry_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_fileselector_entry_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_entry_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_fileselector_entry_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_fileselector_entry_smart_content_get), diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 0cd3642b1b..59d3032ceb 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -42,7 +42,7 @@ _elm_hoversel_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -70,7 +70,7 @@ _elm_hoversel_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) /* hoversel's style has an extra bit: orientation */ eina_stringshare_replace(&(wd->style), buf); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; eina_stringshare_replace(&(wd->style), style); @@ -288,7 +288,7 @@ _elm_hoversel_smart_add(Eo *obj, void *_pd EINA_UNUSED, evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj); //What are you doing here? - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } static void @@ -416,7 +416,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) sd->horizontal = !!horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -642,7 +642,7 @@ _elm_hoversel_smart_event(Eo *obj, void *_pd, va_list *list) Elm_Hoversel_Item *litem, *fitem; - eo_do_super(obj, MY_CLASS, elm_wdg_event(src, type, event_info, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_event(src, type, event_info, &int_ret)); if (int_ret) return; if (!sd || !sd->hover) return; @@ -716,10 +716,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hoversel_smart_show), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hoversel_smart_hide), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_hoversel_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_hoversel_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event), EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_hoversel_smart_admits_autorepeat_get), diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index aca1793efc..ed9953eeaa 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -52,7 +52,7 @@ _elm_multibuttonentry_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *l EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -78,7 +78,7 @@ _elm_multibuttonentry_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->items, l, item) @@ -2180,14 +2180,14 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_multibuttonentry_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_multibuttonentry_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_multibuttonentry_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_multibuttonentry_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_multibuttonentry_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_multibuttonentry_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_multibuttonentry_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_multibuttonentry_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_multibuttonentry_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_multibuttonentry_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_multibuttonentry_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_multibuttonentry_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_multibuttonentry_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_multibuttonentry_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_multibuttonentry_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_multibuttonentry_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_multibuttonentry_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_multibuttonentry_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_SET), _elm_multibuttonentry_smart_text_set), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_GET), _elm_multibuttonentry_smart_text_get), diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index ab65410d50..34e6ee6276 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -79,7 +79,7 @@ _elm_naviframe_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_INLIST_FOREACH(sd->stack, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -344,11 +344,11 @@ _elm_naviframe_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); const char *style, *sstyle; - eo_do(obj, elm_wdg_style_get(&style)); + eo_do(obj, elm_obj_widget_style_get(&style)); EINA_INLIST_FOREACH(sd->stack, it) { - eo_do(VIEW(it), elm_wdg_style_get(&sstyle)); + eo_do(VIEW(it), elm_obj_widget_style_get(&sstyle)); if ((style && sstyle) && strcmp(style, sstyle)) _item_style_set(it, it->style); _item_signals_emit(it); @@ -2126,15 +2126,15 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_naviframe_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_naviframe_smart_show), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_naviframe_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_naviframe_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_naviframe_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_naviframe_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_naviframe_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_naviframe_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_naviframe_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_naviframe_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_naviframe_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_naviframe_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_naviframe_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_naviframe_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_naviframe_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_naviframe_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_naviframe_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_naviframe_smart_event), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_naviframe_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_naviframe_smart_content_get), diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index 7bf4824dd0..db365243e0 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -169,7 +169,7 @@ _elm_player_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret; Elm_Player_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _update_theme_button(obj, sd->forward, "forward"); _update_theme_button(obj, sd->info, "info"); @@ -724,8 +724,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_player_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_player_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_player_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_player_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_player_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_player_smart_event), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_player_smart_content_set), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_player_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 736ea8be7e..6ecb8a4848 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -51,7 +51,7 @@ _elm_popup_smart_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list * EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -327,7 +327,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Popup_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -457,7 +457,7 @@ _elm_popup_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) Elm_Popup_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sobj == sd->title_icon) @@ -1972,16 +1972,16 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_popup_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_popup_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_popup_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_popup_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_popup_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_popup_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_popup_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_popup_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_popup_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_popup_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_popup_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_popup_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_popup_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_popup_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_popup_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_popup_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_popup_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_popup_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_popup_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_popup_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_popup_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_popup_smart_sub_object_del), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_popup_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_popup_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index 4f315d272d..7f6a25ff13 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -1458,8 +1458,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_access_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_access_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_access_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_access_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_access_smart_activate), EO_OP_FUNC_SENTINEL }; diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 2e7aaeb6d7..453df607e0 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -118,7 +118,7 @@ _elm_actionslider_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) mirrored = elm_object_mirrored_get(obj); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (elm_object_mirrored_get(obj) != mirrored) @@ -715,9 +715,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_actionslider_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_actionslider_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_actionslider_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_actionslider_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_actionslider_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_actionslider_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_actionslider_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_actionslider_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c index f214a1fdc6..213229bcc2 100644 --- a/legacy/elementary/src/lib/elm_box.c +++ b/legacy/elementary/src/lib/elm_box.c @@ -133,7 +133,7 @@ _elm_box_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -188,7 +188,7 @@ _elm_box_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(child, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(child, &int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -920,12 +920,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_box_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_box_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_box_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_box_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_box_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_box_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_box_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_box_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_box_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_box_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_box_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_box_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_box_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_box_smart_focus_direction), EO_OP_FUNC(ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HORIZONTAL_SET), _horizontal_set), EO_OP_FUNC(ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HORIZONTAL_GET), _horizontal_get), diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index ea74e1ed35..2bd7bdcc75 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -280,7 +280,7 @@ _pos_set(Eo *obj, void *_pd, va_list *list) eina_stringshare_replace (&ld->group, corner_string[sd->pos]); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Elm_Bubble_Pos @@ -336,11 +336,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_bubble_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_bubble_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_bubble_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_bubble_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_bubble_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_bubble_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_bubble_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_bubble_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_bubble_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_bubble_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_bubble_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_SET), _elm_bubble_smart_text_set), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_bubble_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index 28ce15c8d8..e688be1aaf 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -118,7 +118,7 @@ _elm_button_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _icon_signal_emit(obj); @@ -136,7 +136,7 @@ _elm_button_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; _icon_signal_emit(obj); @@ -510,12 +510,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_button_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_button_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_button_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_button_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_button_smart_activate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_button_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_button_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_button_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_button_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_button_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_button_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_button_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_button_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_button_smart_content_set), diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index 690c466bc4..195470a1e6 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -563,7 +563,7 @@ _elm_calendar_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; evas_object_smart_changed(obj); @@ -1670,12 +1670,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_calendar_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_calendar_smart_calculate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_calendar_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_calendar_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_calendar_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_calendar_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_calendar_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_calendar_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_calendar_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_calendar_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_calendar_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_calendar_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_calendar_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_calendar_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_calendar_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index 337115ef54..95b1ffbe1b 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -90,7 +90,7 @@ _elm_check_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; _icon_signal_emit(obj); @@ -185,7 +185,7 @@ _elm_check_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Elm_Check_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (!sd->state) elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); @@ -454,12 +454,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_check_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_check_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_check_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_check_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_check_smart_activate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_check_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_check_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_check_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_check_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_check_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_check_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_check_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_check_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_check_smart_content_set), diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index 768d839aa6..ad9766d038 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -569,7 +569,7 @@ _elm_clock_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _time_update(obj); @@ -1129,11 +1129,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_clock_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_clock_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_clock_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_clock_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_clock_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_clock_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_clock_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_clock_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_clock_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_clock_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_clock_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_clock_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_TIME_SET), _time_set), EO_OP_FUNC(ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_TIME_GET), _time_get), diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index ac7250411a..6d8de75b08 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -1080,7 +1080,7 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (!sd->col_bars_area) return; @@ -2274,12 +2274,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_colorselector_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_colorselector_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_colorselector_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_colorselector_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_colorselector_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_colorselector_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_colorselector_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_colorselector_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_colorselector_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_colorselector_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_colorselector_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_colorselector_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_colorselector_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_colorselector_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_colorselector_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index cce0255f30..57b097de82 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -595,7 +595,7 @@ _elm_conformant_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _conformant_parts_swallow(obj); @@ -1007,8 +1007,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_conformant_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_conformant_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_conformant_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_conformant_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_conformant_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_conformant_smart_theme), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_conformant_smart_content_aliases_get), EO_OP_FUNC_SENTINEL diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index 4004992b46..36ef392a2d 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -384,7 +384,7 @@ _elm_datetime_smart_translate(Eo *obj, void *_pd, va_list *list) if (!sd->user_format) _reload_format(obj); else _field_list_display(obj); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -465,7 +465,7 @@ _elm_datetime_smart_on_focus(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (!elm_widget_focus_get(obj)) @@ -489,7 +489,7 @@ _elm_datetime_smart_disable(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret; Elm_Datetime_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++) @@ -533,7 +533,7 @@ _elm_datetime_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Datetime_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if ((!dt_mod) || (!dt_mod->field_value_display)) @@ -1301,12 +1301,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_datetime_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_datetime_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_datetime_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_datetime_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_datetime_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_datetime_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_datetime_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_datetime_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_datetime_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_datetime_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_datetime_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index fe3ff8a0ac..3b6c471f27 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -79,7 +79,7 @@ _elm_dayselector_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) elm_object_text_set(VIEW(it), buf); } - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); exit: if (ret) *ret = EINA_TRUE; @@ -140,7 +140,7 @@ _elm_dayselector_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Dayselector_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->items, l, it) @@ -733,9 +733,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_dayselector_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_dayselector_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_dayselector_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_dayselector_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_dayselector_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_dayselector_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_dayselector_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_dayselector_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_dayselector_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_UNSET), _elm_dayselector_smart_content_unset), diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index 89764b59cf..86092de969 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -792,7 +792,7 @@ _elm_diskselector_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Elm_Diskselector_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; evas = evas_object_evas_get(obj); @@ -855,7 +855,7 @@ _elm_diskselector_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list * Elm_Diskselector_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->items, l, it) @@ -880,7 +880,7 @@ _elm_diskselector_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool int_ret = EINA_FALSE; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -1293,7 +1293,7 @@ _elm_diskselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do(obj, elm_scrollable_interface_objects_set(edje, priv->hit_rect), - elm_wdg_theme_apply(NULL), + elm_obj_widget_theme_apply(NULL), elm_scrollable_interface_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF), elm_scrollable_interface_bounce_allow_set(EINA_TRUE, EINA_FALSE), elm_scrollable_interface_animate_start_cb_set(_scroll_animate_start_cb), @@ -1970,14 +1970,14 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_diskselector_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_diskselector_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_diskselector_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_diskselector_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_diskselector_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_diskselector_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_diskselector_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_diskselector_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_diskselector_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_diskselector_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_diskselector_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_diskselector_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_diskselector_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_diskselector_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_diskselector_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_diskselector_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_diskselector_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_diskselector_smart_access), EO_OP_FUNC(ELM_SCROLLABLE_INTERFACE_ID(ELM_SCROLLABLE_INTERFACE_SUB_ID_POLICY_SET), _scroller_policy_set), EO_OP_FUNC(ELM_SCROLLABLE_INTERFACE_ID(ELM_SCROLLABLE_INTERFACE_SUB_ID_POLICY_GET), _scroller_policy_get), diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 76f41c2f26..a1932192ee 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -607,7 +607,7 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; evas_event_freeze(evas_object_evas_get(obj)); @@ -1052,7 +1052,7 @@ _elm_entry_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); } - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, ret)); if (!ret) return; if (ret) *ret = EINA_TRUE; @@ -3588,7 +3588,7 @@ _text_style_user_push(Eo *obj, void *_pd, va_list *list) Elm_Entry_Smart_Data *sd = _pd; edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI void @@ -3605,7 +3605,7 @@ _text_style_user_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text"); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI const char * @@ -3646,7 +3646,7 @@ _single_line_set(Eo *obj, void *_pd, va_list *list) sd->line_wrap = ELM_WRAP_NONE; if (elm_entry_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP) elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); if (sd->scroll) { @@ -3720,7 +3720,7 @@ _password_set(Eo *obj, void *_pd, va_list *list) _entry_selection_callbacks_register(obj); } - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -3967,7 +3967,7 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list) sd->line_wrap = wrap; if (wrap == ELM_WRAP_NONE) ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Elm_Wrap_Type @@ -4004,7 +4004,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list) if (sd->editable == editable) return; sd->editable = editable; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); elm_drop_target_del(obj, sd->drop_format, NULL, NULL, @@ -5203,7 +5203,7 @@ _scrollable_set(Eo *obj, void *_pd, va_list *list) elm_widget_on_show_region_hook_set(obj, NULL, NULL); } sd->last_w = -1; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -5947,14 +5947,14 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_entry_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MEMBER_ADD), _elm_entry_smart_member_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_entry_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_entry_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_entry_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_entry_smart_on_focus_region), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_entry_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_entry_smart_activate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_entry_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_entry_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_entry_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_entry_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_entry_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_entry_smart_on_focus_region), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_entry_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_entry_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_entry_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_entry_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_entry_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_UNSET), _elm_entry_smart_content_unset), diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index 1802e2caa8..4cca0683aa 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -100,7 +100,7 @@ _elm_flip_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool int_ret; if (ret) *ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -191,7 +191,7 @@ _elm_flip_smart_sub_object_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (evas_object_data_get(sobj, "elm-parent") == obj) goto end; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_add(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_add(sobj, &int_ret)); if (!int_ret) return; evas_object_data_set(sobj, "_elm_leaveme", sobj); @@ -213,7 +213,7 @@ _elm_flip_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) Elm_Flip_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sobj == sd->front.content) @@ -2219,13 +2219,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flip_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flip_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_flip_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flip_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_flip_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flip_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_flip_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_flip_smart_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_flip_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_flip_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flip_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_flip_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flip_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_flip_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_flip_smart_sub_object_add), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_flip_smart_sub_object_del), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_flip_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_flip_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index 77e1eb2434..8fdd84dd38 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -371,7 +371,7 @@ _elm_flipselector_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Flipselector_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; max_len = edje_object_data_get(wd->resize_obj, "max_len"); @@ -574,7 +574,7 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_TRUE); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } static void @@ -995,10 +995,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flipselector_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flipselector_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_flipselector_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_flipselector_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flipselector_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flipselector_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_flipselector_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_flipselector_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flipselector_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flipselector_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_flipselector_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index 39ad541174..45007aae58 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -339,10 +339,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_frame_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_frame_smart_calculate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_frame_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_frame_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_frame_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_frame_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_frame_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_frame_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_frame_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_frame_smart_focus_direction), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_frame_smart_content_aliases_get), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_ALIASES_GET), _elm_frame_smart_text_aliases_get), diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index b4775d11a8..63149da8c2 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -1916,7 +1916,7 @@ _elm_gengrid_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool int_ret = EINA_FALSE; Elm_Gengrid_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj) && (sd->selected) && @@ -1995,7 +1995,7 @@ _elm_gengrid_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -4071,13 +4071,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_gengrid_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_gengrid_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_gengrid_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_gengrid_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_gengrid_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_gengrid_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_gengrid_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_gengrid_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_gengrid_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_gengrid_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_gengrid_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_gengrid_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_gengrid_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_gengrid_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_gengrid_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_gengrid_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_gengrid_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 4ce83b3ee3..4f1e122d09 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2786,7 +2786,7 @@ _elm_genlist_smart_sub_object_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * creation, thus issuing TOO MANY sizing_eval()'s here. they are * not needed at here anyway, so let's skip listening to those * hints changes */ - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_add(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_add(sobj, &int_ret)); if (!int_ret) return; if (ret) *ret = EINA_TRUE; @@ -2808,7 +2808,7 @@ _elm_genlist_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) * about too many recalculations */ sd->on_sub_del = EINA_TRUE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; sd->on_sub_del = EINA_FALSE; @@ -2825,7 +2825,7 @@ _elm_genlist_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Elm_Genlist_Smart_Data *sd = _pd; Elm_Object_Item *it = NULL; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) && @@ -2952,7 +2952,7 @@ _elm_genlist_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Gen_Item *it; Elm_Genlist_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; evas_event_freeze(evas_object_evas_get(obj)); @@ -7922,17 +7922,17 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_genlist_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_genlist_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_genlist_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_genlist_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_genlist_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_genlist_smart_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_genlist_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_genlist_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_genlist_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_genlist_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET), _elm_genlist_focus_highlight_geometry_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_ITEM_GET), _elm_genlist_focused_item_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_genlist_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_genlist_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_genlist_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_genlist_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_genlist_smart_sub_object_add), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_genlist_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_genlist_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_genlist_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_genlist_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET), _elm_genlist_focus_highlight_geometry_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUSED_ITEM_GET), _elm_genlist_focused_item_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_genlist_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_genlist_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SUB_OBJECT_ADD_ENABLE), _elm_genlist_smart_layout_sub_object_add_enable), diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 78fe6004bc..746b670dcb 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -4318,7 +4318,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_gesture_layer_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_gesture_layer_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_gesture_layer_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_gesture_layer_smart_disable), EO_OP_FUNC(ELM_OBJ_GESTURE_LAYER_ID(ELM_OBJ_GESTURE_LAYER_SUB_ID_HOLD_EVENTS_GET), _hold_events_get), EO_OP_FUNC(ELM_OBJ_GESTURE_LAYER_ID(ELM_OBJ_GESTURE_LAYER_SUB_ID_HOLD_EVENTS_SET), _hold_events_set), diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c index f472a8698b..ed27ee46eb 100644 --- a/legacy/elementary/src/lib/elm_glview.c +++ b/legacy/elementary/src/lib/elm_glview.c @@ -35,7 +35,7 @@ _elm_glview_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -567,7 +567,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_glview_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_glview_smart_resize), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_glview_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_glview_smart_on_focus), EO_OP_FUNC(ELM_OBJ_GLVIEW_ID(ELM_OBJ_GLVIEW_SUB_ID_GL_API_GET), _gl_api_get), EO_OP_FUNC(ELM_OBJ_GLVIEW_ID(ELM_OBJ_GLVIEW_SUB_ID_MODE_SET), _mode_set), diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c index fbf9fa436d..fc77f889e9 100644 --- a/legacy/elementary/src/lib/elm_grid.c +++ b/legacy/elementary/src/lib/elm_grid.c @@ -121,7 +121,7 @@ _elm_grid_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -145,7 +145,7 @@ _elm_grid_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_FALSE); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } static void @@ -358,11 +358,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_grid_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_grid_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_grid_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_grid_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_grid_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_grid_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_grid_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_grid_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_grid_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_grid_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_grid_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_grid_smart_focus_direction), EO_OP_FUNC(ELM_OBJ_GRID_ID(ELM_OBJ_GRID_SUB_ID_SIZE_SET), _size_set), EO_OP_FUNC(ELM_OBJ_GRID_ID(ELM_OBJ_GRID_SUB_ID_SIZE_GET), _size_get), diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 5ea9a21959..b2da851d3a 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -287,7 +287,7 @@ _elm_hover_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret; Elm_Hover_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); @@ -343,7 +343,7 @@ _elm_hover_smart_sub_object_add(Eo *obj, void *_pd, va_list *list) if (evas_object_data_get(sobj, "elm-parent") == obj) goto end; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_add(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_add(sobj, &int_ret)); if (!int_ret) return; if (sd->smt_sub && sd->smt_sub->obj == sobj) @@ -363,7 +363,7 @@ _elm_hover_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret; Elm_Hover_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sd->smt_sub && sd->smt_sub->obj == sobj) @@ -696,7 +696,7 @@ elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_HOVER_CHECK(obj); - eo_do(obj, elm_wdg_parent_set(parent)); + eo_do(obj, elm_obj_widget_parent_set(parent)); } static void @@ -747,7 +747,7 @@ elm_hover_parent_get(const Evas_Object *obj) { ELM_HOVER_CHECK(obj) NULL; Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_parent_get(&ret)); + eo_do((Eo *) obj, elm_obj_widget_parent_get(&ret)); return ret; } @@ -853,13 +853,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hover_smart_show), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hover_smart_hide), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_hover_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_hover_smart_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_hover_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hover_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _elm_hover_smart_parent_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_hover_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_hover_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_hover_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_hover_smart_sub_object_add), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_hover_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_hover_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_GET), _elm_hover_smart_parent_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_hover_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_hover_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_hover_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_hover_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index d45dc64e12..6f12a6999f 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -462,7 +462,7 @@ _elm_icon_smart_theme(Eo *obj, void *_pd, va_list *list) if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (ret) *ret = EINA_TRUE; @@ -1081,7 +1081,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_icon_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_icon_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_icon_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_icon_smart_theme), EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_FILE_SET), _elm_icon_smart_file_set), EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_MEMFILE_SET), _elm_icon_smart_memfile_set), diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 94a536f3f3..c7c610b6d1 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -628,7 +628,7 @@ _elm_image_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; eo_do(obj, elm_obj_image_sizing_eval()); @@ -1727,8 +1727,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_SET), _elm_image_smart_clip_set), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_UNSET), _elm_image_smart_clip_unset), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_image_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_image_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_image_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_image_smart_event), EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_ASPECT_FIXED_SET), _elm_image_smart_aspect_fixed_set), EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_ASPECT_FIXED_GET), _elm_image_smart_aspect_fixed_get), diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index b3defd60e5..d8f51c07ec 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -339,7 +339,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list) else eina_stringshare_replace(&ld->group, "base/vertical"); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; elm_coords_finger_size_adjust(1, &minw, 1, &minh); @@ -1636,7 +1636,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) if (horizontal == sd->horizontal) return; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -1743,11 +1743,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_index_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_index_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_index_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_index_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_index_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_index_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_index_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_index_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_index_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_index_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_index_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_index_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_index_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_inwin.c b/legacy/elementary/src/lib/elm_inwin.c index 6b3d15a8d2..e07bdceb9f 100644 --- a/legacy/elementary/src/lib/elm_inwin.c +++ b/legacy/elementary/src/lib/elm_inwin.c @@ -183,9 +183,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_inwin_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_inwin_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_inwin_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_inwin_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_inwin_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_inwin_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_inwin_smart_parent_set), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_inwin_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_inwin_smart_content_aliases_get), diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index 5b46f3a147..bd5b672cfb 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -176,7 +176,7 @@ _elm_label_smart_theme(Eo *obj, void *_pd, va_list *list) evas_event_freeze(evas_object_evas_get(obj)); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) goto end; _label_format_set(wd->resize_obj, sd->format); @@ -752,9 +752,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_label_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_label_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_label_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_label_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_label_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_label_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_label_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_label_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_SET), _elm_label_smart_text_set), diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 87c8b8382d..a8e84f74b4 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -368,7 +368,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd) _visuals_refresh(obj, sd); - eo_do(obj, elm_wdg_disable(&ret)); + eo_do(obj, elm_obj_widget_disable(&ret)); return ret; } @@ -382,7 +382,7 @@ _elm_layout_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Layout_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; /* The following lines are here to support entry design; the _theme function * of entry needs to call directly the widget _theme function */ @@ -520,7 +520,7 @@ _elm_layout_smart_sub_object_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (evas_object_data_get(sobj, "elm-parent") == obj) goto end; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_add(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_add(sobj, &int_ret)); if (!int_ret) return; Eina_Bool enable = EINA_TRUE; @@ -553,7 +553,7 @@ _elm_layout_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_sub_object_size_hint_change, obj); - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->subs, l, sub_d) @@ -2311,15 +2311,15 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_layout_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_layout_smart_calculate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_layout_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_layout_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_layout_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_layout_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_layout_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_layout_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_layout_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_layout_smart_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_layout_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_layout_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_layout_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_layout_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_layout_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_layout_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_layout_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_layout_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_layout_smart_sub_object_add), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_layout_smart_sub_object_del), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_layout_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_layout_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index d7ca875b40..9d703d4e84 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -520,7 +520,7 @@ _elm_list_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -930,7 +930,7 @@ _elm_list_smart_disable(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret = EINA_FALSE; Elm_List_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; if (elm_widget_disabled_get(obj)) @@ -976,7 +976,7 @@ _elm_list_smart_theme(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret = EINA_FALSE; Elm_List_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -1052,7 +1052,7 @@ _elm_list_smart_on_focus(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret = EINA_FALSE; Elm_List_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item) @@ -1093,7 +1093,7 @@ _elm_list_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) Elm_List_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if ((sobj == sd->box) || (sobj == obj)) goto end; @@ -3085,18 +3085,18 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_list_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_list_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_list_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_list_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_list_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_list_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_list_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_list_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_list_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_list_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_list_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_list_smart_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET), _elm_list_focus_highlight_geometry_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_ITEM_GET), _elm_list_focused_item_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_list_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_list_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_list_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_list_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_list_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_list_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_list_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_list_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_list_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_list_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET), _elm_list_focus_highlight_geometry_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUSED_ITEM_GET), _elm_list_focused_item_get), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_list_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index 5168c2f824..f13e51590e 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -3772,7 +3772,7 @@ _elm_map_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -3840,7 +3840,7 @@ _elm_map_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -5984,9 +5984,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_map_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_map_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_map_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_map_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_map_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_map_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_map_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_map_smart_event), EO_OP_FUNC(ELM_OBJ_MAP_ID(ELM_OBJ_MAP_SUB_ID_ZOOM_SET), _zoom_set), EO_OP_FUNC(ELM_OBJ_MAP_ID(ELM_OBJ_MAP_SUB_ID_ZOOM_GET), _zoom_get), diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index 29023f0bab..7c6eb359b4 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -38,7 +38,7 @@ _elm_mapbuf_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -82,7 +82,7 @@ _elm_mapbuf_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sobj == sd->content) @@ -581,8 +581,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_mapbuf_smart_show), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_mapbuf_smart_hide), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_mapbuf_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_mapbuf_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_mapbuf_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_mapbuf_smart_sub_object_del), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_mapbuf_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_mapbuf_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index a84debd8f3..c6ecf8b3e8 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -205,7 +205,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list) const char *s; char style[1024]; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (sd->menu_bar) @@ -707,7 +707,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar) } } - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Evas_Object * @@ -745,7 +745,7 @@ elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_MENU_CHECK(obj); - eo_do(obj, elm_wdg_parent_set(parent)); + eo_do(obj, elm_obj_widget_parent_set(parent)); } static void @@ -797,7 +797,7 @@ elm_menu_parent_get(const Evas_Object *obj) { ELM_MENU_CHECK(obj) NULL; Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_parent_get(&ret)); + eo_do((Eo *) obj, elm_obj_widget_parent_get(&ret)); return ret; } @@ -1328,10 +1328,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_menu_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_menu_smart_show), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_menu_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_menu_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _parent_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_menu_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_menu_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_GET), _parent_get), EO_OP_FUNC(ELM_OBJ_MENU_ID(ELM_OBJ_MENU_SUB_ID_MOVE), _move), EO_OP_FUNC(ELM_OBJ_MENU_ID(ELM_OBJ_MENU_SUB_ID_CLOSE), _menu_close), diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c index c03adb4db7..ad4dfaf97c 100644 --- a/legacy/elementary/src/lib/elm_notify.c +++ b/legacy/elementary/src/lib/elm_notify.c @@ -126,7 +126,7 @@ _elm_notify_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -185,7 +185,7 @@ _elm_notify_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sobj == sd->content) @@ -530,7 +530,7 @@ elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_NOTIFY_CHECK(obj); - eo_do(obj, elm_wdg_parent_set(parent)); + eo_do(obj, elm_obj_widget_parent_set(parent)); } static void @@ -580,7 +580,7 @@ elm_notify_parent_get(const Evas_Object *obj) { ELM_NOTIFY_CHECK(obj) NULL; Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_parent_get(&ret)); + eo_do((Eo *) obj, elm_obj_widget_parent_get(&ret)); return ret; } @@ -809,14 +809,14 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_notify_smart_show), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_notify_smart_hide), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_notify_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _elm_notify_smart_parent_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_notify_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_notify_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_notify_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_notify_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_notify_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_notify_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_SET), _elm_notify_smart_parent_set), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_PARENT_GET), _elm_notify_smart_parent_get), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_notify_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_notify_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_notify_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_notify_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_notify_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_notify_smart_sub_object_del), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_notify_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_notify_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 160538f2fe..7dd70bac1b 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -143,7 +143,7 @@ _elm_panel_smart_theme(Eo *obj, void *_pd, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -369,7 +369,7 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); priv->bx = evas_object_box_add(evas_object_evas_get(obj)); evas_object_size_hint_align_set(priv->bx, 0.5, 0.5); @@ -563,11 +563,11 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_panel_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_panel_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panel_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panel_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_panel_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_panel_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_panel_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panel_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panel_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_panel_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_panel_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_panel_smart_access), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_panel_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_panel_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index 36f61ba010..6548347526 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -63,7 +63,7 @@ _elm_panes_smart_theme(Eo *obj, void *_pd, va_list *list) elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(sd->event, minw, minh); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; size = elm_panes_content_left_size_get(obj); @@ -390,7 +390,7 @@ _elm_panes_smart_horizontal_set(Eo *obj, void *_pd, va_list *list) Elm_Panes_Smart_Data *sd = _pd; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); elm_panes_content_left_size_set(obj, 0.5); } @@ -483,9 +483,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_panes_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_panes_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panes_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panes_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_panes_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panes_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panes_smart_focus_next), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_panes_smart_content_aliases_get), diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c index c6e590d4cd..cd04de9041 100644 --- a/legacy/elementary/src/lib/elm_photo.c +++ b/legacy/elementary/src/lib/elm_photo.c @@ -57,7 +57,7 @@ _elm_photo_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Photo_Smart_Data *sd = _pd; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; edje_object_mirrored_set @@ -506,7 +506,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_photo_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_photo_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_photo_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_photo_smart_theme), EO_OP_FUNC(ELM_OBJ_PHOTO_ID(ELM_OBJ_PHOTO_SUB_ID_FILE_SET), _file_set), EO_OP_FUNC(ELM_OBJ_PHOTO_ID(ELM_OBJ_PHOTO_SUB_ID_SIZE_SET), _size_set), diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 7c127edeb6..22386d14c6 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -884,7 +884,7 @@ _elm_photocam_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -910,7 +910,7 @@ _elm_photocam_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -2312,9 +2312,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_photocam_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_photocam_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_photocam_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_photocam_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_photocam_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_photocam_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_photocam_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_photocam_smart_on_focus), EO_OP_FUNC(ELM_SCROLLABLE_INTERFACE_ID(ELM_SCROLLABLE_INTERFACE_SUB_ID_REGION_BRING_IN), _image_region_bring_in), diff --git a/legacy/elementary/src/lib/elm_plug.c b/legacy/elementary/src/lib/elm_plug.c index 38bc0e3a1f..a462bfa81c 100644 --- a/legacy/elementary/src/lib/elm_plug.c +++ b/legacy/elementary/src/lib/elm_plug.c @@ -68,7 +68,7 @@ _elm_plug_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -90,7 +90,7 @@ _elm_plug_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -221,9 +221,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_plug_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_plug_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_plug_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_plug_smart_on_focus), EO_OP_FUNC(ELM_OBJ_PLUG_ID(ELM_OBJ_PLUG_SUB_ID_IMAGE_OBJECT_GET), _image_object_get), diff --git a/legacy/elementary/src/lib/elm_prefs.c b/legacy/elementary/src/lib/elm_prefs.c index ff487e0155..ebe4202a70 100644 --- a/legacy/elementary/src/lib/elm_prefs.c +++ b/legacy/elementary/src/lib/elm_prefs.c @@ -2183,7 +2183,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_prefs_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_prefs_smart_focus_next), EO_OP_FUNC(ELM_OBJ_PREFS_ID(ELM_OBJ_PREFS_SUB_ID_FILE_SET), diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index aa4355f8ed..8014c54e75 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -145,7 +145,7 @@ _elm_progressbar_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *l if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if(!int_ret) return; _icon_signal_emit(obj); @@ -186,7 +186,7 @@ _elm_progressbar_smart_theme(Eo *obj, void *_pd, va_list *list) eina_stringshare_replace(&ld->group, "horizontal"); else eina_stringshare_replace(&ld->group, "vertical"); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (sd->pulse) @@ -371,7 +371,7 @@ _pulse_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) sd->pulse = pulse; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -672,7 +672,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) if (sd->horizontal == horizontal) return; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -762,10 +762,10 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_progressbar_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_progressbar_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_progressbar_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_progressbar_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_progressbar_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_progressbar_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_progressbar_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_progressbar_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_progressbar_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_progressbar_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_progressbar_smart_content_set), diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index ea1457f262..033be8caf3 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -123,7 +123,7 @@ _elm_radio_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if(!int_ret) return; _icon_signal_emit(obj); @@ -188,7 +188,7 @@ _elm_radio_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); @@ -216,7 +216,7 @@ _elm_radio_smart_disable(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; if (elm_widget_disabled_get(obj) && sd->state) _state_set(obj, EINA_FALSE); @@ -549,13 +549,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_radio_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_radio_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_radio_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_radio_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_radio_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_radio_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_radio_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_radio_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_radio_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_radio_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_radio_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_radio_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_radio_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_radio_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_radio_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_radio_smart_activate), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_radio_smart_content_set), diff --git a/legacy/elementary/src/lib/elm_route.c b/legacy/elementary/src/lib/elm_route.c index 3e8a581982..4371924d72 100644 --- a/legacy/elementary/src/lib/elm_route.c +++ b/legacy/elementary/src/lib/elm_route.c @@ -95,7 +95,7 @@ _elm_route_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; //TODO @@ -320,7 +320,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_route_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_route_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_route_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_route_smart_theme), EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_EMAP_SET), _emap_set), EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_LONGITUDE_MIN_MAX_GET), _longitude_min_max_get), EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_LATITUDE_MIN_MAX_GET), _latitude_min_max_get), diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 9730f75a24..ad13a5750f 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -371,7 +371,7 @@ _elm_scroller_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -472,7 +472,7 @@ _elm_scroller_smart_sub_object_del(Eo *obj, void *_pd, va_list *list) Eina_Bool int_ret; Elm_Scroller_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(sobj, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); if (!int_ret) return; if (sobj == sd->content) @@ -868,7 +868,7 @@ _custom_widget_base_theme_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (eina_stringshare_replace(&(ld->klass), klass) || eina_stringshare_replace(&(ld->group), group)) - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI void @@ -1264,13 +1264,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_scroller_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_scroller_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_scroller_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_scroller_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_scroller_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_scroller_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_scroller_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_scroller_smart_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_scroller_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_scroller_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_scroller_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_scroller_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_scroller_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_scroller_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_scroller_smart_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_scroller_smart_activate), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_scroller_smart_content_set), EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET), _elm_scroller_smart_content_get), diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index 0aa498e310..a992f5793f 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -33,7 +33,7 @@ _elm_segment_control_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *li EINA_LIST_FOREACH(sd->items, l, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -223,7 +223,7 @@ _elm_segment_control_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; rtl = elm_widget_mirrored_get(obj); @@ -251,7 +251,7 @@ _elm_segment_control_smart_disable(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_disable(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_disable(&int_ret)); if (!int_ret) return; _update_list(sd); @@ -957,13 +957,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_segment_control_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_segment_control_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_segment_control_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_segment_control_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_segment_control_smart_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_segment_control_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_segment_control_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_segment_control_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_segment_control_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_segment_control_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_segment_control_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_DISABLE), _elm_segment_control_smart_disable), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_segment_control_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_segment_control_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_segment_control_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_segment_control_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_segment_control_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_SEGMENT_CONTROL_ID(ELM_OBJ_SEGMENT_CONTROL_SUB_ID_ITEM_ADD), _item_add), diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c index 5298f1f616..ae36625dd0 100644 --- a/legacy/elementary/src/lib/elm_separator.c +++ b/legacy/elementary/src/lib/elm_separator.c @@ -29,7 +29,7 @@ _elm_separator_smart_theme(Eo *obj, void *_pd, va_list *list) else eina_stringshare_replace(&ld->group, "vertical"); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (ret) *ret = EINA_TRUE; @@ -98,7 +98,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -140,9 +140,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_separator_smart_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_separator_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_separator_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_separator_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_separator_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_separator_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_separator_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_separator_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index 3d66014afb..a044277723 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -568,7 +568,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list) elm_widget_style_get(obj)); } - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; if (sd->popup) @@ -1099,7 +1099,7 @@ _elm_slider_horizontal_set(Eo *obj, void *_pd, va_list *list) if (sd->horizontal == horizontal) return; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI Eina_Bool @@ -1447,7 +1447,7 @@ _elm_slider_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UN Eina_Bool int_ret; Elm_Slider_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (sd->always_popup_show && elm_widget_focus_get(obj)) _popup_show(obj, NULL, NULL, NULL); @@ -1465,12 +1465,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_slider_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_slider_smart_calculate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_slider_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_slider_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_slider_smart_activate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_slider_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_slider_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_slider_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_slider_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_slider_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_slider_smart_activate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_slider_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_slider_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_slider_smart_on_focus), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_slider_smart_sizing_eval), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_ALIASES_GET), _elm_slider_smart_text_aliases_get), diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index aa8f482146..406185bacf 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -973,9 +973,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_slideshow_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_slideshow_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_slideshow_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_slideshow_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_slideshow_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_slideshow_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_slideshow_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_slideshow_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_slideshow_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index ae52e119f7..11ab88b0bf 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -559,7 +559,7 @@ _elm_spinner_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool int_ret; Elm_Spinner_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (!elm_widget_focus_get(obj)) @@ -1306,13 +1306,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_spinner_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_spinner_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_spinner_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_spinner_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_spinner_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_spinner_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_spinner_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_spinner_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_spinner_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_spinner_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_spinner_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_spinner_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_spinner_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_spinner_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_spinner_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_spinner_smart_access), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_spinner_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index d18e15dd56..36cb02f7d5 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -125,7 +125,7 @@ _elm_table_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool super_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&super_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&super_ret)); if (super_ret == EINA_FALSE) return; @@ -173,7 +173,7 @@ _elm_table_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_sub_object_del(child, &int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(child, &int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -199,7 +199,7 @@ _elm_table_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_FALSE); elm_widget_highlight_ignore_set(obj, EINA_FALSE); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } static void @@ -512,12 +512,12 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_table_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_table_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_table_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_table_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_table_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_table_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_table_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_table_sub_object_del), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_table_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_table_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_table_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_table_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_table_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_table_sub_object_del), EO_OP_FUNC(ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_SET), _homogeneous_set), EO_OP_FUNC(ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_GET), _homogeneous_get), diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 938b0242e0..a65eea33cd 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -584,7 +584,7 @@ _elm_toolbar_smart_on_focus(Eo *obj, void *_pd EINA_UNUSED, va_list *list) ELM_TOOLBAR_DATA_GET(obj, sd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (elm_widget_focus_get(obj)) @@ -1156,7 +1156,7 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list) } Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; elm_widget_theme_object_set @@ -1395,7 +1395,7 @@ _elm_toolbar_smart_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) EINA_INLIST_FOREACH(sd->items, it) elm_widget_item_translate(it); - eo_do_super(obj, MY_CLASS, elm_wdg_translate(NULL)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_translate(NULL)); if (ret) *ret = EINA_TRUE; } @@ -2017,7 +2017,7 @@ _item_del_pre_hook(Elm_Object_Item *it) _item_del(item); if (item != sd->more_item) - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); return EINA_TRUE; } @@ -2755,7 +2755,7 @@ _icon_size_set(Eo *obj, void *_pd, va_list *list) if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; else sd->icon_size = sd->theme_icon_size; - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } EAPI int @@ -3962,13 +3962,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_toolbar_smart_resize), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_toolbar_smart_move), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_toolbar_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_toolbar_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_toolbar_smart_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_toolbar_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_toolbar_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_toolbar_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_toolbar_smart_access), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_toolbar_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_toolbar_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_TRANSLATE), _elm_toolbar_smart_translate), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_toolbar_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_toolbar_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_toolbar_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACCESS), _elm_toolbar_smart_access), EO_OP_FUNC(ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_SET), _icon_size_set), EO_OP_FUNC(ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_GET), _icon_size_get), diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index 1e82a32d40..d0cf94a261 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -622,9 +622,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_video_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_video_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_video_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_video_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_video_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_video_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_video_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_video_smart_focus_direction_manager_is), EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_video_smart_sizing_eval), diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c index 3d2b4fae96..53d117b26b 100644 --- a/legacy/elementary/src/lib/elm_web.c +++ b/legacy/elementary/src/lib/elm_web.c @@ -115,7 +115,7 @@ _elm_web_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; theme = elm_object_theme_get(obj); @@ -158,7 +158,7 @@ _elm_web_smart_on_focus(Eo *obj, void *_pd, va_list *list) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; top = elm_widget_top_get(obj); @@ -1187,7 +1187,7 @@ _elm_web_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->zoom.current = 1.0; _view_smart_callback_proxy(resize_obj, obj); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); elm_widget_can_focus_set(obj, EINA_TRUE); #else @@ -2920,9 +2920,9 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_web_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_web_smart_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_web_smart_theme), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_web_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_web_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_web_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_web_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_web_smart_event), EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WEBKIT_VIEW_GET), _webkit_view_get), EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WINDOW_CREATE_HOOK_SET), _window_create_hook_set), diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index ecc2abeb8d..9d2f073c1b 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -8,8 +8,6 @@ #include "elm_widget_container.h" #include "elm_interface_scrollable.h" -EAPI Eo_Op ELM_WIDGET_BASE_ID = EO_NOOP; - #define MY_CLASS ELM_OBJ_WIDGET_CLASS #define MY_CLASS_NAME "Elm_Widget" @@ -136,18 +134,13 @@ _elm_widget_mirrored_reload(Evas_Object *obj) } } -static void -_elm_widget_on_focus_region(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_on_focus_region(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Coord *x EINA_UNUSED, Evas_Coord *y EINA_UNUSED, Evas_Coord *w EINA_UNUSED, Evas_Coord *h EINA_UNUSED) { - va_arg(*list, Evas_Coord *); - va_arg(*list, Evas_Coord *); - va_arg(*list, Evas_Coord *); - va_arg(*list, Evas_Coord *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - WRN("The %s widget does not implement the \"on_focus_region\" function.", eo_class_name_get(eo_class_get(obj))); + + return EINA_FALSE; } static void @@ -262,12 +255,10 @@ _obj_mouse_up(void *data, sd->still_in = EINA_FALSE; } -static void -_elm_widget_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv) { - Elm_Widget_Smart_Data *priv = _pd; - priv->obj = obj; priv->mirrored_auto_mode = EINA_TRUE; /* will follow system locale * settings */ @@ -316,15 +307,13 @@ _if_focused_revert(Evas_Object *obj, } } -static void -_elm_widget_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Object *sobj; Elm_Translate_String_Data *ts; Elm_Event_Cb_Data *ecb; - Elm_Widget_Smart_Data *sd = _pd; - if (sd->hover_obj) { /* detach it from us */ @@ -386,34 +375,26 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd) } } -static void -_elm_widget_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { - Evas_Coord x = va_arg(*list, Evas_Coord); - Evas_Coord y = va_arg(*list, Evas_Coord); - Elm_Widget_Smart_Data *sd = _pd; - sd->x = x; sd->y = y; _smart_reconfigure(sd); } -static void -_elm_widget_smart_resize(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h) { - Evas_Coord w = va_arg(*list, Evas_Coord); - Evas_Coord h = va_arg(*list, Evas_Coord); - Elm_Widget_Smart_Data *sd = _pd; - sd->w = w; sd->h = h; _smart_reconfigure(sd); } -static void -_elm_widget_smart_show(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -427,8 +408,8 @@ _elm_widget_smart_show(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list EINA eina_iterator_free(it); } -static void -_elm_widget_smart_hide(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -442,13 +423,9 @@ _elm_widget_smart_hide(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list EINA eina_iterator_free(it); } -static void -_elm_widget_smart_color_set(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list) +EOLIAN static void +_elm_widget_evas_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a) { - int r = va_arg(*params_list, int); - int g = va_arg(*params_list, int); - int b = va_arg(*params_list, int); - int a = va_arg(*params_list, int); Eina_Iterator *it; Evas_Object *o; @@ -461,10 +438,9 @@ _elm_widget_smart_color_set(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list eina_iterator_free(it); } -static void -_elm_widget_smart_clip_set(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list) +EOLIAN static void +_elm_widget_evas_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) { - Evas_Object *clip = va_arg(*params_list, Evas_Object *); Eina_Iterator *it; Evas_Object *o; @@ -477,8 +453,8 @@ _elm_widget_smart_clip_set(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list) eina_iterator_free(it); } -static void -_elm_widget_smart_clip_unset(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -492,17 +468,16 @@ _elm_widget_smart_clip_unset(Eo *obj, void *_pd EINA_UNUSED, va_list *params_lis eina_iterator_free(it); } -static void -_elm_widget_smart_calculate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *params_list EINA_UNUSED) +EOLIAN static void +_elm_widget_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { /* a NO-OP, on the base */ } -static void -_elm_widget_smart_member_add(Eo *obj, void *_pd EINA_UNUSED, va_list *params_list) +EOLIAN static void +_elm_widget_evas_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { int r, g, b, a; - Evas_Object *child = va_arg(*params_list, Evas_Object *); eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(child)); if (evas_object_data_get(child, "_elm_leaveme")) return; @@ -518,10 +493,9 @@ _elm_widget_smart_member_add(Eo *obj, void *_pd EINA_UNUSED, va_list *params_lis evas_object_hide(child); } -static void -_elm_widget_smart_member_del(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_widget_evas_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { - Evas_Object *child = va_arg(*list, Evas_Object *); if (!evas_object_data_get(child, "_elm_leaveme")) evas_object_clip_unset(child); eo_do_super(obj, MY_CLASS, evas_obj_smart_member_del(child)); @@ -543,17 +517,17 @@ _elm_widget_focus_chain_manager_is(const Evas_Object *obj) ELM_WIDGET_CHECK(obj) EINA_FALSE; Eina_Bool manager_is = EINA_FALSE; - eo_do((Eo *)obj, elm_wdg_focus_next_manager_is(&manager_is)); + eo_do((Eo *)obj, elm_obj_widget_focus_next_manager_is(&manager_is)); return manager_is; } static inline Eina_Bool -_elm_widget_focus_direction_manager_is(const Evas_Object *obj) +_internal_elm_widget_focus_direction_manager_is(const Evas_Object *obj) { ELM_WIDGET_CHECK(obj) EINA_FALSE; Eina_Bool manager_is = EINA_FALSE; - eo_do((Eo *)obj, elm_wdg_focus_direction_manager_is(&manager_is)); + eo_do((Eo *)obj, elm_obj_widget_focus_direction_manager_is(&manager_is)); return manager_is; } @@ -629,20 +603,14 @@ _propagate_event(void *data, elm_widget_event_propagate(obj, type, event_info, event_flags); } -EAPI void -elm_widget_focus_region_show(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do((Eo *) obj, elm_wdg_focus_region_show()); -} /** * @internal * * If elm_widget_focus_region_get() returns EINA_FALSE, this function will * ignore region show action. */ -static void -_elm_widget_focus_region_show(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_region_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Evas_Coord x, y, w, h, ox, oy; Evas_Object *o; @@ -681,44 +649,17 @@ _elm_widget_focus_region_show(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA } } -EAPI Eina_Bool -elm_widget_focus_highlight_style_set(Evas_Object *obj, const char *style) +EOLIAN static Eina_Bool +_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *style) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_focus_highlight_style_set(style, &ret)); - return ret; + if (eina_stringshare_replace(&sd->focus_highlight_style, style)) return EINA_TRUE; + return EINA_FALSE; } -static void -_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static const char* +_elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - const char *style = va_arg(*list, const char *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Elm_Widget_Smart_Data *sd = _pd; - if (eina_stringshare_replace(&sd->focus_highlight_style, style)) - { - if (ret) *ret = EINA_TRUE; - return; - } -} - -EAPI const char * -elm_widget_focus_highlight_style_get(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_wdg_focus_highlight_style_get(&ret)); - return ret; -} - -static void -_elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - const char **ret = va_arg(*list, const char **); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->focus_highlight_style; + return sd->focus_highlight_style; } static void @@ -744,7 +685,7 @@ _parent_focus(Evas_Object *obj) if (sd->top_win_focused) { sd->focused = EINA_TRUE; - eo_do(obj, elm_wdg_on_focus(NULL)); + eo_do(obj, elm_obj_widget_on_focus(NULL)); elm_widget_focus_region_show(obj); } sd->focus_order_on_calc = EINA_FALSE; @@ -764,17 +705,9 @@ _elm_object_focus_chain_del_cb(void *data, sd->focus_chain = eina_list_remove(sd->focus_chain, obj); } -EAPI void -elm_widget_parent_set(Evas_Object *obj, - Evas_Object *parent) +EOLIAN static void +_elm_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED) { - eo_do(obj, elm_wdg_parent_set(parent)); -} - -static void -_elm_widget_parent_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) -{ - va_arg(*list, Evas_Object *); } EAPI Eina_Bool @@ -800,16 +733,15 @@ elm_widget_access(Evas_Object *obj, EINA_LIST_FOREACH(sd->subobjs, l, child) ret &= elm_widget_access(child, is_access); - eo_do(obj, elm_wdg_access(is_access)); + eo_do(obj, elm_obj_widget_access(is_access)); evas_object_smart_callback_call(obj, SIG_WIDGET_ACCESS_CHANGED, NULL); return ret; } -static void -_elm_widget_access(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED) { - va_arg(*list, int); } EAPI Eina_Bool @@ -833,7 +765,7 @@ elm_widget_theme(Evas_Object *obj) elm_cursor_theme(cur); Eina_Bool ret2; - eo_do(obj, elm_wdg_theme_apply(&ret2)); + eo_do(obj, elm_obj_widget_theme_apply(&ret2)); ret &= ret2; return ret; @@ -878,18 +810,17 @@ elm_widget_theme_specific(Evas_Object *obj, elm_tooltip_theme(tt); EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - eo_do(obj, elm_wdg_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply(NULL)); } -static void -_elm_widget_theme_func(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); _elm_widget_mirrored_reload(obj); elm_widget_disabled_set(obj, elm_widget_disabled_get(obj)); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } /** @@ -901,22 +832,10 @@ _elm_widget_theme_func(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * @return mirrored mode of the object. * **/ -EAPI Eina_Bool -elm_widget_mirrored_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_mirrored_get(&ret)); - return ret; -} - -static void -_elm_widget_mirrored_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->is_mirrored; + return sd->is_mirrored; } /** @@ -927,22 +846,9 @@ _elm_widget_mirrored_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) * @param obj The widget. * @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset. */ -EAPI void -elm_widget_mirrored_set(Evas_Object *obj, - Eina_Bool mirrored) +EOLIAN static void +_elm_widget_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) { - ELM_WIDGET_CHECK(obj); - - eo_do(obj, elm_wdg_mirrored_set(mirrored)); -} - -static void -_elm_widget_mirrored_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool mirrored = va_arg(*list, int); - - Elm_Widget_Smart_Data *sd = _pd; - mirrored = !!mirrored; if (sd->is_mirrored == mirrored) return; @@ -958,21 +864,10 @@ _elm_widget_mirrored_set(Eo *obj, void *_pd, va_list *list) * @return mirrored mode setting of the object. * **/ -EAPI Eina_Bool -elm_widget_mirrored_automatic_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_mirrored_automatic_get(&ret)); - return ret; -} - -static void -_elm_widget_mirrored_automatic_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->mirrored_auto_mode; + return sd->mirrored_auto_mode; } /** @@ -984,19 +879,9 @@ _elm_widget_mirrored_automatic_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list * @param obj The widget. * @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual. */ -EAPI void -elm_widget_mirrored_automatic_set(Evas_Object *obj, - Eina_Bool automatic) +EOLIAN static void +_elm_widget_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_mirrored_automatic_set(automatic)); -} - -static void -_elm_widget_mirrored_automatic_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool automatic = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; if (sd->mirrored_auto_mode != automatic) { sd->mirrored_auto_mode = automatic; @@ -1008,23 +893,9 @@ _elm_widget_mirrored_automatic_set(Eo *obj, void *_pd, va_list *list) } } -EAPI void -elm_widget_on_show_region_hook_set(Evas_Object *obj, - void (*func)(void *data, - Evas_Object *obj), - void *data) +EOLIAN static void +_elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, region_hook_func_type func, void *data) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_on_show_region_hook_set(func, data)); -} - -static void -_elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - region_hook_func_type func = va_arg(*list, region_hook_func_type); - void *data = va_arg(*list, void *); - - Elm_Widget_Smart_Data *sd = _pd; sd->on_show_region = func; sd->on_show_region_data = data; } @@ -1043,7 +914,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj) Eo *parent; eo_do(sobj, eo_parent_get(&parent)); - eo_do(parent, elm_wdg_sub_object_add(sobj, &ret)); + eo_do(parent, elm_obj_widget_sub_object_add(sobj, &ret)); return ret; } @@ -1061,44 +932,20 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj) * * @see elm_widget_sub_object_parent_add() */ -EAPI Eina_Bool -elm_widget_sub_object_add(Evas_Object *obj, - Evas_Object *sobj) +EOLIAN static Eina_Bool +_elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE); - - if (!sobj) goto err; - - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_sub_object_add(sobj, &ret)); - // FIXME: better handle the error case in the eo called function than here. - if (ret) return EINA_TRUE; - -err: - ERR("could not add %p as sub object of %p", obj, sobj); - return EINA_FALSE; -} - -static void -_elm_widget_sub_object_add(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object *sobj = va_arg(*list, Evas_Object *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Eina_Bool mirrored, pmirrored = elm_widget_mirrored_get(obj); - Elm_Widget_Smart_Data *sd = _pd; - EINA_SAFETY_ON_TRUE_RETURN(obj == sobj); + EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE); if (sobj == sd->parent_obj) { /* in this case, sobj must be an elm widget, or something * very wrong is happening */ - if (!_elm_widget_is(sobj)) return; + if (!_elm_widget_is(sobj)) return EINA_FALSE; - if (!elm_widget_sub_object_del(sobj, obj)) return; + if (!elm_widget_sub_object_del(sobj, obj)) return EINA_FALSE; WRN("You passed a parent object of obj = %p as the sub object = %p!", obj, sobj); } @@ -1111,7 +958,7 @@ _elm_widget_sub_object_add(Eo *obj, void *_pd, va_list *list) if (sdc->parent_obj) { if (!elm_widget_sub_object_del(sdc->parent_obj, sobj)) - return; + return EINA_FALSE; } sdc->parent_obj = obj; sdc->orient_mode = sd->orient_mode; @@ -1141,7 +988,7 @@ _elm_widget_sub_object_add(Eo *obj, void *_pd, va_list *list) if (data) { if (data == obj) goto end; - if (!elm_widget_sub_object_del(data, sobj)) return; + if (!elm_widget_sub_object_del(data, sobj)) return EINA_FALSE; } } sd->subobjs = eina_list_append(sd->subobjs, sobj); @@ -1184,35 +1031,17 @@ _elm_widget_sub_object_add(Eo *obj, void *_pd, va_list *list) } end: - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } -EAPI Eina_Bool -elm_widget_sub_object_del(Evas_Object *obj, - Evas_Object *sobj) +EOLIAN static Eina_Bool +_elm_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE); + Evas_Object *sobj_parent; if (!sobj) return EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_sub_object_del(sobj, &ret)); - return ret; -} - -static void -_elm_widget_sub_object_del(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object *sobj = va_arg(*list, Evas_Object *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Evas_Object *sobj_parent; - - if (!sobj) return; - - Elm_Widget_Smart_Data *sd = _pd; - EINA_SAFETY_ON_TRUE_RETURN(obj == sobj); + EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE); sobj_parent = evas_object_data_del(sobj, "elm-parent"); if (sobj_parent != obj) @@ -1231,7 +1060,7 @@ _elm_widget_sub_object_del(Eo *obj, void *_pd, va_list *list) } if (abort_on_warn == 1) abort(); - return; + return EINA_FALSE; } if (_elm_widget_is(sobj)) @@ -1285,7 +1114,7 @@ _elm_widget_sub_object_del(Eo *obj, void *_pd, va_list *list) evas_object_event_callback_del_full (sobj, EVAS_CALLBACK_HIDE, _on_sub_obj_hide, NULL); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } /* @@ -1294,24 +1123,13 @@ _elm_widget_sub_object_del(Eo *obj, void *_pd, va_list *list) * a resize object is added to and deleted from the smart member and the sub object * of the parent if the third argument, Eina_Bool sub_obj, is set as EINA_TRUE. */ -EAPI void -elm_widget_resize_object_set(Evas_Object *obj, +EOLIAN static void +_elm_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj, Eina_Bool sub_obj) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_resize_object_set(sobj, sub_obj)); -} - -static void -_elm_widget_resize_object_set(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object *sobj = va_arg(*list, Evas_Object *); - Eina_Bool sub_obj = va_arg(*list, int); Evas_Object *parent; - Elm_Widget_Smart_Data *sd = _pd; - if (sd->resize_obj == sobj) return; // orphan previous resize obj @@ -1361,20 +1179,9 @@ _elm_widget_resize_object_set(Eo *obj, void *_pd, va_list *list) * exchanging a hover object, of cleaning the old hover "target" * before */ -EAPI void -elm_widget_hover_object_set(Evas_Object *obj, - Evas_Object *sobj) +EOLIAN static void +_elm_widget_hover_object_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_hover_object_set(sobj)); -} - -static void -_elm_widget_hover_object_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Evas_Object *sobj = va_arg(*list, Evas_Object *); - Elm_Widget_Smart_Data *sd = _pd; - if (sd->hover_obj) { evas_object_event_callback_del_full(sd->hover_obj, EVAS_CALLBACK_DEL, @@ -1389,20 +1196,9 @@ _elm_widget_hover_object_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) } } -EAPI void -elm_widget_can_focus_set(Evas_Object *obj, - Eina_Bool can_focus) +EOLIAN static void +_elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_can_focus_set(can_focus)); -} - -static void -_elm_widget_can_focus_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool can_focus = va_arg(*list, int); - - Elm_Widget_Smart_Data *sd = _pd; can_focus = !!can_focus; if (sd->can_focus == can_focus) return; @@ -1442,38 +1238,16 @@ _elm_widget_can_focus_set(Eo *obj, void *_pd, va_list *list) } } -EAPI Eina_Bool -elm_widget_can_focus_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_can_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_can_focus_get(&ret)); - return ret; + return sd->can_focus; } -static void -_elm_widget_can_focus_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_child_can_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->can_focus; -} - -EAPI Eina_Bool -elm_widget_child_can_focus_get(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_child_can_focus_get(&ret)); - return ret; -} - -static void -_elm_widget_child_can_focus_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->child_can_focus; + return sd->child_can_focus; } /** @@ -1491,20 +1265,9 @@ _elm_widget_child_can_focus_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI void -elm_widget_tree_unfocusable_set(Evas_Object *obj, - Eina_Bool tree_unfocusable) +EOLIAN static void +_elm_widget_tree_unfocusable_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool tree_unfocusable) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_tree_unfocusable_set(tree_unfocusable)); -} - -static void -_elm_widget_tree_unfocusable_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool tree_unfocusable = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; - tree_unfocusable = !!tree_unfocusable; if (sd->tree_unfocusable == tree_unfocusable) return; sd->tree_unfocusable = tree_unfocusable; @@ -1521,21 +1284,10 @@ _elm_widget_tree_unfocusable_set(Eo *obj, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_tree_unfocusable_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_tree_unfocusable_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_tree_unfocusable_get(&ret)); - return ret; -} - -static void -_elm_widget_tree_unfocusable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->tree_unfocusable; + return sd->tree_unfocusable; } /** @@ -1550,24 +1302,12 @@ _elm_widget_tree_unfocusable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI Eina_List * -elm_widget_can_focus_child_list_get(const Evas_Object *obj) +EOLIAN static Eina_List* +_elm_widget_can_focus_child_list_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - Eina_List *ret = NULL; - eo_do((Eo *) obj, elm_wdg_can_focus_child_list_get(&ret)); - return ret; -} - -static void -_elm_widget_can_focus_child_list_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_List **ret = va_arg(*list, Eina_List **); - const Eina_List *l; Eina_List *child_list = NULL; Evas_Object *child; - Elm_Widget_Smart_Data *sd = _pd; if (sd->subobjs) { @@ -1586,198 +1326,84 @@ _elm_widget_can_focus_child_list_get(Eo *obj EINA_UNUSED, void *_pd, va_list *li } } } - *ret = child_list; + return child_list; } -EAPI void -elm_widget_highlight_ignore_set(Evas_Object *obj, - Eina_Bool ignore) +EOLIAN static void +_elm_widget_highlight_ignore_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Bool ignore) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_highlight_ignore_set(ignore)); -} - -static void -_elm_widget_highlight_ignore_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool ignore = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; sd->highlight_ignore = !!ignore; } -EAPI Eina_Bool -elm_widget_highlight_ignore_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_highlight_ignore_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_highlight_ignore_get(&ret)); - return ret; + return sd->highlight_ignore; } -static void -_elm_widget_highlight_ignore_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_highlight_in_theme_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Bool highlight) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->highlight_ignore; -} - -EAPI void -elm_widget_highlight_in_theme_set(Evas_Object *obj, - Eina_Bool highlight) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_highlight_in_theme_set(highlight)); -} - -static void -_elm_widget_highlight_in_theme_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool highlight = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; sd->highlight_in_theme = !!highlight; /* FIXME: if focused, it should switch from one mode to the other */ } -EAPI Eina_Bool -elm_widget_highlight_in_theme_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_highlight_in_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_highlight_in_theme_get(&ret)); - return ret; + return sd->highlight_in_theme; } -static void -_elm_widget_highlight_in_theme_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_access_highlight_in_theme_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Bool highlight) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->highlight_in_theme; -} - -EAPI void -elm_widget_access_highlight_in_theme_set(Evas_Object *obj, - Eina_Bool highlight) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_access_highlight_in_theme_set(highlight)); -} - -static void -_elm_widget_access_highlight_in_theme_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool highlight = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; sd->access_highlight_in_theme = !!highlight; } -EAPI Eina_Bool -elm_widget_access_highlight_in_theme_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_access_highlight_in_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_access_highlight_in_theme_get(&ret)); - return ret; + return sd->access_highlight_in_theme; } -static void -_elm_widget_access_highlight_in_theme_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->access_highlight_in_theme; + return sd->focused; } -EAPI Eina_Bool -elm_widget_focus_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_highlight_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_get(&ret)); - return ret; + return sd->highlighted; } -static void -_elm_widget_focus_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Evas_Object* +_elm_widget_focused_object_get(Eo *obj, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->focused; -} - -EAPI Eina_Bool -elm_widget_highlight_get(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_highlight_get(&ret)); - return ret; -} - -static void -_elm_widget_highlight_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->highlighted; -} - -EAPI Evas_Object * -elm_widget_focused_object_get(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_focused_object_get(&ret)); - return ret; -} - -static void -_elm_widget_focused_object_get(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object **ret = va_arg(*list, Evas_Object **); - *ret = NULL; - Elm_Widget_Smart_Data *sd = _pd; - const Evas_Object *subobj; const Eina_List *l; - if (!sd->focused) return; + if (!sd->focused) return NULL; EINA_LIST_FOREACH(sd->subobjs, l, subobj) { Evas_Object *fobj; fobj = elm_widget_focused_object_get(subobj); - if (fobj) - { - *ret = fobj; - return; - } + if (fobj) return fobj; } - *ret = (Evas_Object *)obj; + return (Evas_Object *)obj; } -EAPI Evas_Object * -elm_widget_top_get(const Evas_Object *obj) +EOLIAN static Evas_Object* +_elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_top_get(&ret)); - return ret; -} - -static void -_elm_widget_top_get(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object **ret = va_arg(*list, Evas_Object **); - Elm_Widget_Smart_Data *sd = _pd; - Evas_Object *int_ret = NULL; - if (sd->parent_obj) { - eo_do((Eo *) sd->parent_obj, elm_wdg_top_get(&int_ret)); - *ret = int_ret; - return; + Evas_Object *int_ret = NULL; + eo_do((Eo *) sd->parent_obj, elm_obj_widget_top_get(&int_ret)); + return int_ret; } - *ret = (Evas_Object *)obj; + return (Evas_Object *)obj; } EAPI Eina_Bool @@ -1814,56 +1440,22 @@ elm_widget_parent_widget_get(const Evas_Object *obj) return parent; } -EAPI Evas_Object * -elm_widget_parent2_get(const Evas_Object *obj) +EOLIAN static Evas_Object * +_elm_widget_parent2_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_parent2_get(&ret)); - return ret; + return sd->parent2; } -static void -_elm_widget_parent2_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_parent2_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Object *parent) { - Evas_Object **ret = va_arg(*list, Evas_Object **); - *ret = NULL; - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->parent2; -} - -EAPI void -elm_widget_parent2_set(Evas_Object *obj, Evas_Object *parent) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_parent2_set(parent)); -} - -static void -_elm_widget_parent2_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Evas_Object *parent = va_arg(*list, Evas_Object *); - Elm_Widget_Smart_Data *sd = _pd; sd->parent2 = parent; } -EAPI void -elm_widget_event_callback_add(Evas_Object *obj, - Elm_Event_Cb func, - const void *data) +EOLIAN static void +_elm_widget_event_callback_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) { - ELM_WIDGET_CHECK(obj); EINA_SAFETY_ON_NULL_RETURN(func); - eo_do(obj, elm_wdg_event_callback_add(func, data)); -} - -static void -_elm_widget_event_callback_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Event_Cb func = va_arg(*list, Elm_Event_Cb); - EINA_SAFETY_ON_NULL_RETURN(func); - const void *data = va_arg(*list, const void *); - Elm_Widget_Smart_Data *sd = _pd; Elm_Event_Cb_Data *ecb = ELM_NEW(Elm_Event_Cb_Data); ecb->func = func; @@ -1871,61 +1463,26 @@ _elm_widget_event_callback_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) sd->event_cb = eina_list_append(sd->event_cb, ecb); } -EAPI void * -elm_widget_event_callback_del(Evas_Object *obj, - Elm_Event_Cb func, - const void *data) +EOLIAN static void* +_elm_widget_event_callback_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) { - ELM_WIDGET_CHECK(obj) NULL; EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL); - void *ret = NULL; - eo_do(obj, elm_wdg_event_callback_del(func, data, &ret)); - return ret; -} - -static void -_elm_widget_event_callback_del(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Event_Cb func = va_arg(*list, Elm_Event_Cb); - const void *data = va_arg(*list, const void *); - void **ret = va_arg(*list, void **); - if (ret) *ret = NULL; - - EINA_SAFETY_ON_NULL_RETURN(func); Eina_List *l; Elm_Event_Cb_Data *ecd; - Elm_Widget_Smart_Data *sd = _pd; EINA_LIST_FOREACH(sd->event_cb, l, ecd) if ((ecd->func == func) && (ecd->data == data)) { free(ecd); sd->event_cb = eina_list_remove_list(sd->event_cb, l); - if (ret) *ret = (void *)data; - return; + return (void *)data; } + + return NULL; } -EAPI Eina_Bool -elm_widget_event_propagate(Evas_Object *obj, - Evas_Callback_Type type, - void *event_info, - Evas_Event_Flags *event_flags) +EOLIAN static Eina_Bool +_elm_widget_event_propagate(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Callback_Type type, void *event_info, Evas_Event_Flags *event_flags) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_event_propagate(type, event_info, event_flags, &ret)); - return ret; -} - -static void -_elm_widget_event_propagate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type); - void *event_info = va_arg(*list, void *); - Evas_Event_Flags *event_flags = va_arg(*list, Evas_Event_Flags *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Evas_Object *parent = obj; Elm_Event_Cb_Data *ecd; Eina_List *l, *l_prev; @@ -1933,28 +1490,23 @@ _elm_widget_event_propagate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) while (parent && (!(event_flags && ((*event_flags) & EVAS_EVENT_FLAG_ON_HOLD)))) { - ELM_WIDGET_CHECK(parent); + ELM_WIDGET_CHECK(parent) EINA_FALSE; Elm_Widget_Smart_Data *sd = eo_data_scope_get(parent, MY_CLASS); Eina_Bool int_ret = EINA_FALSE; - eo_do(parent, elm_wdg_event(obj, type, event_info, &int_ret)); - if (int_ret) - { - if (ret) *ret = EINA_TRUE; - return ; - } + eo_do(parent, elm_obj_widget_event(obj, type, event_info, &int_ret)); + if (int_ret) return EINA_TRUE; EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd) { if (ecd->func((void *)ecd->data, parent, obj, type, event_info) || (event_flags && ((*event_flags) & EVAS_EVENT_FLAG_ON_HOLD))) - { - if (ret) *ret = EINA_TRUE; - return ; - } + return EINA_TRUE; } parent = sd->parent_obj; } + + return EINA_FALSE; } /** @@ -1972,25 +1524,15 @@ _elm_widget_event_propagate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * @param objs Chain of objects to pass focus * @ingroup Widget */ -EAPI void -elm_widget_focus_custom_chain_set(Evas_Object *obj, - Eina_List *objs) +EOLIAN static void +_elm_widget_focus_custom_chain_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_List *objs) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_custom_chain_set(objs)); -} - -static void -_elm_widget_focus_custom_chain_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_List *objs = va_arg(*list, Eina_List *); if (!_elm_widget_focus_chain_manager_is(obj)) return; elm_widget_focus_custom_chain_unset(obj); Eina_List *l; Evas_Object *o; - Elm_Widget_Smart_Data *sd = _pd; EINA_LIST_FOREACH(objs, l, o) { @@ -2009,21 +1551,10 @@ _elm_widget_focus_custom_chain_set(Eo *obj, void *_pd, va_list *list) * @param obj The container widget * @ingroup Widget */ -EAPI const Eina_List * -elm_widget_focus_custom_chain_get(const Evas_Object *obj) +EOLIAN static const Eina_List* +_elm_widget_focus_custom_chain_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - const Eina_List *ret = NULL; - eo_do((Eo *) obj, elm_wdg_focus_custom_chain_get(&ret)); - return ret; -} - -static void -_elm_widget_focus_custom_chain_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - const Eina_List **ret = va_arg(*list, const Eina_List **); - Elm_Widget_Smart_Data *sd = _pd; - *ret = (const Eina_List *)sd->focus_chain; + return (const Eina_List *)sd->focus_chain; } /** @@ -2034,19 +1565,11 @@ _elm_widget_focus_custom_chain_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list * @param obj The container widget * @ingroup Widget */ -EAPI void -elm_widget_focus_custom_chain_unset(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_custom_chain_unset()); -} - -static void -_elm_widget_focus_custom_chain_unset(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_custom_chain_unset(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { Eina_List *l, *l_next; Evas_Object *o; - Elm_Widget_Smart_Data *sd = _pd; EINA_LIST_FOREACH_SAFE(sd->focus_chain, l, l_next, o) { @@ -2071,27 +1594,11 @@ _elm_widget_focus_custom_chain_unset(Eo *obj EINA_UNUSED, void *_pd, va_list *li * @param relative_child The relative object to position the child * @ingroup Widget */ -EAPI void -elm_widget_focus_custom_chain_append(Evas_Object *obj, - Evas_Object *child, - Evas_Object *relative_child) +EOLIAN static void +_elm_widget_focus_custom_chain_append(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *child, Evas_Object *relative_child) { - ELM_WIDGET_CHECK(obj); EINA_SAFETY_ON_NULL_RETURN(child); - eo_do(obj, elm_wdg_focus_custom_chain_append(child, relative_child)); -} - -static void -_elm_widget_focus_custom_chain_append(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object *child = va_arg(*list, Evas_Object *); - Evas_Object *relative_child = va_arg(*list, Evas_Object *); - - EINA_SAFETY_ON_NULL_RETURN(child); - - Elm_Widget_Smart_Data *sd = _pd; - if (!_elm_widget_focus_chain_manager_is(obj)) return; evas_object_event_callback_add(child, EVAS_CALLBACK_DEL, @@ -2119,24 +1626,10 @@ _elm_widget_focus_custom_chain_append(Eo *obj, void *_pd, va_list *list) * @param relative_child The relative object to position the child * @ingroup Widget */ -EAPI void -elm_widget_focus_custom_chain_prepend(Evas_Object *obj, - Evas_Object *child, - Evas_Object *relative_child) +EOLIAN static void +_elm_widget_focus_custom_chain_prepend(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *child, Evas_Object *relative_child) { - ELM_WIDGET_CHECK(obj); EINA_SAFETY_ON_NULL_RETURN(child); - eo_do(obj, elm_wdg_focus_custom_chain_prepend(child, relative_child)); -} - -static void -_elm_widget_focus_custom_chain_prepend(Eo *obj, void *_pd, va_list *list) -{ - Evas_Object *child = va_arg(*list, Evas_Object *); - Evas_Object *relative_child = va_arg(*list, Evas_Object *); - - EINA_SAFETY_ON_NULL_RETURN(child); - Elm_Widget_Smart_Data *sd = _pd; if (!_elm_widget_focus_chain_manager_is(obj)) return; @@ -2164,19 +1657,9 @@ _elm_widget_focus_custom_chain_prepend(Eo *obj, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI void -elm_widget_focus_cycle(Evas_Object *obj, - Elm_Focus_Direction dir) +EOLIAN static void +_elm_widget_focus_cycle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_cycle(dir)); -} - -static void -_elm_widget_focus_cycle(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction); - Evas_Object *target = NULL; if (!_elm_widget_is(obj)) return; @@ -2215,29 +1698,15 @@ _elm_widget_focus_cycle(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_direction_go(Evas_Object *obj, - double degree) +EOLIAN static Eina_Bool +_elm_widget_focus_direction_go(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, double degree) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_focus_direction_go(degree, &ret)); - return ret; -} - -static void -_elm_widget_focus_direction_go(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - double degree = va_arg(*list, double); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Evas_Object *target = NULL; Evas_Object *current_focused = NULL; double weight = 0.0; - if (!_elm_widget_is(obj)) return; - if (!elm_widget_focus_get(obj)) return; + if (!_elm_widget_is(obj)) return EINA_FALSE; + if (!elm_widget_focus_get(obj)) return EINA_FALSE; current_focused = elm_widget_focused_object_get(obj); @@ -2245,9 +1714,10 @@ _elm_widget_focus_direction_go(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (obj, current_focused, degree, &target, &weight)) { elm_widget_focus_steal(target); - if (ret) *ret = EINA_TRUE; - return; + return EINA_TRUE; } + + return EINA_FALSE; } static double @@ -2592,53 +2062,31 @@ _direction_weight_get(const Evas_Object *obj1, * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_direction_get(const Evas_Object *obj, - const Evas_Object *base, - double degree, - Evas_Object **direction, - double *weight) +EOLIAN static Eina_Bool +_elm_widget_focus_direction_get(Eo *obj, Elm_Widget_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_direction_get(base, degree, direction, weight, &ret)); - return ret; -} - -static void -_elm_widget_focus_direction_get(Eo *obj, void *_pd, va_list *list) -{ - const Evas_Object *base = va_arg(*list, const Evas_Object *); - double degree = va_arg(*list, double); - Evas_Object **direction = va_arg(*list, Evas_Object **); - double *weight = va_arg(*list, double *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; - - Elm_Widget_Smart_Data *sd = _pd; double c_weight; /* -1 means the best was already decided. Don't need any more searching. */ if (!direction || !weight || !base || (obj == base)) - return; + return EINA_FALSE; /* Ignore if disabled */ if ((!evas_object_visible_get(obj)) || (elm_widget_disabled_get(obj)) || (elm_widget_tree_unfocusable_get(obj))) - return; + return EINA_FALSE; /* Try use hook */ - if (_elm_widget_focus_direction_manager_is(obj)) + if (_internal_elm_widget_focus_direction_manager_is(obj)) { Eina_Bool int_ret = EINA_FALSE; - eo_do((Eo *)obj, elm_wdg_focus_direction(base, degree, direction, weight, &int_ret)); - *ret = int_ret; - return; + eo_do((Eo *)obj, elm_obj_widget_focus_direction(base, degree, direction, weight, &int_ret)); + return int_ret; } if (!elm_widget_can_focus_get(obj) || elm_widget_focus_get(obj)) - return; + return EINA_FALSE; c_weight = _direction_weight_get(base, obj, degree); if ((c_weight == -1.0) || @@ -2652,13 +2100,15 @@ _elm_widget_focus_direction_get(Eo *obj, void *_pd, va_list *list) if (sd1) { if (sd->focus_order <= sd1->focus_order) - return; + return EINA_FALSE; } } *direction = (Evas_Object *)obj; *weight = c_weight; - *ret = EINA_TRUE; + return EINA_TRUE; } + + return EINA_FALSE; } /** @@ -2685,36 +2135,11 @@ _elm_widget_focus_direction_get(Eo *obj, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_list_direction_get(const Evas_Object *obj, - const Evas_Object *base, - const Eina_List *items, - void *(*list_data_get)(const Eina_List *l), - double degree, - Evas_Object **direction, - double *weight) +EOLIAN static Eina_Bool +_elm_widget_focus_list_direction_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Evas_Object *base, const Eina_List *items, list_data_get_func_type list_data_get, double degree, Evas_Object **direction, double *weight) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_list_direction_get(base, items, list_data_get, degree, direction, weight, &ret)); - return ret; -} - -static void -_elm_widget_focus_list_direction_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) -{ - const Evas_Object *base = va_arg(*list, const Evas_Object *); - const Eina_List *items = va_arg(*list, const Eina_List *); - list_data_get_func_type list_data_get = va_arg(*list, list_data_get_func_type); - double degree = va_arg(*list, double); - Evas_Object **direction = va_arg(*list, Evas_Object **); - double *weight = va_arg(*list, double *); - - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; - if (!direction || !weight || !base || !items) - return; + return EINA_FALSE; const Eina_List *l = items; Evas_Object *current_best = *direction; @@ -2725,8 +2150,9 @@ _elm_widget_focus_list_direction_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, if (cur) elm_widget_focus_direction_get(cur, base, degree, direction, weight); } - if (current_best != *direction) - *ret = EINA_TRUE; + if (current_best != *direction) return EINA_TRUE; + + return EINA_FALSE; } /** @@ -2746,33 +2172,13 @@ _elm_widget_focus_list_direction_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_next_get(const Evas_Object *obj, - Elm_Focus_Direction dir, - Evas_Object **next) -{ - if (!next) - return EINA_FALSE; - *next = NULL; - - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_next_get(dir, next, &ret)); - return ret; -} - -static void -_elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_focus_next_get(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) { Elm_Access_Info *ac; - Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction); - Evas_Object **next = va_arg(*list, Evas_Object **); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = EINA_FALSE; if (!next) - return; + return EINA_FALSE; *next = NULL; /* Ignore if disabled */ @@ -2780,21 +2186,21 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { if (!evas_object_visible_get(obj) || (elm_widget_tree_unfocusable_get(obj))) - return; + return EINA_FALSE; } else { if ((!evas_object_visible_get(obj)) || (elm_widget_disabled_get(obj)) || (elm_widget_tree_unfocusable_get(obj))) - return; + return EINA_FALSE; } /* Try use hook */ if (_elm_widget_focus_chain_manager_is(obj)) { Eina_Bool int_ret = EINA_FALSE; - eo_do((Eo *)obj, elm_wdg_focus_next(dir, next, &int_ret)); + eo_do((Eo *)obj, elm_obj_widget_focus_next(dir, next, &int_ret)); if (!int_ret && elm_widget_focus_get(obj)) { Evas_Object *o = NULL; @@ -2814,12 +2220,10 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (o) { *next = o; - *ret = EINA_TRUE; - return; + return EINA_TRUE; } } - *ret = int_ret; - return; + return int_ret; } /* access object does not check sd->can_focus, because an object could @@ -2827,14 +2231,14 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (_elm_config->access_mode && _elm_access_auto_highlight_get()) { ac = _elm_access_info_get(obj); - if (!ac) return; + if (!ac) return EINA_FALSE; /* check whether the hover object is visible or not */ if (!evas_object_visible_get(ac->hoverobj)) - return; + return EINA_FALSE; } else if (!elm_widget_can_focus_get(obj)) - return; + return EINA_FALSE; if (elm_widget_focus_get(obj)) { @@ -2851,16 +2255,12 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) else if (dir == ELM_FOCUS_LEFT) *next = sd->focus_left; - if (*next) - { - *ret = EINA_TRUE; - return; - } + if (*next) return EINA_TRUE; } /* Return */ *next = (Evas_Object *)obj; - *ret = !ELM_WIDGET_FOCUS_GET(obj); + return !ELM_WIDGET_FOCUS_GET(obj); } /** @@ -2882,41 +2282,21 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_list_next_get(const Evas_Object *obj, - const Eina_List *items, - void *(*list_data_get)(const Eina_List *list), - Elm_Focus_Direction dir, - Evas_Object **next) +EOLIAN static Eina_Bool +_elm_widget_focus_list_next_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Eina_List *items, list_data_get_func_type list_data_get, Elm_Focus_Direction dir, Evas_Object **next) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_list_next_get(items, list_data_get, dir, next, &ret)); - return ret; -} - -static void -_elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const Eina_List *items = va_arg(*list, const Eina_List *); - list_data_get_func_type list_data_get = va_arg(*list, list_data_get_func_type); - Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction); - Evas_Object **next = va_arg(*list, Evas_Object **); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Eina_List *(*list_next)(const Eina_List *list) = NULL; Evas_Object *focused_object = NULL; if (!next) - return; + return EINA_FALSE; *next = NULL; if (!_elm_widget_is(obj)) - return; + return EINA_FALSE; if (!items) - return; + return EINA_FALSE; /* When Up, Down, Right, or Left, try direction_get first. */ focused_object = elm_widget_focused_object_get(obj); @@ -2928,11 +2308,7 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) || (dir == ELM_FOCUS_LEFT)) { *next = elm_widget_focus_next_object_get(focused_object, dir); - if (*next) - { - if (ret) *ret = EINA_TRUE; - return; - } + if (*next) return EINA_TRUE; else { Evas_Object *n = NULL; @@ -2949,8 +2325,7 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) degree, &n, &weight)) { *next = n; - if (ret) *ret = EINA_TRUE; - return; + return EINA_TRUE; } } } @@ -2969,7 +2344,7 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) || (dir == ELM_FOCUS_LEFT)) list_next = eina_list_next; else - return; + return EINA_FALSE; const Eina_List *l = items; @@ -3004,8 +2379,7 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (elm_widget_focus_next_get(cur, dir, &tmp)) { *next = tmp; - if (ret) *ret = EINA_TRUE; - return; + return EINA_TRUE; } else if ((dir == ELM_FOCUS_UP) || (dir == ELM_FOCUS_DOWN) @@ -3015,7 +2389,7 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (tmp && elm_widget_focus_get(cur)) { *next = tmp; - return; + return EINA_FALSE; } } else if ((tmp) && (!to_focus)) @@ -3038,12 +2412,12 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) if (tmp) { *next = tmp; - return; + return EINA_FALSE; } } *next = to_focus; - return; + return EINA_FALSE; } /** @@ -3060,35 +2434,25 @@ _elm_widget_focus_list_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) * * @ingroup Widget */ -EAPI Evas_Object * -elm_widget_focus_next_object_get(const Evas_Object *obj, Elm_Focus_Direction dir) +EOLIAN static Evas_Object* +_elm_widget_focus_next_object_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir) { - ELM_WIDGET_CHECK(obj) NULL; - - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_focus_next_object_get(dir, &ret)); - return ret; -} - -static void -_elm_widget_focus_next_object_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction); - Evas_Object **ret = va_arg(*list, Evas_Object **); - Elm_Widget_Smart_Data *sd = _pd; + Evas_Object *ret; if (dir == ELM_FOCUS_PREVIOUS) - *ret = sd->focus_previous; + ret = sd->focus_previous; else if (dir == ELM_FOCUS_NEXT) - *ret = sd->focus_next; + ret = sd->focus_next; else if (dir == ELM_FOCUS_UP) - *ret = sd->focus_up; + ret = sd->focus_up; else if (dir == ELM_FOCUS_DOWN) - *ret = sd->focus_down; + ret = sd->focus_down; else if (dir == ELM_FOCUS_RIGHT) - *ret = sd->focus_right; + ret = sd->focus_right; else if (dir == ELM_FOCUS_LEFT) - *ret = sd->focus_left; + ret = sd->focus_left; + + return ret; } /** @@ -3107,20 +2471,9 @@ _elm_widget_focus_next_object_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI void -elm_widget_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir) +EOLIAN static void +_elm_widget_focus_next_object_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Object *next, Elm_Focus_Direction dir) { - ELM_WIDGET_CHECK(obj); - if (!next) return; - eo_do((Eo *) obj, elm_wdg_focus_next_object_set(next, dir)); -} - -static void -_elm_widget_focus_next_object_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Evas_Object *next = va_arg(*list, Evas_Object *); - Elm_Focus_Direction dir = va_arg(*list, Elm_Focus_Direction); - Elm_Widget_Smart_Data *sd = _pd; if (dir == ELM_FOCUS_PREVIOUS) sd->focus_previous = next; @@ -3136,19 +2489,9 @@ _elm_widget_focus_next_object_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) sd->focus_left = next; } -EAPI void -elm_widget_parent_highlight_set(Evas_Object *obj, - Eina_Bool highlighted) +EOLIAN static void +_elm_widget_parent_highlight_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool highlighted) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_parent_highlight_set(highlighted)); -} - -static void -_elm_widget_parent_highlight_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool highlighted = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; highlighted = !!highlighted; Evas_Object *o = elm_widget_parent_get(obj); @@ -3158,20 +2501,9 @@ _elm_widget_parent_highlight_set(Eo *obj, void *_pd, va_list *list) sd->highlighted = highlighted; } -EAPI void -elm_widget_signal_emit(Evas_Object *obj, - const char *emission, - const char *source) +EOLIAN static void +_elm_widget_signal_emit(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_signal_emit(emission, source)); -} - -static void -_elm_widget_signal_emit(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *emission = va_arg(*list, const char *); - const char *source = va_arg(*list, const char *); if (evas_object_smart_type_check(obj, "elm_layout")) elm_layout_signal_emit(obj, emission, source); else if (evas_object_smart_type_check(obj, "elm_icon")) @@ -3182,26 +2514,10 @@ _elm_widget_signal_emit(Eo *obj, void *_pd EINA_UNUSED, va_list *list) } } -EAPI void -elm_widget_signal_callback_add(Evas_Object *obj, - const char *emission, - const char *source, - Edje_Signal_Cb func, - void *data) +EOLIAN static void +_elm_widget_signal_callback_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { - ELM_WIDGET_CHECK(obj); EINA_SAFETY_ON_NULL_RETURN(func); - eo_do(obj, elm_wdg_signal_callback_add(emission, source, func, data)); -} - -static void -_elm_widget_signal_callback_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *emission = va_arg(*list, const char *); - const char *source = va_arg(*list, const char *); - Edje_Signal_Cb func = va_arg(*list, Edje_Signal_Cb); - EINA_SAFETY_ON_NULL_RETURN(func); - void *data = va_arg(*list, void *); if (evas_object_smart_type_check(obj, "elm_layout")) elm_layout_signal_callback_add(obj, emission, source, func, data); @@ -3214,27 +2530,9 @@ _elm_widget_signal_callback_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list) } } -EAPI void * -elm_widget_signal_callback_del(Evas_Object *obj, - const char *emission, - const char *source, - Edje_Signal_Cb func) +EOLIAN static void* +_elm_widget_signal_callback_del(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func) { - ELM_WIDGET_CHECK(obj) NULL; - void *ret = NULL; - eo_do(obj, elm_wdg_signal_callback_del(emission, source, func, &ret)); - return ret; -} - -static void -_elm_widget_signal_callback_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *emission = va_arg(*list, const char *); - const char *source = va_arg(*list, const char *); - Edje_Signal_Cb func = va_arg(*list, Edje_Signal_Cb); - void **ret = va_arg(*list, void **); - if (ret) *ret = NULL; - void *data = NULL; if (evas_object_smart_type_check(obj, "elm_layout")) @@ -3247,30 +2545,18 @@ _elm_widget_signal_callback_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) data = _elm_icon_signal_callback_del(obj, emission, source, func); } - if (ret) *ret = data; + return data; } -EAPI void -elm_widget_focus_set(Evas_Object *obj, - Eina_Bool focus) +EOLIAN static void +_elm_widget_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool focus) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_set(focus)); -} - -static void -_elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool focus = va_arg(*list, int); - - Elm_Widget_Smart_Data *sd = _pd; - if (!sd->focused) { focus_order++; sd->focus_order = focus_order; sd->focused = EINA_TRUE; - eo_do(obj, elm_wdg_on_focus(NULL)); + eo_do(obj, elm_obj_widget_on_focus(NULL)); } if (focus) @@ -3313,40 +2599,20 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) } } -EAPI Evas_Object * -elm_widget_parent_get(const Evas_Object *obj) +EOLIAN static Evas_Object* +_elm_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_parent_get(&ret)); - return ret; + return sd->parent_obj; } -static void -_elm_widget_parent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_focused_object_clear(Eo *obj, Elm_Widget_Smart_Data *sd) { - Evas_Object **ret = va_arg(*list, Evas_Object **); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->parent_obj; -} - -EAPI void -elm_widget_focused_object_clear(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focused_object_clear()); -} - -static void -_elm_widget_focused_object_clear(Eo *obj, void *_pd, va_list *list EINA_UNUSED) -{ - Elm_Widget_Smart_Data *sd = _pd; - if (!sd->focused) return; if (sd->resize_obj && elm_widget_is(sd->resize_obj) && elm_widget_focus_get(sd->resize_obj)) { - eo_do(sd->resize_obj, elm_wdg_focused_object_clear()); + eo_do(sd->resize_obj, elm_obj_widget_focused_object_clear()); } else { @@ -3356,27 +2622,19 @@ _elm_widget_focused_object_clear(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { if (elm_widget_is(child) && elm_widget_focus_get(child)) { - eo_do(child, elm_wdg_focused_object_clear()); + eo_do(child, elm_obj_widget_focused_object_clear()); break; } } } sd->focused = EINA_FALSE; - eo_do(obj, elm_wdg_on_focus(NULL)); + eo_do(obj, elm_obj_widget_on_focus(NULL)); } -EAPI void -elm_widget_focus_steal(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_steal()); -} - -static void -_elm_widget_focus_steal(Eo *obj, void *_pd, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_steal(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Object *parent, *parent2, *o; - Elm_Widget_Smart_Data *sd = _pd; if (sd->focused) return; if (sd->disabled) return; @@ -3394,7 +2652,7 @@ _elm_widget_focus_steal(Eo *obj, void *_pd, va_list *list EINA_UNUSED) } if ((!elm_widget_parent_get(parent)) && (!elm_widget_parent2_get(parent))) - eo_do(parent, elm_wdg_focused_object_clear()); + eo_do(parent, elm_obj_widget_focused_object_clear()); else { parent2 = elm_widget_parent_get(parent); @@ -3406,7 +2664,7 @@ _elm_widget_focus_steal(Eo *obj, void *_pd, va_list *list EINA_UNUSED) if (sd->resize_obj && elm_widget_is(sd->resize_obj) && elm_widget_focus_get(sd->resize_obj)) { - eo_do(sd->resize_obj, elm_wdg_focused_object_clear()); + eo_do(sd->resize_obj, elm_obj_widget_focused_object_clear()); } else { @@ -3416,7 +2674,7 @@ _elm_widget_focus_steal(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { if (elm_widget_is(child) && elm_widget_focus_get(child)) { - eo_do(child, elm_wdg_focused_object_clear()); + eo_do(child, elm_obj_widget_focused_object_clear()); break; } } @@ -3427,15 +2685,8 @@ _elm_widget_focus_steal(Eo *obj, void *_pd, va_list *list EINA_UNUSED) return; } -EAPI void -elm_widget_focus_restore(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_restore()); -} - -static void -_elm_widget_focus_restore(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_restore(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Evas_Object *newest = NULL; unsigned int newest_focus_order = 0; @@ -3469,67 +2720,28 @@ _elm_widget_top_win_focused_get(const Evas_Object *obj) return sd->top_win_focused; } -EAPI void -elm_widget_disabled_set(Evas_Object *obj, - Eina_Bool disabled) +EOLIAN static void +_elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_disabled_set(disabled)); -} - -static void -_elm_widget_disabled_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool disabled = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; if (sd->disabled == disabled) return; sd->disabled = !!disabled; elm_widget_focus_disabled_handle(obj); - eo_do(obj, elm_wdg_disable(NULL)); + eo_do(obj, elm_obj_widget_disable(NULL)); } -EAPI Eina_Bool -elm_widget_disabled_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_disabled_get(&ret)); - return ret; + return sd->disabled; } -static void -_elm_widget_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool forceshow) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->disabled; -} - -EAPI void -elm_widget_show_region_set(Evas_Object *obj, - Evas_Coord x, - Evas_Coord y, - Evas_Coord w, - Evas_Coord h, - Eina_Bool forceshow) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_show_region_set(x, y, w, h, forceshow)); -} - -static void -_elm_widget_show_region_set(Eo *obj, void *_pd, va_list *list) -{ - Evas_Coord x = va_arg(*list, Evas_Coord); - Evas_Coord y = va_arg(*list, Evas_Coord); - Evas_Coord w = va_arg(*list, Evas_Coord); - Evas_Coord h = va_arg(*list, Evas_Coord); - Eina_Bool forceshow = va_arg(*list, int); Evas_Object *parent_obj, *child_obj; Evas_Coord px, py, cx, cy, nx, ny; - Elm_Widget_Smart_Data *sd = _pd; evas_smart_objects_calculate(evas_object_evas_get(obj)); @@ -3580,27 +2792,9 @@ _elm_widget_show_region_set(Eo *obj, void *_pd, va_list *list) while (parent_obj); } -EAPI void -elm_widget_show_region_get(const Evas_Object *obj, - Evas_Coord *x, - Evas_Coord *y, - Evas_Coord *w, - Evas_Coord *h) +EOLIAN static void +_elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { - ELM_WIDGET_CHECK(obj); - eo_do((Eo *) obj, elm_wdg_show_region_get(x, y, w, h)); -} - -static void -_elm_widget_show_region_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Evas_Coord *x = va_arg(*list, Evas_Coord *); - Evas_Coord *y = va_arg(*list, Evas_Coord *); - Evas_Coord *w = va_arg(*list, Evas_Coord *); - Evas_Coord *h = va_arg(*list, Evas_Coord *); - - Elm_Widget_Smart_Data *sd = _pd; - if (x) *x = sd->rx; if (y) *y = sd->ry; if (w) *w = sd->rw; @@ -3628,53 +2822,17 @@ _elm_widget_show_region_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI Eina_Bool -elm_widget_focus_region_get(const Evas_Object *obj, - Evas_Coord *x, - Evas_Coord *y, - Evas_Coord *w, - Evas_Coord *h) +EOLIAN static Eina_Bool +_elm_widget_focus_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_focus_region_get(x, y, w, h, &ret)); - if (!ret) - { - evas_object_geometry_get(obj, NULL, NULL, w, h); - if (x) *x = 0; - if (y) *y = 0; - } - return EINA_TRUE; -} - -static void -_elm_widget_focus_region_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Evas_Coord *x = va_arg(*list, Evas_Coord *); - Evas_Coord *y = va_arg(*list, Evas_Coord *); - Evas_Coord *w = va_arg(*list, Evas_Coord *); - Evas_Coord *h = va_arg(*list, Evas_Coord *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Eina_Bool int_ret = EINA_FALSE; - eo_do((Eo *)obj, elm_wdg_on_focus_region(x, y, w, h, &int_ret)); - *ret = int_ret; + eo_do((Eo *)obj, elm_obj_widget_on_focus_region(x, y, w, h, &int_ret)); + return int_ret; } -EAPI void -elm_widget_parents_bounce_get(Evas_Object *obj, - Eina_Bool *horiz, Eina_Bool *vert) +EOLIAN static void +_elm_widget_parents_bounce_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool *horiz, Eina_Bool *vert) { - ELM_WIDGET_CHECK(obj); - eo_do((Eo *)obj, elm_wdg_parents_bounce_get(horiz, vert)); -} - -static void -_elm_widget_parents_bounce_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Eina_Bool *horiz = va_arg(*list, Eina_Bool *); - Eina_Bool *vert = va_arg(*list, Eina_Bool *); - Evas_Object *parent_obj = obj; Eina_Bool h, v; @@ -3696,44 +2854,28 @@ _elm_widget_parents_bounce_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) while (parent_obj); } -EAPI Eina_List * -elm_widget_scrollable_children_get(Evas_Object *obj) +EOLIAN static Eina_List* +_elm_widget_scrollable_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - Eina_List *ret = NULL; - eo_do(obj, elm_wdg_scrollable_children_get(&ret)); - return ret; -} - -static void -_elm_widget_scrollable_children_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_List **ret = va_arg(*list, Eina_List **); - *ret = NULL; + Eina_List *ret; + ret = NULL; Eina_List *l; Evas_Object *child; - Elm_Widget_Smart_Data *sd = _pd; EINA_LIST_FOREACH(sd->subobjs, l, child) { if (_elm_scrollable_is(child)) - *ret = eina_list_append(*ret, child); + ret = eina_list_append(ret, child); } + + return ret; } -EAPI void -elm_widget_scroll_hold_push(Evas_Object *obj) +EOLIAN static void +_elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_scroll_hold_push()); -} - -static void -_elm_widget_scroll_hold_push(Eo *obj, void *_pd, va_list *list EINA_UNUSED) -{ - Elm_Widget_Smart_Data *sd = _pd; sd->scroll_hold++; if (sd->scroll_hold == 1) { @@ -3752,21 +2894,13 @@ _elm_widget_scroll_hold_push(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eina_list_free(scr_children); } } - if (sd->parent_obj) eo_do(sd->parent_obj, elm_wdg_scroll_hold_push()); + if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_hold_push()); // FIXME: on delete/reparent hold pop } -EAPI void -elm_widget_scroll_hold_pop(Evas_Object *obj) +EOLIAN static void +_elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_scroll_hold_pop()); -} - -static void -_elm_widget_scroll_hold_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) -{ - Elm_Widget_Smart_Data *sd = _pd; sd->scroll_hold--; if (!sd->scroll_hold) { @@ -3785,38 +2919,19 @@ _elm_widget_scroll_hold_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eina_list_free(scr_children); } } - if (sd->parent_obj) eo_do(sd->parent_obj, elm_wdg_scroll_hold_pop()); + if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_hold_pop()); if (sd->scroll_hold < 0) sd->scroll_hold = 0; } -EAPI int -elm_widget_scroll_hold_get(const Evas_Object *obj) +EOLIAN static int +_elm_widget_scroll_hold_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) 0; - int ret = 0; - eo_do((Eo *) obj, elm_wdg_scroll_hold_get(&ret)); - return ret; + return sd->scroll_hold; } -static void -_elm_widget_scroll_hold_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) { - int *ret = va_arg(*list, int *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->scroll_hold; -} - -EAPI void -elm_widget_scroll_freeze_push(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_scroll_freeze_push()); -} - -static void -_elm_widget_scroll_freeze_push(Eo *obj, void *_pd, va_list *list EINA_UNUSED) -{ - Elm_Widget_Smart_Data *sd = _pd; sd->scroll_freeze++; if (sd->scroll_freeze == 1) { @@ -3835,21 +2950,13 @@ _elm_widget_scroll_freeze_push(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eina_list_free(scr_children); } } - if (sd->parent_obj) eo_do(sd->parent_obj, elm_wdg_scroll_freeze_push()); + if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_freeze_push()); // FIXME: on delete/reparent freeze pop } -EAPI void -elm_widget_scroll_freeze_pop(Evas_Object *obj) +EOLIAN static void +_elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_scroll_freeze_pop()); -} - -static void -_elm_widget_scroll_freeze_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) -{ - Elm_Widget_Smart_Data *sd = _pd; sd->scroll_freeze--; if (!sd->scroll_freeze) { @@ -3868,41 +2975,19 @@ _elm_widget_scroll_freeze_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eina_list_free(scr_children); } } - if (sd->parent_obj) eo_do(sd->parent_obj, elm_wdg_scroll_freeze_pop()); + if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_freeze_pop()); if (sd->scroll_freeze < 0) sd->scroll_freeze = 0; } -EAPI int -elm_widget_scroll_freeze_get(const Evas_Object *obj) +EOLIAN static int +_elm_widget_scroll_freeze_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) 0; - int ret = 0; - eo_do((Eo *) obj, elm_wdg_scroll_freeze_get(&ret)); - return ret; + return sd->scroll_freeze; } -static void -_elm_widget_scroll_freeze_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) { - int *ret = va_arg(*list, int *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->scroll_freeze; -} - -EAPI void -elm_widget_scale_set(Evas_Object *obj, - double scale) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_scale_set(scale)); -} - -static void -_elm_widget_scale_set(Eo *obj, void *_pd, va_list *list) -{ - double scale = va_arg(*list, double); - Elm_Widget_Smart_Data *sd = _pd; - if (scale <= 0.0) scale = 0.0; if (sd->scale != scale) { @@ -3911,50 +2996,27 @@ _elm_widget_scale_set(Eo *obj, void *_pd, va_list *list) } } -EAPI double -elm_widget_scale_get(const Evas_Object *obj) +EOLIAN static double +_elm_widget_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - double ret = 1.0; - eo_do((Eo *) obj, elm_wdg_scale_get(&ret)); - return ret; -} - -static void -_elm_widget_scale_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - double *ret = va_arg(*list, double *); - Elm_Widget_Smart_Data *sd = _pd; - // FIXME: save walking up the tree by storing/caching parent scale if (sd->scale == 0.0) { if (sd->parent_obj && elm_widget_is(sd->parent_obj)) { - *ret = elm_widget_scale_get(sd->parent_obj); - return; + return elm_widget_scale_get(sd->parent_obj); } else { - *ret = 1.0; - return; + return 1.0; } } - *ret = sd->scale; + return sd->scale; } -EAPI void -elm_widget_theme_set(Evas_Object *obj, - Elm_Theme *th) +EOLIAN static void +_elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_theme_set(th)); -} - -static void -_elm_widget_theme_set(Eo *obj, void *_pd, va_list *list) -{ - Elm_Theme *th = va_arg(*list, Elm_Theme *); - Elm_Widget_Smart_Data *sd = _pd; Eina_Bool apply = EINA_FALSE; if (sd->theme != th) { @@ -3966,51 +3028,20 @@ _elm_widget_theme_set(Eo *obj, void *_pd, va_list *list) } } -EAPI void -elm_widget_part_text_set(Evas_Object *obj, - const char *part, - const char *label) +EOLIAN static void +_elm_widget_part_text_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *part, const char *label) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_part_text_set(part, label)); -} - -static void -_elm_widget_part_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *part = va_arg(*list, const char *); - const char *label = va_arg(*list, const char *); if (evas_object_smart_type_check(obj, "elm_layout")) elm_layout_text_set(obj, part, label); } -EAPI const char * -elm_widget_part_text_get(const Evas_Object *obj, - const char *part) +EOLIAN static const char* +_elm_widget_part_text_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *part) { - ELM_WIDGET_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_wdg_part_text_get(part, &ret)); - return ret; -} - -static void -_elm_widget_part_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *part = va_arg(*list, const char *); - const char **ret = va_arg(*list, const char **); if (evas_object_smart_type_check(obj, "elm_layout")) - *ret = elm_layout_text_get(obj, part); -} + return elm_layout_text_get(obj, part); -EAPI void -elm_widget_domain_translatable_part_text_set(Evas_Object *obj, - const char *part, - const char *domain, - const char *label) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_domain_translatable_part_text_set(part, domain, label)); + return NULL; } static Elm_Translate_String_Data * @@ -4071,14 +3102,10 @@ _part_text_translatable_set(Eina_Inlist **translate_strings, const char *part, E return ts; } -static void -_elm_widget_domain_translatable_part_text_set(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_domain_translatable_part_text_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *part, const char *domain, const char *label) { - const char *part = va_arg(*list, const char *); - const char *domain = va_arg(*list, const char *); - const char *label = va_arg(*list, const char *); - Elm_Widget_Smart_Data *sd = _pd; Elm_Translate_String_Data *ts; if (!label) @@ -4101,50 +3128,23 @@ _elm_widget_domain_translatable_part_text_set(Eo *obj, void *_pd, va_list *list) } sd->on_translate = EINA_TRUE; - eo_do(obj, elm_wdg_part_text_set(part, label)); + eo_do(obj, elm_obj_widget_part_text_set(part, label)); sd->on_translate = EINA_FALSE; } -EAPI const char * -elm_widget_translatable_part_text_get(const Evas_Object *obj, - const char *part) +EOLIAN static const char* +_elm_widget_translatable_part_text_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *part) { - ELM_WIDGET_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_wdg_translatable_part_text_get(part, &ret)); - return ret; -} - -static void -_elm_widget_translatable_part_text_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - const char *part = va_arg(*list, const char *); - const char **ret = va_arg(*list, const char **); - - Elm_Widget_Smart_Data *sd = _pd; Elm_Translate_String_Data *ts; ts = _translate_string_data_get(sd->translate_strings, part); - if (ts) *ret = ts->string; - else *ret = NULL; + if (ts) return ts->string; + else return NULL; } -EAPI void -elm_widget_domain_part_text_translatable_set(Evas_Object *obj, const char *part, const char *domain, Eina_Bool translatable) +EOLIAN static void +_elm_widget_domain_part_text_translatable_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *part, const char *domain, Eina_Bool translatable) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, - elm_wdg_domain_part_text_translatable_set(part, domain, translatable)); -} - -static void -_elm_widget_domain_part_text_translatable_set(Eo *obj, void *_pd, va_list *list) -{ - const char *part = va_arg(*list, const char *); - const char *domain = va_arg(*list, const char *); - Eina_Bool translatable = va_arg(*list, int); - - Elm_Widget_Smart_Data *sd = _pd; Elm_Translate_String_Data *ts; const char *text; @@ -4154,7 +3154,7 @@ _elm_widget_domain_part_text_translatable_set(Eo *obj, void *_pd, va_list *list) if (!ts->domain) ts->domain = eina_stringshare_add(domain); else eina_stringshare_replace(&ts->domain, domain); - eo_do(obj, elm_wdg_part_text_get(part, &text)); + eo_do(obj, elm_obj_widget_part_text_get(part, &text)); if (!text || !text[0]) return; if (!ts->string) ts->string = eina_stringshare_add(text); @@ -4164,7 +3164,7 @@ _elm_widget_domain_part_text_translatable_set(Eo *obj, void *_pd, va_list *list) text = dgettext(domain, text); #endif sd->on_translate = EINA_TRUE; - eo_do(obj, elm_wdg_part_text_set(part, text)); + eo_do(obj, elm_obj_widget_part_text_set(part, text)); sd->on_translate = EINA_FALSE; } @@ -4172,7 +3172,7 @@ EAPI void elm_widget_translate(Evas_Object *obj) { ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_translate(NULL)); + eo_do(obj, elm_obj_widget_translate(NULL)); } static const char* @@ -4193,38 +3193,21 @@ _part_text_translate(Eina_Inlist *translate_strings, return text; } -EAPI const char * -elm_widget_part_text_translate(Evas_Object *obj, const char *part, const char *text) +EOLIAN static const char* +_elm_widget_part_text_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *part, const char *text) { - ELM_WIDGET_CHECK(obj) NULL; - const char *ret; - eo_do(obj, elm_wdg_part_text_translate(part, text, &ret)); - return ret; + + + if (!sd->translate_strings || sd->on_translate) return text; + return _part_text_translate(sd->translate_strings, part, text); } -static void -_elm_widget_part_text_translate(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - const char *part = va_arg(*list, const char *); - const char *text = va_arg(*list, const char *); - const char **ret = va_arg(*list, const char **); - - Elm_Widget_Smart_Data *sd = _pd; - - if (!sd->translate_strings || sd->on_translate) - { - *ret = text; - return; - } - *ret = _part_text_translate(sd->translate_strings, part, text); -} - -static void -_elm_widget_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static Eina_Bool +_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { const Eina_List *l; Evas_Object *child; - API_ENTRY return; + API_ENTRY return EINA_FALSE; EINA_LIST_FOREACH(sd->subobjs, l, child) elm_widget_translate(child); @@ -4237,11 +3220,12 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list if (!ts->string) continue; const char *s = dgettext(ts->domain, ts->string); sd->on_translate = EINA_TRUE; - eo_do(obj, elm_wdg_part_text_set(ts->id, s)); + eo_do(obj, elm_obj_widget_part_text_set(ts->id, s)); sd->on_translate = EINA_FALSE; } #endif evas_object_smart_callback_call(obj, SIG_WIDGET_LANG_CHANGED, NULL); + return EINA_TRUE; } EAPI void @@ -4273,328 +3257,138 @@ elm_widget_content_part_unset(Evas_Object *obj, return ret; } -EAPI void -elm_widget_access_info_set(Evas_Object *obj, - const char *txt) +EOLIAN static void +_elm_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_access_info_set(txt)); -} - -static void -_elm_widget_access_info_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - const char *txt = va_arg(*list, const char *); - Elm_Widget_Smart_Data *sd = _pd; eina_stringshare_del(sd->access_info); if (!txt) sd->access_info = NULL; else sd->access_info = eina_stringshare_add(txt); } -EAPI const char * -elm_widget_access_info_get(const Evas_Object *obj) +EOLIAN static const char* +_elm_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_wdg_access_info_get(&ret)); - return ret; + return sd->access_info; } -static void -_elm_widget_access_info_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Elm_Theme* +_elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - const char **ret = va_arg(*list, const char **); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->access_info; -} - -EAPI Elm_Theme * -elm_widget_theme_get(const Evas_Object *obj) -{ - Elm_Theme *ret = NULL; - eo_do((Eo *) obj, elm_wdg_theme_get(&ret)); - return ret; -} - -static void -_elm_widget_theme_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Theme **ret = va_arg(*list, Elm_Theme **); - *ret = NULL; - Elm_Widget_Smart_Data *sd = _pd; - if (!sd->theme) { if (sd->parent_obj && elm_widget_is(sd->parent_obj)) - { - *ret = elm_widget_theme_get(sd->parent_obj); - return; - } - else - return; + return elm_widget_theme_get(sd->parent_obj); + else return NULL; } - *ret = sd->theme; + return sd->theme; } -EAPI Eina_Bool -elm_widget_style_set(Evas_Object *obj, - const char *style) +EOLIAN static Eina_Bool +_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_style_set(style, &ret)); - return ret; -} - -static void -_elm_widget_style_set(Eo *obj, void *_pd, va_list *list) -{ - const char *style = va_arg(*list, const char *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Eina_Bool int_ret = EINA_FALSE; - Elm_Widget_Smart_Data *sd = _pd; if (eina_stringshare_replace(&sd->style, style)) - { - int_ret = elm_widget_theme(obj); - if (ret) *ret = int_ret; - return; - } + return elm_widget_theme(obj); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } -EAPI const char * -elm_widget_style_get(const Evas_Object *obj) +EOLIAN static const char* +_elm_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) NULL; - const char *ret = "default"; - eo_do((Eo *) obj, elm_wdg_style_get(&ret)); + const char *ret; + ret = "default"; + if (sd->style) ret = sd->style; + return ret; } -static void -_elm_widget_style_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_tooltip_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Tooltip *tt) { - const char **ret = va_arg(*list, const char **); - *ret = "default"; - Elm_Widget_Smart_Data *sd = _pd; - if (sd->style) *ret = sd->style; -} - -EAPI void -elm_widget_tooltip_add(Evas_Object *obj, - Elm_Tooltip *tt) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_tooltip_add(tt)); -} - -static void -_elm_widget_tooltip_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Tooltip *tt = va_arg(*list, Elm_Tooltip *); - Elm_Widget_Smart_Data *sd = _pd; sd->tooltips = eina_list_append(sd->tooltips, tt); } -EAPI void -elm_widget_tooltip_del(Evas_Object *obj, - Elm_Tooltip *tt) +EOLIAN static void +_elm_widget_tooltip_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Tooltip *tt) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_tooltip_del(tt)); -} - -static void -_elm_widget_tooltip_del(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Tooltip *tt = va_arg(*list, Elm_Tooltip *); - Elm_Widget_Smart_Data *sd = _pd; sd->tooltips = eina_list_remove(sd->tooltips, tt); } -EAPI void -elm_widget_cursor_add(Evas_Object *obj, - Elm_Cursor *cur) +EOLIAN static void +_elm_widget_cursor_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Cursor *cur) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_cursor_add(cur)); -} - -static void -_elm_widget_cursor_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Cursor *cur = va_arg(*list, Elm_Cursor *); - Elm_Widget_Smart_Data *sd = _pd; sd->cursors = eina_list_append(sd->cursors, cur); } -EAPI void -elm_widget_cursor_del(Evas_Object *obj, - Elm_Cursor *cur) +EOLIAN static void +_elm_widget_cursor_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Cursor *cur) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_cursor_del(cur)); -} - -static void -_elm_widget_cursor_del(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Cursor *cur = va_arg(*list, Elm_Cursor *); - Elm_Widget_Smart_Data *sd = _pd; sd->cursors = eina_list_remove(sd->cursors, cur); } -EAPI void -elm_widget_drag_lock_x_set(Evas_Object *obj, - Eina_Bool lock) +EOLIAN static void +_elm_widget_drag_lock_x_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool lock) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_drag_lock_x_set(lock)); -} - -static void -_elm_widget_drag_lock_x_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool lock = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; if (sd->drag_x_locked == lock) return; sd->drag_x_locked = lock; if (sd->drag_x_locked) _propagate_x_drag_lock(obj, 1); else _propagate_x_drag_lock(obj, -1); } -EAPI void -elm_widget_drag_lock_y_set(Evas_Object *obj, - Eina_Bool lock) +EOLIAN static void +_elm_widget_drag_lock_y_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool lock) { - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_drag_lock_y_set(lock)); -} - -static void -_elm_widget_drag_lock_y_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool lock = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; if (sd->drag_y_locked == lock) return; sd->drag_y_locked = lock; if (sd->drag_y_locked) _propagate_y_drag_lock(obj, 1); else _propagate_y_drag_lock(obj, -1); } -EAPI Eina_Bool -elm_widget_drag_lock_x_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_drag_lock_x_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_drag_lock_x_get(&ret)); - return ret; + return sd->drag_x_locked; } -static void -_elm_widget_drag_lock_x_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_drag_lock_y_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->drag_x_locked; + return sd->drag_y_locked; } -EAPI Eina_Bool -elm_widget_drag_lock_y_get(const Evas_Object *obj) +EOLIAN static int +_elm_widget_drag_child_locked_x_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_wdg_drag_lock_y_get(&ret)); - return ret; + return sd->child_drag_x_locked; } -static void -_elm_widget_drag_lock_y_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static int +_elm_widget_drag_child_locked_y_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->drag_y_locked; + return sd->child_drag_y_locked; } -EAPI int -elm_widget_drag_child_locked_x_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) { - ELM_WIDGET_CHECK(obj) 0; - int ret = 0; - eo_do((Eo *) obj, elm_wdg_drag_child_locked_x_get(&ret)); - return ret; -} - -static void -_elm_widget_drag_child_locked_x_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - int *ret = va_arg(*list, int *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->child_drag_x_locked; -} - -EAPI int -elm_widget_drag_child_locked_y_get(const Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj) 0; - int ret = 0; - eo_do((Eo *) obj, elm_wdg_drag_child_locked_y_get(&ret)); - return ret; -} - -static void -_elm_widget_drag_child_locked_y_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - int *ret = va_arg(*list, int *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->child_drag_y_locked; -} - -EAPI Eina_Bool -elm_widget_theme_object_set(Evas_Object *obj, - Evas_Object *edj, - const char *wname, - const char *welement, - const char *wstyle) -{ - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_wdg_theme_object_set(edj, wname, welement, wstyle, &ret)); - return ret; -} - -static void -_elm_widget_theme_object_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Evas_Object *edj = va_arg(*list, Evas_Object *); - const char *wname = va_arg(*list, const char *); - const char *welement = va_arg(*list, const char *); - const char *wstyle = va_arg(*list, const char *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - if (!_elm_theme_object_set(obj, edj, wname, welement, wstyle)) { - if (ret) *ret = EINA_FALSE; - return; + return EINA_FALSE; } if (sd->orient_mode != -1) { char buf[128]; snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode); - eo_do(obj, elm_wdg_signal_emit(buf, "elm")); + eo_do(obj, elm_obj_widget_signal_emit(buf, "elm")); } - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } -static void -_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_widget_eo_base_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eo_Dbg_Info *root) { - Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); @@ -4698,26 +3492,11 @@ _widget_name_find(const Evas_Object *obj, return NULL; } -EAPI Evas_Object * -elm_widget_name_find(const Evas_Object *obj, - const char *name, - int recurse) +EOLIAN static Evas_Object* +_elm_widget_name_find(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *name, int recurse) { - ELM_WIDGET_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_name_find(name, recurse, &ret)); - return ret; -} - -static void -_elm_widget_name_find(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *name = va_arg(*list, const char *); - int recurse = va_arg(*list, int); - Evas_Object **ret = va_arg(*list, Evas_Object **); - *ret = NULL; - if (!name) return; - *ret = _widget_name_find(obj, name, recurse); + if (!name) return NULL; + return _widget_name_find(obj, name, recurse); } /** @@ -4764,15 +3543,8 @@ elm_widget_stringlist_free(Eina_List *list) eina_stringshare_del(s); } -EAPI void -elm_widget_focus_hide_handle(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_hide_handle()); -} - -static void -_elm_widget_focus_hide_handle(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_hide_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { if (!_elm_widget_is(obj)) return; @@ -4790,26 +3562,19 @@ elm_widget_focus_mouse_up_handle(Evas_Object *obj) } while (o); - eo_do(o, elm_wdg_focus_mouse_up_handle()); + eo_do(o, elm_obj_widget_focus_mouse_up_handle()); } -static void -_elm_widget_focus_mouse_up_handle(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { if (!obj) return; if (!_is_focusable(obj)) return; elm_widget_focus_steal(obj); } -EAPI void -elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_tree_unfocusable_handle()); -} - -static void -_elm_widget_focus_tree_unfocusable_handle(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_tree_unfocusable_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { if (!elm_widget_parent_get(obj)) elm_widget_focused_object_clear(obj); @@ -4817,62 +3582,28 @@ _elm_widget_focus_tree_unfocusable_handle(Eo *obj, void *_pd EINA_UNUSED, va_lis _if_focused_revert(obj, EINA_TRUE); } -EAPI void -elm_widget_focus_disabled_handle(Evas_Object *obj) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_disabled_handle()); -} - -static void -_elm_widget_focus_disabled_handle(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_focus_disabled_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { elm_widget_focus_tree_unfocusable_handle(obj); } -EAPI unsigned int -elm_widget_focus_order_get(const Evas_Object *obj) +EOLIAN static unsigned int +_elm_widget_focus_order_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) 0; - unsigned int ret = 0; - eo_do((Eo *) obj, elm_wdg_focus_order_get(&ret)); - return ret; + return sd->focus_order; } -static void -_elm_widget_focus_order_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Evas_Object* +_elm_widget_newest_focus_order_get(Eo *obj, Elm_Widget_Smart_Data *sd, unsigned int *newest_focus_order, Eina_Bool can_focus_only) { - unsigned int *ret = va_arg(*list, unsigned int *); - Elm_Widget_Smart_Data *sd = _pd; - *ret = sd->focus_order; -} - -EAPI Evas_Object * -elm_widget_newest_focus_order_get(const Evas_Object *obj, - unsigned int *newest_focus_order, - Eina_Bool can_focus_only) -{ - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_wdg_newest_focus_order_get(newest_focus_order, can_focus_only, &ret)); - return ret; -} - -static void -_elm_widget_newest_focus_order_get(Eo *obj, void *_pd, va_list *list) -{ - unsigned int *newest_focus_order = va_arg(*list, unsigned int *); - Eina_Bool can_focus_only = va_arg(*list, int); - Evas_Object **ret = va_arg(*list, Evas_Object **); - Elm_Widget_Smart_Data *sd = _pd; - *ret = NULL; - const Eina_List *l; Evas_Object *child, *cur, *best; if (!evas_object_visible_get(obj) || (elm_widget_disabled_get(obj)) || (elm_widget_tree_unfocusable_get(obj))) - return; + return NULL; best = NULL; if (*newest_focus_order < sd->focus_order) @@ -4893,8 +3624,7 @@ _elm_widget_newest_focus_order_get(Eo *obj, void *_pd, va_list *list) best = cur; } } - *ret = best; - return; + return best; } /* @@ -4914,13 +3644,6 @@ _elm_widget_newest_focus_order_get(Eo *obj, void *_pd, va_list *list) * * @ingroup Widget */ -EAPI void -elm_widget_focus_highlight_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next) -{ - ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_highlight_geometry_get(x, y, w, h, &is_next)); -} - /* * @internal * @@ -4976,38 +3699,20 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, if (th != *h) *h = th; } -static void -_elm_widget_focus_highlight_geometry_get(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next) { - Evas_Coord *x = va_arg(*list, Evas_Coord *); - Evas_Coord *y = va_arg(*list, Evas_Coord *); - Evas_Coord *w = va_arg(*list, Evas_Coord *); - Evas_Coord *h = va_arg(*list, Evas_Coord *); - Eina_Bool *is_next = va_arg(*list, Eina_Bool *); (void)is_next; - Elm_Widget_Smart_Data *sd = _pd; evas_object_geometry_get(obj, x, y, w, h); elm_widget_focus_highlight_focus_part_geometry_get(sd->resize_obj, x, y, w, h); } -EAPI Elm_Object_Item * -elm_widget_focused_item_get(const Evas_Object *obj) +EOLIAN static Elm_Object_Item* +_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { - ELM_WIDGET_CHECK(obj) NULL; - Elm_Object_Item *ret = NULL; - eo_do(obj, elm_wdg_focused_item_get(&ret)); - - return ret; -} - -static void -_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) -{ - Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **); - - if (ret) *ret = NULL; + return NULL; } EAPI void @@ -5020,7 +3725,7 @@ elm_widget_activate(Evas_Object *obj, Elm_Activate act) ret = EINA_FALSE; - eo_do(obj, elm_wdg_activate(act, &ret)); + eo_do(obj, elm_obj_widget_activate(act, &ret)); if (ret) return; @@ -5045,22 +3750,13 @@ elm_widget_activate(Evas_Object *obj, Elm_Activate act) * After keypad showing, conform widget can change child's Evas_Display_Mode. * @ingroup Widget */ -EAPI void -elm_widget_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode) +EOLIAN static void +_elm_widget_display_mode_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Display_Mode dispmode) { - eo_do((Eo *) obj, elm_wdg_display_mode_set(dispmode)); -} - -static void -_elm_widget_display_mode_set(Eo *obj, void *_pd, va_list *list) -{ - Evas_Display_Mode dispmode = va_arg(*list, Evas_Display_Mode); Evas_Display_Mode prev_dispmode; Evas_Object *child; Eina_List *l; - Elm_Widget_Smart_Data *sd = _pd; - prev_dispmode = evas_object_size_hint_display_mode_get(obj); if ((prev_dispmode == dispmode) || @@ -5077,22 +3773,10 @@ _elm_widget_display_mode_set(Eo *obj, void *_pd, va_list *list) } } -EAPI void -elm_widget_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled) +EOLIAN static void +_elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) { - ELM_WIDGET_CHECK(obj); - ELM_WIDGET_DATA_GET(obj, sd); - if (disabled && (sd->orient_mode == -1)) return; - if (!disabled && (sd->orient_mode != -1)) return; - eo_do((Eo *) obj, elm_wdg_orientation_mode_disabled_set(disabled)); -} - -static void -_elm_widget_orientation_mode_disabled_set(Eo *obj, void *_pd, va_list *list) -{ - Eina_Bool disabled = va_arg(*list, int); int orient_mode = -1; - Elm_Widget_Smart_Data *sd = _pd; if (!disabled) { @@ -5102,43 +3786,21 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, void *_pd, va_list *list) if (!sd_parent) orient_mode = 0; else orient_mode = sd_parent->orient_mode; } - eo_do(obj, elm_wdg_orientation_set(orient_mode)); + eo_do(obj, elm_obj_widget_orientation_set(orient_mode)); } -EAPI Eina_Bool -elm_widget_orientation_mode_disabled_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { - ELM_WIDGET_CHECK(obj) EINA_FALSE; - Eina_Bool ret; - eo_do((Eo *) obj, elm_wdg_orientation_mode_disabled_get(&ret)); - return ret; + if (sd->orient_mode == -1) return EINA_TRUE; + else return EINA_FALSE; } -static void -_elm_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *sd = _pd; - if (sd->orient_mode == -1) *ret = EINA_TRUE; - else *ret = EINA_FALSE; -} - -EAPI void -elm_widget_orientation_set(Evas_Object *obj, int rotation) -{ - ELM_WIDGET_CHECK(obj); - ELM_WIDGET_DATA_GET(obj, sd); - if ((sd->orient_mode == rotation) || (sd->orient_mode == -1)) return; - eo_do((Eo *) obj, elm_wdg_orientation_set(rotation)); -} - -static void -_elm_widget_orientation_set(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_widget_orientation_set(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode) { Evas_Object *child; Eina_List *l; - int orient_mode = va_arg(*list, int); - Elm_Widget_Smart_Data *sd = _pd; sd->orient_mode = orient_mode; @@ -5149,7 +3811,7 @@ _elm_widget_orientation_set(Eo *obj, void *_pd, va_list *list) { char buf[128]; snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode); - eo_do(obj, elm_wdg_signal_emit(buf, "elm")); + eo_do(obj, elm_obj_widget_signal_emit(buf, "elm")); } } @@ -6570,32 +5232,26 @@ _atspi_obj_create(void *data) return EINA_FALSE; } -static void -_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_widget_constructor(Eo *obj, Elm_Widget_Smart_Data *sd) { Eo *parent; - ELM_WIDGET_DATA_GET(obj, sd); sd->on_create = EINA_TRUE; eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY), eo_parent_get(&parent)); - eo_do(obj, elm_wdg_parent_set(parent)); + eo_do(obj, elm_obj_widget_parent_set(parent)); sd->on_create = EINA_FALSE; if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) ecore_idle_enterer_add(_atspi_obj_create, obj); } -static void -_elm_widget_on_focus(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - - ELM_WIDGET_DATA_GET(obj, sd); - if (elm_widget_can_focus_get(obj)) { if (elm_widget_focus_get(obj)) @@ -6612,381 +5268,51 @@ _elm_widget_on_focus(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) } } else - return; + return EINA_FALSE; - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } -static void -_elm_widget_disable(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_disable(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; + return EINA_FALSE; } -static void -_elm_widget_event(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *source EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info EINA_UNUSED) { - va_arg(*list, Evas_Object *); - va_arg(*list, Evas_Callback_Type); - va_arg(*list, void *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; + return EINA_FALSE; } -static void -_elm_widget_focus_next_manager_is_unimplemented(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; WRN("The %s widget does not implement the \"focus_next/focus_next_manager_is\" functions.", eo_class_name_get(eo_class_get(obj))); + return EINA_FALSE; } -static void -_elm_widget_focus_direction_manager_is_unimplemented(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +static Eina_Bool +_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; WRN("The %s widget does not implement the \"focus_direction/focus_direction_manager_is\" functions.", eo_class_name_get(eo_class_get(obj))); + return EINA_FALSE; } -static void -_elm_widget_activate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_widget_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Elm_Activate act EINA_UNUSED) { - va_arg(*list, Elm_Activate); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_TRUE; WRN("The %s widget does not implement the \"activate\" functions.", eo_class_name_get(eo_class_get(obj))); + return EINA_TRUE; } -static void -_class_constructor(Eo_Class *klass) +EOLIAN static void +_elm_widget_class_constructor(Eo_Class *klass) { - const Eo_Op_Func_Description func_desc[] = { - EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), - EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), _dbg_info_get), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MEMBER_ADD), _elm_widget_smart_member_add), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MEMBER_DEL), _elm_widget_smart_member_del), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_widget_smart_add), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_widget_smart_del), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_widget_smart_resize), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_widget_smart_move), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_widget_smart_show), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_widget_smart_hide), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_COLOR_SET), _elm_widget_smart_color_set), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_SET), _elm_widget_smart_clip_set), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_UNSET), _elm_widget_smart_clip_unset), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_widget_smart_calculate), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_widget_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_widget_disable), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_widget_theme_func), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_widget_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_widget_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_widget_on_focus_region), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_widget_focus_next_manager_is_unimplemented), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_widget_focus_direction_manager_is_unimplemented), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_widget_sub_object_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_widget_sub_object_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_widget_access), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_widget_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _elm_widget_parent_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT2_SET), _elm_widget_parent2_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT2_GET), _elm_widget_parent2_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_widget_activate), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_MIRRORED_GET), _elm_widget_mirrored_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_MIRRORED_SET), _elm_widget_mirrored_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_MIRRORED_AUTOMATIC_GET), _elm_widget_mirrored_automatic_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_MIRRORED_AUTOMATIC_SET), _elm_widget_mirrored_automatic_set), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HIGHLIGHT_IGNORE_SET), _elm_widget_highlight_ignore_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HIGHLIGHT_IGNORE_GET), _elm_widget_highlight_ignore_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HIGHLIGHT_IN_THEME_SET), _elm_widget_highlight_in_theme_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HIGHLIGHT_IN_THEME_GET), _elm_widget_highlight_in_theme_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_HIGHLIGHT_IN_THEME_SET), _elm_widget_access_highlight_in_theme_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_HIGHLIGHT_IN_THEME_GET), _elm_widget_access_highlight_in_theme_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_HOLD_PUSH), _elm_widget_scroll_hold_push), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_HOLD_POP), _elm_widget_scroll_hold_pop), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_HOLD_GET), _elm_widget_scroll_hold_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_PUSH), _elm_widget_scroll_freeze_push), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_POP), _elm_widget_scroll_freeze_pop), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_GET), _elm_widget_scroll_freeze_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_SHOW_REGION_HOOK_SET), _elm_widget_on_show_region_hook_set), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_RESIZE_OBJECT_SET), _elm_widget_resize_object_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HOVER_OBJECT_SET), _elm_widget_hover_object_set), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CAN_FOCUS_SET), _elm_widget_can_focus_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CAN_FOCUS_GET), _elm_widget_can_focus_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CHILD_CAN_FOCUS_GET), _elm_widget_child_can_focus_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_GET), _elm_widget_focus_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_HIGHLIGHT_GET), _elm_widget_highlight_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_OBJECT_GET), _elm_widget_focused_object_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TOP_GET), _elm_widget_top_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_SET), _elm_widget_focus_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_OBJECT_CLEAR), _elm_widget_focused_object_clear), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_STEAL), _elm_widget_focus_steal), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_RESTORE), _elm_widget_focus_restore), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLED_SET), _elm_widget_disabled_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLED_GET), _elm_widget_disabled_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SHOW_REGION_SET), _elm_widget_show_region_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SHOW_REGION_GET), _elm_widget_show_region_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENTS_BOUNCE_GET), _elm_widget_parents_bounce_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCROLLABLE_CHILDREN_GET), _elm_widget_scrollable_children_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_SET), _elm_widget_scale_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_GET), _elm_widget_scale_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PART_TEXT_SET), _elm_widget_part_text_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PART_TEXT_GET), _elm_widget_part_text_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DOMAIN_TRANSLATABLE_PART_TEXT_SET), _elm_widget_domain_translatable_part_text_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATABLE_PART_TEXT_GET), _elm_widget_translatable_part_text_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DOMAIN_PART_TEXT_TRANSLATABLE_SET), _elm_widget_domain_part_text_translatable_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PART_TEXT_TRANSLATE), _elm_widget_part_text_translate), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_INFO_SET), _elm_widget_access_info_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_INFO_GET), _elm_widget_access_info_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_SET), _elm_widget_theme_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_GET), _elm_widget_theme_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_STYLE_SET), _elm_widget_style_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_STYLE_GET), _elm_widget_style_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TOOLTIP_ADD), _elm_widget_tooltip_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TOOLTIP_DEL), _elm_widget_tooltip_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CURSOR_ADD), _elm_widget_cursor_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CURSOR_DEL), _elm_widget_cursor_del), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_LOCK_X_SET), _elm_widget_drag_lock_x_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_LOCK_Y_SET), _elm_widget_drag_lock_y_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_LOCK_X_GET), _elm_widget_drag_lock_x_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_LOCK_Y_GET), _elm_widget_drag_lock_y_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_CHILD_LOCKED_X_GET), _elm_widget_drag_child_locked_x_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DRAG_CHILD_LOCKED_Y_GET), _elm_widget_drag_child_locked_y_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT_CALLBACK_ADD), _elm_widget_event_callback_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT_CALLBACK_DEL), _elm_widget_event_callback_del), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT_PROPAGATE), _elm_widget_event_propagate), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SIGNAL_EMIT), _elm_widget_signal_emit), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SIGNAL_CALLBACK_ADD), _elm_widget_signal_callback_add), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SIGNAL_CALLBACK_DEL), _elm_widget_signal_callback_del), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_NAME_FIND), _elm_widget_name_find), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIDE_HANDLE), _elm_widget_focus_hide_handle), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_MOUSE_UP_HANDLE), _elm_widget_focus_mouse_up_handle), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_TREE_UNFOCUSABLE_HANDLE), _elm_widget_focus_tree_unfocusable_handle), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DISABLED_HANDLE), _elm_widget_focus_disabled_handle), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_ORDER_GET), _elm_widget_focus_order_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_REGION_GET), _elm_widget_focus_region_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_REGION_SHOW), _elm_widget_focus_region_show), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_STYLE_SET), _elm_widget_focus_highlight_style_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET), _elm_widget_focus_highlight_style_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_OBJECT_SET), _elm_widget_theme_object_set), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ORIENTATION_SET), _elm_widget_orientation_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ORIENTATION_MODE_DISABLED_SET), _elm_widget_orientation_mode_disabled_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ORIENTATION_MODE_DISABLED_GET), _elm_widget_orientation_mode_disabled_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_SET), _elm_widget_focus_custom_chain_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_GET), _elm_widget_focus_custom_chain_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_UNSET), _elm_widget_focus_custom_chain_unset), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_APPEND), _elm_widget_focus_custom_chain_append), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_PREPEND), _elm_widget_focus_custom_chain_prepend), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_CYCLE), _elm_widget_focus_cycle), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_GO), _elm_widget_focus_direction_go), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_GET), _elm_widget_focus_direction_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_LIST_DIRECTION_GET), _elm_widget_focus_list_direction_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_GET), _elm_widget_focus_next_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_LIST_NEXT_GET), _elm_widget_focus_list_next_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_OBJECT_GET), _elm_widget_focus_next_object_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_OBJECT_SET), _elm_widget_focus_next_object_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_HIGHLIGHT_SET), _elm_widget_parent_highlight_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISPLAY_MODE_SET), _elm_widget_display_mode_set), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_SET), _elm_widget_tree_unfocusable_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_GET), _elm_widget_tree_unfocusable_get), - - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_CAN_FOCUS_CHILD_LIST_GET), _elm_widget_can_focus_child_list_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_NEWEST_FOCUS_ORDER_GET), _elm_widget_newest_focus_order_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET), _elm_widget_focus_highlight_geometry_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_ITEM_GET), _elm_widget_focused_item_get), - - EO_OP_FUNC_SENTINEL - }; - - eo_class_funcs_set(klass, func_desc); - evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -static const Eo_Op_Description op_desc[] = { - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ON_FOCUS, "'Virtual' function handling focus in/out events on the widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISABLE, "'Virtual' function on the widget being disabled."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME_APPLY, "'Virtual' function on the widget being re-themed."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TRANSLATE, "'Virtual' function handling language changes on Elementary."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT, "'Virtual' function handling input events on the widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION, "'Virtual' function returning an inner area of a widget that should be brought into the visible are of a broader viewport, may this context arise."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS, "'Virtual' function which checks if handling of passing focus to sub-objects is supported by widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_NEXT, "'Virtual' function handling passing focus to sub-objects."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS, "'Virtual' function which checks if handling of passing focus to sub-objects in given direction is supported by widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION,"'Virtual' function handling passing focus to sub-objects given a direction, in degrees."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD, "'Virtual' function handling sub objects being added."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL, "'Virtual' function handling sub objects being removed."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACCESS, "'Virtual' function on the widget being set access."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT_SET, "'Virtual' function handling parent widget attachment to new object."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT_GET, "'Virtual' function handling getting object's parent widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT2_SET, ""), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT2_GET, ""), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACTIVATE, "'Virtual' function to activate widget."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_MIRRORED_GET, "Returns the widget's mirrored mode."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_MIRRORED_SET, "Sets the widget's mirrored mode."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_MIRRORED_AUTOMATIC_GET, "Returns the widget's mirrored mode setting."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_MIRRORED_AUTOMATIC_SET, "Sets the widget's mirrored mode setting."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HIGHLIGHT_IGNORE_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HIGHLIGHT_IGNORE_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HIGHLIGHT_IN_THEME_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HIGHLIGHT_IN_THEME_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACCESS_HIGHLIGHT_IN_THEME_SET, "Set the access highlight in widget theme."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACCESS_HIGHLIGHT_IN_THEME_GET, "Get the access highlight in widget theme."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_HOLD_PUSH, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_HOLD_POP, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_HOLD_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_PUSH, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_POP, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLL_FREEZE_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ON_SHOW_REGION_HOOK_SET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_RESIZE_OBJECT_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HOVER_OBJECT_SET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CAN_FOCUS_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CAN_FOCUS_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CHILD_CAN_FOCUS_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_HIGHLIGHT_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUSED_OBJECT_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TOP_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT_WIDGET_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUSED_OBJECT_CLEAR, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_STEAL, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_RESTORE, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISABLED_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISABLED_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SHOW_REGION_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SHOW_REGION_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENTS_BOUNCE_GET, "Get the whether parents have a bounce."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCROLLABLE_CHILDREN_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCALE_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SCALE_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PART_TEXT_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PART_TEXT_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DOMAIN_TRANSLATABLE_PART_TEXT_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TRANSLATABLE_PART_TEXT_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DOMAIN_PART_TEXT_TRANSLATABLE_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PART_TEXT_TRANSLATE, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACCESS_INFO_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ACCESS_INFO_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_STYLE_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_STYLE_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TOOLTIP_ADD, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TOOLTIP_DEL, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CURSOR_ADD, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CURSOR_DEL, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_LOCK_X_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_LOCK_Y_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_LOCK_X_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_LOCK_Y_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_CHILD_LOCKED_X_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DRAG_CHILD_LOCKED_Y_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT_CALLBACK_ADD, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT_CALLBACK_DEL, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT_PROPAGATE, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SIGNAL_EMIT, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SIGNAL_CALLBACK_ADD, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_SIGNAL_CALLBACK_DEL, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_NAME_FIND, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_HIDE_HANDLE, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_MOUSE_UP_HANDLE, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_TREE_UNFOCUSABLE_HANDLE, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_DISABLED_HANDLE, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_ORDER_GET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_REGION_GET, "Get the focus region of the given widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_REGION_SHOW, "Show the focus region of the given widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_STYLE_SET, "Function to set the focus highlight style."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET, "Function to get the focus highlight style."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME_OBJECT_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ORIENTATION_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ORIENTATION_MODE_DISABLED_SET, "description here"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ORIENTATION_MODE_DISABLED_GET, "description here"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_SET, "Set custom focus chain."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_GET, "Get custom focus chain."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_UNSET, "Unset custom focus chain."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_APPEND, "Append object to custom focus chain."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CUSTOM_CHAIN_PREPEND, "Prepend object to custom focus chain."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_CYCLE, "Give focus to next object in object tree."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_GO, "Give focus to near object(in object tree) in one direction."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_GET, "Get near object in one direction of base object."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_LIST_DIRECTION_GET, "Get near object in one direction of base object in list."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_NEXT_GET, "Get next object in focus chain of object tree."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_LIST_NEXT_GET, "Get next object in focus chain of object tree in list."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_NEXT_OBJECT_GET, "Get next object specified by focus direction."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_NEXT_OBJECT_SET, "Set next object with specific focus direction."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_PARENT_HIGHLIGHT_SET, "Set highlighted value from itself to top parent object."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISPLAY_MODE_SET, "Sets the widget and child widget's Evas_Display_Mode."), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_SET, "Sets the widget object and its children to be unfocusable"), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TREE_UNFOCUSABLE_GET, "Returns true, if the object sub-tree is unfocusable"), - - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_CAN_FOCUS_CHILD_LIST_GET, "Get the list of focusable child objects."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_NEWEST_FOCUS_ORDER_GET, "Get the newest focused object and its order."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUS_HIGHLIGHT_GEOMETRY_GET, "Get the focus highlight geometry of widget."), - EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_FOCUSED_ITEM_GET, "Get the focused widget item."), - - EO_OP_DESCRIPTION_SENTINEL -}; - -static const Eo_Class_Description class_desc = { - EO_VERSION, - MY_CLASS_NAME, - EO_CLASS_TYPE_REGULAR_NO_INSTANT, - EO_CLASS_DESCRIPTION_OPS(&ELM_WIDGET_BASE_ID, op_desc, ELM_WIDGET_SUB_ID_LAST), - NULL, - sizeof(Elm_Widget_Smart_Data), - _class_constructor, - NULL -}; - -EO_DEFINE_CLASS(elm_widget_class_get, &class_desc, EVAS_OBJ_SMART_CLASS, NULL); +#include "elm_widget.eo.c" diff --git a/legacy/elementary/src/lib/elm_widget.eo b/legacy/elementary/src/lib/elm_widget.eo new file mode 100644 index 0000000000..8ae85f3cf0 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget.eo @@ -0,0 +1,820 @@ +abstract Elm_Widget (Evas_Smart) +{ + eo_prefix: elm_obj_widget; + data: Elm_Widget_Smart_Data; + properties { + focus { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool focus; + } + } + drag_lock_y { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool lock; + } + } + focus_highlight_style { + set { + /*@ This function set the widget focus highlight style. */ + return Eina_Bool; + } + get { + /*@ This function returns the widget focus highlight style. */ + } + values { + const char *style; + } + } + tree_unfocusable { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool tree_unfocusable; + } + } + mirrored { + set { + /*@ Sets the widget's mirrored mode. */ + } + get { + /*@ Returns the widget's mirrored mode. */ + } + values { + Eina_Bool mirrored; + } + } + theme { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Elm_Theme *th; + } + } + disabled { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool disabled; + } + } + highlight_ignore { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool ignore; + } + } + mirrored_automatic { + set { + /*@ Sets the widget's mirrored mode setting. */ + } + get { + /*@ Returns the widget's mirrored mode setting. */ + } + values { + Eina_Bool automatic; + } + } + orientation_mode_disabled { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool disabled; + } + } + style { + set { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + const char *style; + } + } + scale { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + double scale; + } + } + focus_custom_chain { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + objs: const; + } + values { + Eina_List *objs; + } + } + can_focus { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool can_focus; + } + } + highlight_in_theme { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool highlight; + } + } + parent { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Evas_Object *parent; + } + } + access_info { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + const char *txt; + } + } + drag_lock_x { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool lock; + } + } + access_highlight_in_theme { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool highlight; /*@ highlight */ + } + } + parent_highlight { + set { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool highlighted; + } + } + theme_object { + set { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + } + values { + Evas_Object *edj; + const char *wname; + const char *welement; + const char *wstyle; + } + } + hover_object { + set { + /*@ No description supplied by the EAPI. */ + } + values { + Evas_Object *sobj; + } + } + display_mode { + set { + /*@ No description supplied by the EAPI. */ + } + values { + Evas_Display_Mode dispmode; + } + } + on_show_region_hook { + set { + /*@ No description supplied by the EAPI. */ + } + values { + region_hook_func_type func; + void *data; + } + } + domain_part_text_translatable { + set { + /*@ No description supplied by the EAPI. */ + } + values { + const char *part; + const char *domain; + Eina_Bool translatable; + } + } + orientation { + set { + /*@ No description supplied by the EAPI. */ + } + values { + int rotation; + } + } + resize_object { + set { + /*@ No description supplied by the EAPI. */ + } + values { + Evas_Object *sobj; + Eina_Bool sub_obj; + } + } + domain_translatable_part_text { + set { + /*@ No description supplied by the EAPI. */ + } + values { + const char *part; + const char *domain; + const char *label; + } + } + scrollable_children { + get { + /*@ + Function to operate on a given widget's scrollabe children when necessary. + @warning free the returned list with eina_list_free(). */ + return Eina_List *; + } + } + scroll_hold { + get { + /*@ No description supplied by the EAPI. */ + return int; + } + } + drag_child_locked_y { + get { + /*@ No description supplied by the EAPI. */ + return int; + } + } + child_can_focus { + get { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + } + } + scroll_freeze { + get { + /*@ No description supplied by the EAPI. */ + return int; + } + } + focus_region { + get { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + } + values { + Evas_Coord x; + Evas_Coord y; + Evas_Coord w; + Evas_Coord h; + } + } + top { + get { + /*@ No description supplied by the EAPI. */ + return Evas_Object *; + } + } + focus_order { + get { + /*@ No description supplied by the EAPI. */ + return unsigned int; + } + } + drag_child_locked_x { + get { + /*@ No description supplied by the EAPI. */ + return int; + } + } + can_focus_child_list { + get { + /*@ No description supplied by the EAPI. */ + return Eina_List *; + } + } + focused_item { + get { + /*@ Get the focused widget item. */ + return Elm_Object_Item *; + } + } + parents_bounce { + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool horiz; + Eina_Bool vert; + } + } + parent_widget { + get { + /*@ No description supplied by the EAPI. */ + return Evas_Object *; + legacy null; + } + } + highlight { + get { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + } + } + focused_object { + get { + /*@ No description supplied by the EAPI. */ + return Evas_Object *; + } + } + parent2 { + set { + /*@ No description supplied by the EAPI. */ + } + get { + /*@ No description supplied by the EAPI. */ + } + values { + Evas_Object *parent; + } + } + } + methods { + newest_focus_order_get { + /*@ No description supplied by the EAPI. */ + const; + return Evas_Object *; + params { + @out unsigned int newest_focus_order; + @in Eina_Bool can_focus_only; + } + } + scroll_hold_push { + /*@ No description supplied by the EAPI. */ + } + cursor_add { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Cursor *cur; + } + } + focus_next_object_set { + /*@ No description supplied by the EAPI. */ + params { + @in Evas_Object *next; + @in Elm_Focus_Direction dir; + } + } + focus_next_object_get { + /*@ No description supplied by the EAPI. */ + const; + return Evas_Object *; + params { + @in Elm_Focus_Direction dir; + } + } + focus_tree_unfocusable_handle { + /*@ No description supplied by the EAPI. */ + } + focus_custom_chain_prepend { + /*@ No description supplied by the EAPI. */ + params { + @in Evas_Object *child; + @in Evas_Object *relative_child; + } + } + part_text_translate { + /*@ No description supplied by the EAPI. */ + return const char *; + params { + @in const char *part; + @in const char *text; + } + } + focus_highlight_geometry_get { + /*@ Get the focus highlight geometry of widget. */ + const; + params { + @in Evas_Coord *x; + @in Evas_Coord *y; + @in Evas_Coord *w; + @in Evas_Coord *h; + @in Eina_Bool is_next; + } + } + activate { + /*@ 'Virtual' function to activate widget. */ + params { + @in Elm_Activate act; + } + return Eina_Bool; + legacy null; /* the legacy API has not the same number of parameter to we don't generate it. */ + } + sub_object_add { + /*@ 'Virtual' function handling sub objects being added. */ + return Eina_Bool; + params { + @in Evas_Object *sobj; + } + } + focus_direction_manager_is { + /*@ 'Virtual' function which checks if handling of passing focus to sub-objects in given direction is supported by widget. */ + return Eina_Bool; + legacy null; + } + event { + /*@ 'Virtual' function handling input events on the widget. */ + params { + @in Evas_Object *source; + @in Evas_Callback_Type type; + @in void *event_info; + } + return Eina_Bool; + } + event_callback_add { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Event_Cb func; + @in const void *data; + } + } + access { + /*@ 'Virtual' function on the widget being set access. */ + params { + @in Eina_Bool access; + } + legacy null; + } + cursor_del { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Cursor *cur; + } + } + event_callback_del { + /*@ No description supplied by the EAPI. */ + return void *; + params { + @in Elm_Event_Cb func; + @in const void *data; + } + } + on_focus { + /*@ 'Virtual' function handling focus in/out events on the widget. + return EINA_TRUE if this widget can handle focus, EINA_FALSE otherwise */ + return Eina_Bool; + } + on_focus_region { + /*@ 'Virtual' function returning an inner area of a widget that should be brought into the visible area of a broader viewport, may this context arise. */ + params { + @out Evas_Coord x; + @out Evas_Coord y; + @out Evas_Coord w; + @out Evas_Coord h; + } + return Eina_Bool; + } + focus_cycle { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Focus_Direction dir; + } + } + focus_direction { + /*@ 'Virtual' function handling passing focus to sub-objects given a direction, in degrees. */ + params { + @in const Evas_Object *base; + @in double degree; + @out Evas_Object *direction; + @out double weight; + } + return Eina_Bool; + } + event_propagate { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + params { + @in Evas_Callback_Type type; + @in void *event_info; + @in Evas_Event_Flags *event_flags; + } + } + signal_callback_add { + /*@ No description supplied by the EAPI. */ + params { + @in const char *emission; + @in const char *source; + @in Edje_Signal_Cb func; + @in void *data; + } + } + focus_next_manager_is { + /*@ 'Virtual' function which checks if handling of passing focus to sub-objects is supported by widget. */ + return Eina_Bool; + } + name_find { + /*@ No description supplied by the EAPI. */ + const; + return Evas_Object *; + params { + @in const char *name; + @in int recurse; + } + } + focus_list_direction_get { + /*@ No description supplied by the EAPI. */ + const; + return Eina_Bool; + params { + @in const Evas_Object *base; + @in const Eina_List *items; + @in list_data_get_func_type list_data_get; + @in double degree; + @out Evas_Object *direction; + @out double weight; + } + } + focused_object_clear { + /*@ No description supplied by the EAPI. */ + } + focus_direction_go { + /*@ No description supplied by the EAPI. */ + return Eina_Bool; + params { + @in double degree; + } + } + show_region_set { + /*@ No description supplied by the EAPI. */ + params { + @in Evas_Coord x; + @in Evas_Coord y; + @in Evas_Coord w; + @in Evas_Coord h; + @in Eina_Bool forceshow; + } + } + show_region_get { + /*@ No description supplied by the EAPI. */ + const; + params { + @out Evas_Coord x; + @out Evas_Coord y; + @out Evas_Coord w; + @out Evas_Coord h; + } + } + scroll_freeze_pop { + /*@ No description supplied by the EAPI. */ + } + tooltip_del { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Tooltip *tt; + } + } + focus_next_get { + /*@ No description supplied by the EAPI. */ + const; + return Eina_Bool; + params { + @in Elm_Focus_Direction dir; + @out Evas_Object *next; + } + } + translatable_part_text_get { + /*@ No description supplied by the EAPI. */ + const; + return const char *; + params { + @in const char *part; + } + } + focus_restore { + /*@ + @internal + + Restore the focus state of the sub-tree. + + This API will restore the focus state of the sub-tree to the latest + state. If a sub-tree is unfocused and wants to get back to the latest + focus state, this API will be helpful. + + @ingroup Widget */ + + } + scroll_hold_pop { + /*@ No description supplied by the EAPI. */ + } + translate { + /*@ 'Virtual' function handling language changes on Elementary. */ + return Eina_Bool; + legacy null; + } + scroll_freeze_push { + /*@ No description supplied by the EAPI. */ + } + focus_custom_chain_unset { + /*@ No description supplied by the EAPI. */ + } + focus_steal { + /*@ No description supplied by the EAPI. */ + } + focus_hide_handle { + /*@ No description supplied by the EAPI. */ + } + focus_next { + /*@ 'Virtual' function handling passing focus to sub-objects. */ + params { + @in Elm_Focus_Direction dir; + @out Evas_Object *next; + } + return Eina_Bool; + } + focus_list_next_get { + /*@ No description supplied by the EAPI. */ + const; + return Eina_Bool; + params { + @in const Eina_List *items; + @in list_data_get_func_type list_data_get; + @in Elm_Focus_Direction dir; + @out Evas_Object *next; + } + } + focus_mouse_up_handle { + /*@ No description supplied by the EAPI. */ + legacy null; + } + part_text_set { + /*@ No description supplied by the EAPI. */ + params { + @in const char *part; + @in const char *label; + } + } + part_text_get { + /*@ No description supplied by the EAPI. */ + const; + return const char *; + params { + @in const char *part; + } + } + theme_apply { + /*@ 'Virtual' function on the widget being re-themed. */ + return Eina_Bool; + } + focus_direction_get { + /*@ No description supplied by the EAPI. */ + const; + return Eina_Bool; + params { + @in const Evas_Object *base; + @in double degree; + @out Evas_Object *direction; + @out double weight; + } + } + signal_callback_del { + /*@ No description supplied by the EAPI. */ + return void *; + params { + @in const char *emission; + @in const char *source; + @in Edje_Signal_Cb func; + } + } + signal_emit { + /*@ No description supplied by the EAPI. */ + params { + @in const char *emission; + @in const char *source; + } + } + disable { + /*@ 'Virtual' function on the widget being disabled. */ + return Eina_Bool; + } + sub_object_del { + /*@ 'Virtual' function handling sub objects being removed. */ + return Eina_Bool; + params { + @in Evas_Object *sobj; + } + } + tooltip_add { + /*@ No description supplied by the EAPI. */ + params { + @in Elm_Tooltip *tt; + } + } + focus_region_show { + /*@ No description supplied by the EAPI. */ + const; + } + focus_disabled_handle { + /*@ No description supplied by the EAPI. */ + } + focus_custom_chain_append { + /*@ No description supplied by the EAPI. */ + params { + @in Evas_Object *child; + @in Evas_Object *relative_child; + } + } + } + implements { + class::constructor; + Eo_Base::constructor; + Eo_Base::dbg_info_get; + Evas_Smart::hide; + Evas_Smart::calculate; + Evas_Smart::clip_unset; + Evas_Smart::show; + Evas_Smart::color::set; + Evas_Smart::move; + Evas_Smart::member_del; + Evas_Smart::add; + Evas_Smart::del; + Evas_Smart::clip::set; + Evas_Smart::member_add; + Evas_Smart::resize; + virtual::focus_direction; + virtual::focus_next; + virtual::parent_widget::get; + } + +} diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index f95f514bb1..9706cfdaf4 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -698,7 +698,7 @@ EAPI void elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, EAPI void elm_widget_show_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI Eina_Bool elm_widget_focus_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void elm_widget_focus_region_show(const Evas_Object *obj); -EAPI void elm_widget_parents_bounce_get(Evas_Object *obj, Eina_Bool *horiz, Eina_Bool *vert); +EAPI void elm_widget_parents_bounce_get(const Evas_Object *obj, Eina_Bool *horiz, Eina_Bool *vert); EAPI void elm_widget_scroll_hold_push(Evas_Object *obj); EAPI void elm_widget_scroll_hold_pop(Evas_Object *obj); EAPI int elm_widget_scroll_hold_get(const Evas_Object *obj); @@ -823,7 +823,7 @@ void _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_ * Function to operate on a given widget's scrollabe children when necessary. * @warning free the returned list with eina_list_free(). */ -EAPI Eina_List *elm_widget_scrollable_children_get(Evas_Object *obj); +EAPI Eina_List *elm_widget_scrollable_children_get(const Evas_Object *obj); /* debug function. don't use it unless you are tracking parenting issues */ EAPI void elm_widget_tree_dump(const Evas_Object *top); @@ -1174,6 +1174,12 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out EAPI Eina_Bool elm_selection_selection_has_owner(Evas_Object *obj); +#include "elm_widget.eo.h" + +typedef void (*region_hook_func_type)(void *data, Evas_Object *obj); +typedef void * (*list_data_get_func_type)(const Eina_List * l); + +#if 0 #define ELM_OBJ_WIDGET_CLASS elm_widget_class_get() const Eo_Class *elm_widget_class_get(void) EINA_CONST; @@ -1336,8 +1342,6 @@ enum ELM_WIDGET_SUB_ID_LAST }; -typedef void (*region_hook_func_type)(void *data, Evas_Object *obj); -typedef void * (*list_data_get_func_type)(const Eina_List * l); #define ELM_WIDGET_ID(sub_id) (ELM_WIDGET_BASE_ID + sub_id) @@ -2748,3 +2752,4 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); */ #define elm_wdg_focused_item_get(ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUSED_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret) #endif +#endif diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 2171f476c5..78a5b9079f 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -1189,7 +1189,7 @@ _elm_win_smart_on_focus(Eo *obj, void *_pd, va_list *list) Elm_Win_Smart_Data *sd = _pd; Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); if (!int_ret) return; if (sd->img_obj) @@ -5584,7 +5584,7 @@ _elm_win_smart_theme(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED) if (ret) *ret = EINA_TRUE; - eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); if (!int_ret) return; sd->focus_highlight.theme_changed = EINA_TRUE; @@ -5906,13 +5906,13 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_win_smart_show), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_win_smart_hide), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_win_smart_on_focus), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_win_smart_event), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_win_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_win_smart_focus_next), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_win_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_win_smart_focus_direction), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_win_smart_theme), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ON_FOCUS), _elm_win_smart_on_focus), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_win_smart_event), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_win_smart_focus_next_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT), _elm_win_smart_focus_next), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_win_smart_focus_direction_manager_is), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_win_smart_focus_direction), + EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_win_smart_theme), EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR), _win_constructor), EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD), _resize_object_add),