From 2626d61185b3157378004de8dae6dcd6f06115bc Mon Sep 17 00:00:00 2001 From: Yakov Goldberg Date: Tue, 21 Jan 2014 10:44:45 +0200 Subject: [PATCH] all widgets: change Eo API for "elm_widget_theme()" to "theme_apply" There are elm_widget_theme/theme_set/theme_get functions. In Eolian these functions will be described as "theme" method and "theme" property. There is clash here. So add suffix "_apply" to Eo API for "elm_widget_theme". --- src/lib/elc_ctxpopup.c | 4 ++-- src/lib/elc_fileselector.c | 12 ++++++------ src/lib/elc_fileselector_button.c | 6 +++--- src/lib/elc_fileselector_entry.c | 4 ++-- src/lib/elc_hoversel.c | 8 ++++---- src/lib/elc_multibuttonentry.c | 4 ++-- src/lib/elc_naviframe.c | 2 +- src/lib/elc_player.c | 4 ++-- src/lib/elc_popup.c | 4 ++-- src/lib/elm_actionslider.c | 4 ++-- src/lib/elm_box.c | 4 ++-- src/lib/elm_bubble.c | 2 +- src/lib/elm_button.c | 4 ++-- src/lib/elm_calendar.c | 4 ++-- src/lib/elm_check.c | 4 ++-- src/lib/elm_clock.c | 4 ++-- src/lib/elm_colorselector.c | 4 ++-- src/lib/elm_conform.c | 4 ++-- src/lib/elm_datetime.c | 4 ++-- src/lib/elm_dayselector.c | 4 ++-- src/lib/elm_diskselector.c | 6 +++--- src/lib/elm_entry.c | 18 +++++++++--------- src/lib/elm_flip.c | 4 ++-- src/lib/elm_flipselector.c | 6 +++--- src/lib/elm_gengrid.c | 4 ++-- src/lib/elm_genlist.c | 4 ++-- src/lib/elm_grid.c | 6 +++--- src/lib/elm_hover.c | 4 ++-- src/lib/elm_icon.c | 4 ++-- src/lib/elm_image.c | 4 ++-- src/lib/elm_index.c | 6 +++--- src/lib/elm_label.c | 4 ++-- src/lib/elm_layout.c | 4 ++-- src/lib/elm_list.c | 4 ++-- src/lib/elm_map.c | 4 ++-- src/lib/elm_mapbuf.c | 4 ++-- src/lib/elm_menu.c | 6 +++--- src/lib/elm_notify.c | 4 ++-- src/lib/elm_panel.c | 6 +++--- src/lib/elm_panes.c | 6 +++--- src/lib/elm_photo.c | 4 ++-- src/lib/elm_photocam.c | 4 ++-- src/lib/elm_plug.c | 4 ++-- src/lib/elm_progressbar.c | 8 ++++---- src/lib/elm_radio.c | 4 ++-- src/lib/elm_route.c | 4 ++-- src/lib/elm_scroller.c | 6 +++--- src/lib/elm_segment_control.c | 4 ++-- src/lib/elm_separator.c | 6 +++--- src/lib/elm_slider.c | 6 +++--- src/lib/elm_spinner.c | 2 +- src/lib/elm_table.c | 6 +++--- src/lib/elm_toolbar.c | 8 ++++---- src/lib/elm_web.c | 6 +++--- src/lib/elm_widget.c | 8 ++++---- src/lib/elm_widget.h | 6 +++--- src/lib/elm_win.c | 4 ++-- 57 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index afb81df7b..4900765aa 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -736,7 +736,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; elm_widget_theme_object_set @@ -1493,7 +1493,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_ctxpopup_smart_theme), + 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), diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index 82d036559..8e37a822f 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -90,7 +90,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; style = elm_widget_style_get(obj); @@ -1404,7 +1404,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -1578,7 +1578,7 @@ _buttons_ok_cancel_set(Eo *obj, void *_pd, va_list *list) sd->ok_button = bt; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } else if (!visible) { @@ -1973,7 +1973,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); int_ret = EINA_TRUE; @@ -2028,7 +2028,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); int_ret = EINA_TRUE; end: @@ -2280,7 +2280,7 @@ _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), _elm_fileselector_smart_theme), + 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_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), diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index d7cbd3e29..859165c8e 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -56,7 +56,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; eina_stringshare_replace(&(wd->style), style); @@ -191,7 +191,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); elm_widget_can_focus_set(obj, EINA_TRUE); } @@ -505,7 +505,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), _elm_fileselector_button_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_button_smart_theme), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_fileselector_button_smart_translate), 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/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index a5f88e0d9..89c1ce3a8 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -187,7 +187,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; style = elm_widget_style_get(obj); @@ -722,7 +722,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_fileselector_entry_smart_theme), + 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_TRANSLATE), _elm_fileselector_entry_smart_translate), 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), diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index 405ea42b2..a472122bf 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -61,7 +61,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; eina_stringshare_replace(&(wd->style), style); @@ -261,7 +261,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -389,7 +389,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) sd->horizontal = !!horizontal; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -690,7 +690,7 @@ _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), _elm_hoversel_smart_theme), + 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), diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index d33788998..62dc1d127 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -76,7 +76,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->items, l, item) @@ -2178,7 +2178,7 @@ _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), _elm_multibuttonentry_smart_theme), + 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), diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 3599357bc..cd236181b 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -2127,7 +2127,7 @@ _class_constructor(Eo_Class *klass) 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_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_naviframe_smart_theme), + 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), diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c index 3b2fbfedc..0d39dfa49 100644 --- a/src/lib/elc_player.c +++ b/src/lib/elc_player.c @@ -168,7 +168,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _update_theme_button(obj, sd->forward, "forward"); _update_theme_button(obj, sd->info, "info"); @@ -724,7 +724,7 @@ _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), _elm_player_smart_theme), + 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_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_player_smart_content_set), diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index ebc282937..f9806aeae 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -325,7 +325,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -1949,7 +1949,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_popup_smart_theme), + 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), diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index 1b3454724..7426417ca 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -116,7 +116,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (elm_object_mirrored_get(obj) != mirrored) @@ -702,7 +702,7 @@ _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), _elm_actionslider_smart_theme), + 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), diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c index 555d8e0b8..dbf6b85e7 100644 --- a/src/lib/elm_box.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -921,7 +921,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_box_smart_theme), + 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), diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c index eec3948b4..ffee3acb6 100644 --- a/src/lib/elm_bubble.c +++ b/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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Elm_Bubble_Pos diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index ca0ffe445..df235793b 100644 --- a/src/lib/elm_button.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _icon_signal_emit(obj); @@ -510,7 +510,7 @@ _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), _elm_button_smart_theme), + 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), diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index c387cd01a..6724b5ffe 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -552,7 +552,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; evas_object_smart_changed(obj); @@ -1659,7 +1659,7 @@ _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), _elm_calendar_smart_theme), + 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), diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index c5b752b60..9bc9ac928 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -183,7 +183,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (!sd->state) elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); @@ -452,7 +452,7 @@ _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), _elm_check_smart_theme), + 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), diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c index 61c1e2bc0..d7d6900c7 100644 --- a/src/lib/elm_clock.c +++ b/src/lib/elm_clock.c @@ -577,7 +577,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _time_update(obj); @@ -1137,7 +1137,7 @@ _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), _elm_clock_smart_theme), + 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), diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index 968a5423c..4c3431fda 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1078,7 +1078,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (!sd->col_bars_area) return; @@ -2196,7 +2196,7 @@ _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), _elm_colorselector_smart_theme), + 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), diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 18552405c..317d3c458 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -599,7 +599,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _conformant_parts_swallow(obj); @@ -1012,7 +1012,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_conformant_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_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/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index 008b687a6..414516fe7 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -530,7 +530,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if ((!dt_mod) || (!dt_mod->field_value_display)) @@ -1255,7 +1255,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_datetime_smart_theme), + 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), diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 97e6ed967..051317d83 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; EINA_LIST_FOREACH(sd->items, l, it) @@ -733,7 +733,7 @@ _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), _elm_dayselector_smart_theme), + 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), diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index f74e34fe3..b25908366 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -805,7 +805,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; evas = evas_object_evas_get(obj); @@ -1306,7 +1306,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(NULL), + elm_wdg_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), @@ -1992,7 +1992,7 @@ _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), _elm_diskselector_smart_theme), + 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), diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index af3aeddaa..29991b9e6 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -554,7 +554,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; evas_event_freeze(evas_object_evas_get(obj)); @@ -3537,7 +3537,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI void @@ -3554,7 +3554,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI const char * @@ -3595,7 +3595,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); if (sd->scroll) { @@ -3668,7 +3668,7 @@ _password_set(Eo *obj, void *_pd, va_list *list) _entry_selection_callbacks_register(obj); } - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -3913,7 +3913,7 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list) if (sd->line_wrap == wrap) return; sd->last_w = -1; sd->line_wrap = wrap; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Elm_Wrap_Type @@ -3950,7 +3950,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list) if (sd->editable == editable) return; sd->editable = editable; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); if (editable) elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, @@ -5109,7 +5109,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -5856,7 +5856,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_entry_smart_theme), + 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_TRANSLATE), _elm_entry_smart_translate), 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), diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c index 52afbf8ae..45eb2b087 100644 --- a/src/lib/elm_flip.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -2220,7 +2220,7 @@ _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), _elm_flip_smart_theme), + 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), diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index 0a204b5ed..fead756d5 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -369,7 +369,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; max_len = edje_object_data_get(wd->resize_obj, "max_len"); @@ -572,7 +572,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -993,7 +993,7 @@ _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), _elm_flipselector_smart_theme), + 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), diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 491a9b610..e2a242983 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -2005,7 +2005,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -4080,7 +4080,7 @@ _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), _elm_gengrid_smart_theme), + 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), diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index b6d0be36d..baaa95dfa 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -2780,7 +2780,7 @@ _elm_genlist_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Genlist_Smart_Data *sd = _pd; - eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; evas_event_freeze(evas_object_evas_get(obj)); @@ -7600,7 +7600,7 @@ _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), _elm_genlist_smart_theme), + 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_TRANSLATE), _elm_genlist_smart_translate), 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), diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c index 4d9663ffd..fbf9fa436 100644 --- a/src/lib/elm_grid.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -358,7 +358,7 @@ _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), _elm_grid_smart_theme), + 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), diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c index b4ad12f22..48a95a176 100644 --- a/src/lib/elm_hover.c +++ b/src/lib/elm_hover.c @@ -291,7 +291,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); @@ -863,7 +863,7 @@ _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), _elm_hover_smart_theme), + 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), diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c index 356e6cc55..3f6929eb3 100644 --- a/src/lib/elm_icon.c +++ b/src/lib/elm_icon.c @@ -449,7 +449,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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), _elm_icon_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_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/src/lib/elm_image.c b/src/lib/elm_image.c index 8b710ec00..3a3c4ebb0 100644 --- a/src/lib/elm_image.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; eo_do(obj, elm_obj_image_sizing_eval()); @@ -1729,7 +1729,7 @@ _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), _elm_image_smart_theme), + 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_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_ASPECT_FIXED_SET), _elm_image_smart_aspect_fixed_set), diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index d3fd8ef3c..14a32f389 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -344,7 +344,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; elm_coords_finger_size_adjust(1, &minw, 1, &minh); @@ -1642,7 +1642,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) if (horizontal == sd->horizontal) return; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -1749,7 +1749,7 @@ _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), _elm_index_smart_theme), + 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), diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c index 4b9698f81..4dcdb6cd8 100644 --- a/src/lib/elm_label.c +++ b/src/lib/elm_label.c @@ -167,7 +167,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) goto end; _label_format_set(wd->resize_obj, sd->format); @@ -733,7 +733,7 @@ _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), _elm_label_smart_theme), + 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_TRANSLATE), _elm_label_smart_translate), 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), diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c index 172be2865..1b1dcd496 100644 --- a/src/lib/elm_layout.c +++ b/src/lib/elm_layout.c @@ -370,7 +370,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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 */ @@ -2262,7 +2262,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_layout_smart_theme), + 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_TRANSLATE), _elm_layout_smart_translate), 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), diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index b06386778..4772233a8 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -877,7 +877,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -2800,7 +2800,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_list_smart_theme), + 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), diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index a7414bf05..690e1448a 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -3849,7 +3849,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -5994,7 +5994,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_map_smart_theme), + 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_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_map_smart_translate), diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c index 375b07b3e..bbb88e4b6 100644 --- a/src/lib/elm_mapbuf.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -582,7 +582,7 @@ _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), _elm_mapbuf_smart_theme), + 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_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_mapbuf_smart_content_set), diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c index 3ddec07f4..d0ea733ee 100644 --- a/src/lib/elm_menu.c +++ b/src/lib/elm_menu.c @@ -202,7 +202,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list) Elm_Menu_Item *item; const char *s; - eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; ll = eina_list_append(ll, sd->items); @@ -688,7 +688,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar) } } - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Evas_Object * @@ -1310,7 +1310,7 @@ _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), _elm_menu_smart_theme), + 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), diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c index e96e62440..86c6b5ebc 100644 --- a/src/lib/elm_notify.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -811,7 +811,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_notify_smart_theme), + 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), diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index af9672b99..0600d0347 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -134,7 +134,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -361,7 +361,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(NULL)); + eo_do(obj, elm_wdg_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); @@ -557,7 +557,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_panel_smart_theme), + 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), diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c index a6cbb33b3..36f61ba01 100644 --- a/src/lib/elm_panes.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); elm_panes_content_left_size_set(obj, 0.5); } @@ -483,7 +483,7 @@ _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), _elm_panes_smart_theme), + 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), diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c index 8c436781a..b340bd111 100644 --- a/src/lib/elm_photo.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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), _elm_photo_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_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/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index aece313a6..ce192f3f6 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -911,7 +911,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -2319,7 +2319,7 @@ _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), _elm_photocam_smart_theme), + 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), diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c index 0937924b9..38bc0e3a1 100644 --- a/src/lib/elm_plug.c +++ b/src/lib/elm_plug.c @@ -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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _sizing_eval(obj); @@ -221,7 +221,7 @@ _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), _elm_plug_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_plug_smart_theme), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_plug_smart_on_focus), diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c index 62145decb..3bb6f7709 100644 --- a/src/lib/elm_progressbar.c +++ b/src/lib/elm_progressbar.c @@ -184,7 +184,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (sd->pulse) @@ -369,7 +369,7 @@ _pulse_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) sd->pulse = pulse; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -670,7 +670,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list) if (sd->horizontal == horizontal) return; sd->horizontal = horizontal; - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -760,7 +760,7 @@ _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), _elm_progressbar_smart_theme), + 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), diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index d7247de81..8f6620daa 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -186,7 +186,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); @@ -549,7 +549,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_radio_smart_theme), + 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), diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c index 00767a799..3e8a58198 100644 --- a/src/lib/elm_route.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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), _elm_route_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_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/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index d72c3bbc5..0391bfff2 100644 --- a/src/lib/elm_scroller.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI void @@ -1264,7 +1264,7 @@ _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), _elm_scroller_smart_theme), + 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), diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 820797656..0f6c0a904 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -219,7 +219,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; rtl = elm_widget_mirrored_get(obj); @@ -953,7 +953,7 @@ _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), _elm_segment_control_smart_theme), + 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), diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c index 8c550764c..5298f1f61 100644 --- a/src/lib/elm_separator.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -140,7 +140,7 @@ _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), _elm_separator_smart_theme), + 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), diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 947155bd3..4d567517b 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -518,7 +518,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; if (sd->popup) @@ -1098,7 +1098,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI Eina_Bool @@ -1464,7 +1464,7 @@ _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), _elm_slider_smart_theme), + 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), diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 664060ca2..be5121e97 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -1278,7 +1278,7 @@ _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), _elm_spinner_smart_theme), + 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_TRANSLATE), _elm_spinner_smart_translate), 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), diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c index 877f8d294..d18e15dd5 100644 --- a/src/lib/elm_table.c +++ b/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(&super_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&super_ret)); if (super_ret == EINA_FALSE) return; @@ -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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -512,7 +512,7 @@ _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), _elm_table_smart_theme), + 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), diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index ac22055b8..4ca9a3786 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -1158,7 +1158,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; elm_widget_theme_object_set @@ -2020,7 +2020,7 @@ _item_del_pre_hook(Elm_Object_Item *it) _item_del(item); if (item != sd->more_item) - eo_do(obj, elm_wdg_theme(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); return EINA_TRUE; } @@ -2760,7 +2760,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } EAPI int @@ -3969,7 +3969,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_toolbar_smart_theme), + 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), diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c index 24059eaad..53087b028 100644 --- a/src/lib/elm_web.c +++ b/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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; theme = elm_object_theme_get(obj); @@ -1191,7 +1191,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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); elm_widget_can_focus_set(obj, EINA_TRUE); #else @@ -2924,7 +2924,7 @@ _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), _elm_web_smart_theme), + 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), diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 49adf97c9..086361887 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -756,7 +756,7 @@ elm_widget_theme(Evas_Object *obj) elm_cursor_theme(cur); Eina_Bool ret2; - eo_do(obj, elm_wdg_theme(&ret2)); + eo_do(obj, elm_wdg_theme_apply(&ret2)); ret &= ret2; return ret; @@ -801,7 +801,7 @@ 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(NULL)); + eo_do(obj, elm_wdg_theme_apply(NULL)); } static void @@ -6318,7 +6318,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_widget_theme_func), + 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), @@ -6461,7 +6461,7 @@ _class_constructor(Eo_Class *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, "'Virtual' function on the widget being re-themed."), + 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."), diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index ded37bc6c..6ca272b81 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -1109,7 +1109,7 @@ enum { ELM_WIDGET_SUB_ID_ON_FOCUS, ELM_WIDGET_SUB_ID_DISABLE, - ELM_WIDGET_SUB_ID_THEME, + ELM_WIDGET_SUB_ID_THEME_APPLY, ELM_WIDGET_SUB_ID_TRANSLATE, ELM_WIDGET_SUB_ID_EVENT, ELM_WIDGET_SUB_ID_ON_FOCUS_REGION, @@ -1247,7 +1247,7 @@ enum ELM_WIDGET_SUB_ID_CAN_FOCUS_CHILD_LIST_GET, ELM_WIDGET_SUB_ID_NEWEST_FOCUS_ORDER_GET, #if 0 - ELM_WIDGET_SUB_ID_THEME, /* API + virtual*/ + ELM_WIDGET_SUB_ID_THEME_APPLY, /* API + virtual*/ ELM_WIDGET_SUB_ID_THEME_SPECIFIC, ELM_WIDGET_SUB_ID_TRANSLATE, /* API + virtual*/ #endif @@ -1293,7 +1293,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); * @param[out] ret * */ -#define elm_wdg_theme(ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), EO_TYPECHECK(Eina_Bool *, ret) +#define elm_wdg_theme_apply(ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), EO_TYPECHECK(Eina_Bool *, ret) /** * @def elm_wdg_translate diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 072cee918..19d64904f 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -5269,7 +5269,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(&int_ret)); + eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret)); if (!int_ret) return; sd->focus_highlight.theme_changed = EINA_TRUE; @@ -5586,7 +5586,7 @@ _class_constructor(Eo_Class *klass) 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), _elm_win_smart_theme), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_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), -- 2.34.1