summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-01-21 10:44:45 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-01-21 11:08:29 +0200
commit2626d61185b3157378004de8dae6dcd6f06115bc (patch)
tree356c35f1d67798d42846315be630fc04ae1e01ec
parent8a6b898bca8b90ff64452b786a7c31ae1b2f8b81 (diff)
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".
-rw-r--r--src/lib/elc_ctxpopup.c4
-rw-r--r--src/lib/elc_fileselector.c12
-rw-r--r--src/lib/elc_fileselector_button.c6
-rw-r--r--src/lib/elc_fileselector_entry.c4
-rw-r--r--src/lib/elc_hoversel.c8
-rw-r--r--src/lib/elc_multibuttonentry.c4
-rw-r--r--src/lib/elc_naviframe.c2
-rw-r--r--src/lib/elc_player.c4
-rw-r--r--src/lib/elc_popup.c4
-rw-r--r--src/lib/elm_actionslider.c4
-rw-r--r--src/lib/elm_box.c4
-rw-r--r--src/lib/elm_bubble.c2
-rw-r--r--src/lib/elm_button.c4
-rw-r--r--src/lib/elm_calendar.c4
-rw-r--r--src/lib/elm_check.c4
-rw-r--r--src/lib/elm_clock.c4
-rw-r--r--src/lib/elm_colorselector.c4
-rw-r--r--src/lib/elm_conform.c4
-rw-r--r--src/lib/elm_datetime.c4
-rw-r--r--src/lib/elm_dayselector.c4
-rw-r--r--src/lib/elm_diskselector.c6
-rw-r--r--src/lib/elm_entry.c18
-rw-r--r--src/lib/elm_flip.c4
-rw-r--r--src/lib/elm_flipselector.c6
-rw-r--r--src/lib/elm_gengrid.c4
-rw-r--r--src/lib/elm_genlist.c4
-rw-r--r--src/lib/elm_grid.c6
-rw-r--r--src/lib/elm_hover.c4
-rw-r--r--src/lib/elm_icon.c4
-rw-r--r--src/lib/elm_image.c4
-rw-r--r--src/lib/elm_index.c6
-rw-r--r--src/lib/elm_label.c4
-rw-r--r--src/lib/elm_layout.c4
-rw-r--r--src/lib/elm_list.c4
-rw-r--r--src/lib/elm_map.c4
-rw-r--r--src/lib/elm_mapbuf.c4
-rw-r--r--src/lib/elm_menu.c6
-rw-r--r--src/lib/elm_notify.c4
-rw-r--r--src/lib/elm_panel.c6
-rw-r--r--src/lib/elm_panes.c6
-rw-r--r--src/lib/elm_photo.c4
-rw-r--r--src/lib/elm_photocam.c4
-rw-r--r--src/lib/elm_plug.c4
-rw-r--r--src/lib/elm_progressbar.c8
-rw-r--r--src/lib/elm_radio.c4
-rw-r--r--src/lib/elm_route.c4
-rw-r--r--src/lib/elm_scroller.c6
-rw-r--r--src/lib/elm_segment_control.c4
-rw-r--r--src/lib/elm_separator.c6
-rw-r--r--src/lib/elm_slider.c6
-rw-r--r--src/lib/elm_spinner.c2
-rw-r--r--src/lib/elm_table.c6
-rw-r--r--src/lib/elm_toolbar.c8
-rw-r--r--src/lib/elm_web.c6
-rw-r--r--src/lib/elm_widget.c8
-rw-r--r--src/lib/elm_widget.h6
-rw-r--r--src/lib/elm_win.c4
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)
736 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 736 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
737 if (ret) *ret = EINA_FALSE; 737 if (ret) *ret = EINA_FALSE;
738 738
739 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 739 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
740 if (!int_ret) return; 740 if (!int_ret) return;
741 741
742 elm_widget_theme_object_set 742 elm_widget_theme_object_set
@@ -1493,7 +1493,7 @@ _class_constructor(Eo_Class *klass)
1493 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_ctxpopup_smart_parent_set), 1493 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_ctxpopup_smart_parent_set),
1494 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_ctxpopup_smart_disable), 1494 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_ctxpopup_smart_disable),
1495 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_ctxpopup_smart_event), 1495 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_ctxpopup_smart_event),
1496 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_ctxpopup_smart_theme), 1496 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_ctxpopup_smart_theme),
1497 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_ctxpopup_smart_sub_object_add), 1497 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_ctxpopup_smart_sub_object_add),
1498 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_ctxpopup_smart_focus_next_manager_is), 1498 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_ctxpopup_smart_focus_next_manager_is),
1499 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_ctxpopup_smart_focus_next), 1499 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)
90 if (ret) *ret = EINA_FALSE; 90 if (ret) *ret = EINA_FALSE;
91 Eina_Bool int_ret; 91 Eina_Bool int_ret;
92 92
93 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 93 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
94 if (!int_ret) return; 94 if (!int_ret) return;
95 95
96 style = elm_widget_style_get(obj); 96 style = elm_widget_style_get(obj);
@@ -1404,7 +1404,7 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1404 HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted); 1404 HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted);
1405#undef HANDLER_ADD 1405#undef HANDLER_ADD
1406 1406
1407 eo_do(obj, elm_wdg_theme(NULL)); 1407 eo_do(obj, elm_wdg_theme_apply(NULL));
1408} 1408}
1409 1409
1410static void 1410static void
@@ -1578,7 +1578,7 @@ _buttons_ok_cancel_set(Eo *obj, void *_pd, va_list *list)
1578 1578
1579 sd->ok_button = bt; 1579 sd->ok_button = bt;
1580 1580
1581 eo_do(obj, elm_wdg_theme(NULL)); 1581 eo_do(obj, elm_wdg_theme_apply(NULL));
1582 } 1582 }
1583 else if (!visible) 1583 else if (!visible)
1584 { 1584 {
@@ -1973,7 +1973,7 @@ _mime_types_filter_append(Eo *obj, void *_pd, va_list *list)
1973 _populate(obj, sd->path, NULL, NULL); 1973 _populate(obj, sd->path, NULL, NULL);
1974 1974
1975 if (need_theme) 1975 if (need_theme)
1976 eo_do(obj, elm_wdg_theme(NULL)); 1976 eo_do(obj, elm_wdg_theme_apply(NULL));
1977 1977
1978 int_ret = EINA_TRUE; 1978 int_ret = EINA_TRUE;
1979 1979
@@ -2028,7 +2028,7 @@ _custom_filter_append(Eo *obj, void *_pd, va_list *list)
2028 _populate(obj, sd->path, NULL, NULL); 2028 _populate(obj, sd->path, NULL, NULL);
2029 2029
2030 if (need_theme) 2030 if (need_theme)
2031 eo_do(obj, elm_wdg_theme(NULL)); 2031 eo_do(obj, elm_wdg_theme_apply(NULL));
2032 2032
2033 int_ret = EINA_TRUE; 2033 int_ret = EINA_TRUE;
2034end: 2034end:
@@ -2280,7 +2280,7 @@ _class_constructor(Eo_Class *klass)
2280 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_smart_add), 2280 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_smart_add),
2281 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_smart_del), 2281 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_smart_del),
2282 2282
2283 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_fileselector_smart_theme), 2283 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_smart_theme),
2284 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_smart_focus_next_manager_is), 2284 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_smart_focus_next_manager_is),
2285 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_smart_focus_direction_manager_is), 2285 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_fileselector_smart_focus_direction_manager_is),
2286 2286
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
56 /* file selector button's style has an extra bit */ 56 /* file selector button's style has an extra bit */
57 eina_stringshare_replace(&(wd->style), buf); 57 eina_stringshare_replace(&(wd->style), buf);
58 58
59 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 59 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
60 if (!int_ret) return; 60 if (!int_ret) return;
61 61
62 eina_stringshare_replace(&(wd->style), style); 62 eina_stringshare_replace(&(wd->style), style);
@@ -191,7 +191,7 @@ _elm_fileselector_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED
191 191
192 evas_object_smart_callback_add(obj, "clicked", _button_clicked, priv); 192 evas_object_smart_callback_add(obj, "clicked", _button_clicked, priv);
193 193
194 eo_do(obj, elm_wdg_theme(NULL)); 194 eo_do(obj, elm_wdg_theme_apply(NULL));
195 elm_widget_can_focus_set(obj, EINA_TRUE); 195 elm_widget_can_focus_set(obj, EINA_TRUE);
196} 196}
197 197
@@ -505,7 +505,7 @@ _class_constructor(Eo_Class *klass)
505 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_button_smart_add), 505 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_fileselector_button_smart_add),
506 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_button_smart_del), 506 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_button_smart_del),
507 507
508 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_fileselector_button_smart_theme), 508 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_button_smart_theme),
509 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_fileselector_button_smart_translate), 509 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_fileselector_button_smart_translate),
510 510
511 EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_fileselector_button_smart_admits_autorepeat_get), 511 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)
187 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 187 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
188 if (ret) *ret = EINA_FALSE; 188 if (ret) *ret = EINA_FALSE;
189 189
190 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 190 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
191 if (!int_ret) return; 191 if (!int_ret) return;
192 192
193 style = elm_widget_style_get(obj); 193 style = elm_widget_style_get(obj);
@@ -722,7 +722,7 @@ _class_constructor(Eo_Class *klass)
722 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_entry_smart_del), 722 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_fileselector_entry_smart_del),
723 723
724 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_fileselector_entry_smart_disable), 724 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_fileselector_entry_smart_disable),
725 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_fileselector_entry_smart_theme), 725 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_fileselector_entry_smart_theme),
726 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_fileselector_entry_smart_translate), 726 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_fileselector_entry_smart_translate),
727 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_entry_smart_focus_next_manager_is), 727 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_fileselector_entry_smart_focus_next_manager_is),
728 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_fileselector_entry_smart_focus_next), 728 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)
61 /* hoversel's style has an extra bit: orientation */ 61 /* hoversel's style has an extra bit: orientation */
62 eina_stringshare_replace(&(wd->style), buf); 62 eina_stringshare_replace(&(wd->style), buf);
63 63
64 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 64 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
65 if (!int_ret) return; 65 if (!int_ret) return;
66 66
67 eina_stringshare_replace(&(wd->style), style); 67 eina_stringshare_replace(&(wd->style), style);
@@ -261,7 +261,7 @@ _elm_hoversel_smart_add(Eo *obj, void *_pd EINA_UNUSED,
261 evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj); 261 evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj);
262 262
263 //What are you doing here? 263 //What are you doing here?
264 eo_do(obj, elm_wdg_theme(NULL)); 264 eo_do(obj, elm_wdg_theme_apply(NULL));
265} 265}
266 266
267static void 267static void
@@ -389,7 +389,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
389 389
390 sd->horizontal = !!horizontal; 390 sd->horizontal = !!horizontal;
391 391
392 eo_do(obj, elm_wdg_theme(NULL)); 392 eo_do(obj, elm_wdg_theme_apply(NULL));
393} 393}
394 394
395EAPI Eina_Bool 395EAPI Eina_Bool
@@ -690,7 +690,7 @@ _class_constructor(Eo_Class *klass)
690 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hoversel_smart_show), 690 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hoversel_smart_show),
691 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hoversel_smart_hide), 691 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hoversel_smart_hide),
692 692
693 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_hoversel_smart_theme), 693 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_hoversel_smart_theme),
694 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate), 694 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate),
695 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set), 695 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set),
696 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event), 696 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)
76 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 76 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
77 if (ret) *ret = EINA_FALSE; 77 if (ret) *ret = EINA_FALSE;
78 78
79 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 79 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
80 if (!int_ret) return; 80 if (!int_ret) return;
81 81
82 EINA_LIST_FOREACH(sd->items, l, item) 82 EINA_LIST_FOREACH(sd->items, l, item)
@@ -2178,7 +2178,7 @@ _class_constructor(Eo_Class *klass)
2178 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_multibuttonentry_smart_add), 2178 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_multibuttonentry_smart_add),
2179 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_multibuttonentry_smart_del), 2179 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_multibuttonentry_smart_del),
2180 2180
2181 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_multibuttonentry_smart_theme), 2181 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_multibuttonentry_smart_theme),
2182 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_multibuttonentry_smart_translate), 2182 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_multibuttonentry_smart_translate),
2183 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_multibuttonentry_smart_event), 2183 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_multibuttonentry_smart_event),
2184 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_multibuttonentry_smart_on_focus), 2184 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)
2127 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_naviframe_smart_focus_direction_manager_is), 2127 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_naviframe_smart_focus_direction_manager_is),
2128 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_naviframe_smart_focus_direction), 2128 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_naviframe_smart_focus_direction),
2129 2129
2130 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_naviframe_smart_theme), 2130 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_naviframe_smart_theme),
2131 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_naviframe_smart_translate), 2131 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_naviframe_smart_translate),
2132 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_naviframe_smart_access), 2132 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_naviframe_smart_access),
2133 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_naviframe_smart_event), 2133 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)
168 Eina_Bool int_ret; 168 Eina_Bool int_ret;
169 169
170 Elm_Player_Smart_Data *sd = _pd; 170 Elm_Player_Smart_Data *sd = _pd;
171 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 171 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
172 if (!int_ret) return; 172 if (!int_ret) return;
173 _update_theme_button(obj, sd->forward, "forward"); 173 _update_theme_button(obj, sd->forward, "forward");
174 _update_theme_button(obj, sd->info, "info"); 174 _update_theme_button(obj, sd->info, "info");
@@ -724,7 +724,7 @@ _class_constructor(Eo_Class *klass)
724 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_player_smart_add), 724 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_player_smart_add),
725 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_player_smart_del), 725 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_player_smart_del),
726 726
727 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_player_smart_theme), 727 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_player_smart_theme),
728 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_player_smart_event), 728 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_player_smart_event),
729 729
730 EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_player_smart_content_set), 730 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)
325 Elm_Popup_Smart_Data *sd = _pd; 325 Elm_Popup_Smart_Data *sd = _pd;
326 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 326 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
327 327
328 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 328 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
329 if (!int_ret) return; 329 if (!int_ret) return;
330 330
331 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 331 _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -1949,7 +1949,7 @@ _class_constructor(Eo_Class *klass)
1949 1949
1950 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_popup_smart_parent_set), 1950 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_popup_smart_parent_set),
1951 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_popup_smart_event), 1951 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_popup_smart_event),
1952 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_popup_smart_theme), 1952 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_popup_smart_theme),
1953 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_popup_smart_translate), 1953 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_popup_smart_translate),
1954 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_popup_smart_focus_next_manager_is), 1954 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_popup_smart_focus_next_manager_is),
1955 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_popup_smart_focus_next), 1955 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)
116 116
117 mirrored = elm_object_mirrored_get(obj); 117 mirrored = elm_object_mirrored_get(obj);
118 118
119 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 119 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
120 if (!int_ret) return; 120 if (!int_ret) return;
121 121
122 if (elm_object_mirrored_get(obj) != mirrored) 122 if (elm_object_mirrored_get(obj) != mirrored)
@@ -702,7 +702,7 @@ _class_constructor(Eo_Class *klass)
702 702
703 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_actionslider_smart_add), 703 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_actionslider_smart_add),
704 704
705 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_actionslider_smart_theme), 705 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_actionslider_smart_theme),
706 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_actionslider_smart_focus_next_manager_is), 706 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_actionslider_smart_focus_next_manager_is),
707 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_actionslider_smart_focus_direction_manager_is), 707 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_actionslider_smart_focus_direction_manager_is),
708 708
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)
133 if (ret) *ret = EINA_FALSE; 133 if (ret) *ret = EINA_FALSE;
134 Eina_Bool int_ret = EINA_FALSE; 134 Eina_Bool int_ret = EINA_FALSE;
135 135
136 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 136 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
137 if (!int_ret) return; 137 if (!int_ret) return;
138 138
139 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 139 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -921,7 +921,7 @@ _class_constructor(Eo_Class *klass)
921 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_box_smart_del), 921 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_box_smart_del),
922 922
923 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_box_smart_sub_object_del), 923 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_box_smart_sub_object_del),
924 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_box_smart_theme), 924 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_box_smart_theme),
925 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_box_smart_focus_next_manager_is), 925 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_box_smart_focus_next_manager_is),
926 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_box_smart_focus_next), 926 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_box_smart_focus_next),
927 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_box_smart_focus_direction_manager_is), 927 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)
280 eina_stringshare_replace 280 eina_stringshare_replace
281 (&ld->group, corner_string[sd->pos]); 281 (&ld->group, corner_string[sd->pos]);
282 282
283 eo_do(obj, elm_wdg_theme(NULL)); 283 eo_do(obj, elm_wdg_theme_apply(NULL));
284} 284}
285 285
286EAPI Elm_Bubble_Pos 286EAPI 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)
118 if (ret) *ret = EINA_FALSE; 118 if (ret) *ret = EINA_FALSE;
119 Eina_Bool int_ret = EINA_FALSE; 119 Eina_Bool int_ret = EINA_FALSE;
120 120
121 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 121 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
122 if (!int_ret) return; 122 if (!int_ret) return;
123 _icon_signal_emit(obj); 123 _icon_signal_emit(obj);
124 124
@@ -510,7 +510,7 @@ _class_constructor(Eo_Class *klass)
510 510
511 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_button_smart_add), 511 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_button_smart_add),
512 512
513 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_button_smart_theme), 513 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_button_smart_theme),
514 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_button_smart_event), 514 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_button_smart_event),
515 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_button_smart_sub_object_del), 515 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_button_smart_sub_object_del),
516 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_button_smart_activate), 516 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)
552 if (ret) *ret = EINA_FALSE; 552 if (ret) *ret = EINA_FALSE;
553 Eina_Bool int_ret = EINA_FALSE; 553 Eina_Bool int_ret = EINA_FALSE;
554 554
555 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 555 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
556 if (!int_ret) return; 556 if (!int_ret) return;
557 557
558 evas_object_smart_changed(obj); 558 evas_object_smart_changed(obj);
@@ -1659,7 +1659,7 @@ _class_constructor(Eo_Class *klass)
1659 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_calendar_smart_del), 1659 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_calendar_smart_del),
1660 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_calendar_smart_calculate), 1660 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_calendar_smart_calculate),
1661 1661
1662 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_calendar_smart_theme), 1662 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_calendar_smart_theme),
1663 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_calendar_smart_event), 1663 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_calendar_smart_event),
1664 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_calendar_smart_focus_next_manager_is), 1664 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_calendar_smart_focus_next_manager_is),
1665 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_calendar_smart_focus_direction_manager_is), 1665 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)
183 Elm_Check_Smart_Data *sd = _pd; 183 Elm_Check_Smart_Data *sd = _pd;
184 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 184 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
185 185
186 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 186 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
187 if (!int_ret) return; 187 if (!int_ret) return;
188 188
189 if (!sd->state) elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 189 if (!sd->state) elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
@@ -452,7 +452,7 @@ _class_constructor(Eo_Class *klass)
452 452
453 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_check_smart_add), 453 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_check_smart_add),
454 454
455 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_check_smart_theme), 455 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_check_smart_theme),
456 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_check_smart_event), 456 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_check_smart_event),
457 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_check_smart_sub_object_del), 457 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_check_smart_sub_object_del),
458 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_check_smart_activate), 458 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)
577 if (ret) *ret = EINA_FALSE; 577 if (ret) *ret = EINA_FALSE;
578 Eina_Bool int_ret = EINA_FALSE; 578 Eina_Bool int_ret = EINA_FALSE;
579 579
580 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 580 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
581 if (!int_ret) return; 581 if (!int_ret) return;
582 582
583 _time_update(obj); 583 _time_update(obj);
@@ -1137,7 +1137,7 @@ _class_constructor(Eo_Class *klass)
1137 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_clock_smart_add), 1137 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_clock_smart_add),
1138 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_clock_smart_del), 1138 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_clock_smart_del),
1139 1139
1140 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_clock_smart_theme), 1140 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_clock_smart_theme),
1141 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_clock_smart_access), 1141 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_clock_smart_access),
1142 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_clock_smart_focus_next_manager_is), 1142 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_clock_smart_focus_next_manager_is),
1143 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_clock_smart_focus_next), 1143 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)
1078 if (ret) *ret = EINA_FALSE; 1078 if (ret) *ret = EINA_FALSE;
1079 Eina_Bool int_ret = EINA_FALSE; 1079 Eina_Bool int_ret = EINA_FALSE;
1080 1080
1081 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 1081 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
1082 if (!int_ret) return; 1082 if (!int_ret) return;
1083 1083
1084 if (!sd->col_bars_area) return; 1084 if (!sd->col_bars_area) return;
@@ -2196,7 +2196,7 @@ _class_constructor(Eo_Class *klass)
2196 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_colorselector_smart_add), 2196 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_colorselector_smart_add),
2197 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_colorselector_smart_del), 2197 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_colorselector_smart_del),
2198 2198
2199 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_colorselector_smart_theme), 2199 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_colorselector_smart_theme),
2200 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_colorselector_smart_event), 2200 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_colorselector_smart_event),
2201 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_colorselector_smart_focus_next_manager_is), 2201 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_colorselector_smart_focus_next_manager_is),
2202 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_colorselector_smart_focus_direction_manager_is), 2202 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)
599 if (ret) *ret = EINA_FALSE; 599 if (ret) *ret = EINA_FALSE;
600 Eina_Bool int_ret = EINA_FALSE; 600 Eina_Bool int_ret = EINA_FALSE;
601 601
602 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 602 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
603 if (!int_ret) return; 603 if (!int_ret) return;
604 604
605 _conformant_parts_swallow(obj); 605 _conformant_parts_swallow(obj);
@@ -1012,7 +1012,7 @@ _class_constructor(Eo_Class *klass)
1012 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_conformant_smart_del), 1012 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_conformant_smart_del),
1013 1013
1014 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_conformant_smart_parent_set), 1014 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_conformant_smart_parent_set),
1015 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_conformant_smart_theme), 1015 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_conformant_smart_theme),
1016 1016
1017 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_conformant_smart_content_aliases_get), 1017 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_conformant_smart_content_aliases_get),
1018 EO_OP_FUNC_SENTINEL 1018 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)
530 Elm_Datetime_Smart_Data *sd = _pd; 530 Elm_Datetime_Smart_Data *sd = _pd;
531 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 531 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
532 532
533 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 533 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
534 if (!int_ret) return; 534 if (!int_ret) return;
535 535
536 if ((!dt_mod) || (!dt_mod->field_value_display)) 536 if ((!dt_mod) || (!dt_mod->field_value_display))
@@ -1255,7 +1255,7 @@ _class_constructor(Eo_Class *klass)
1255 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_datetime_smart_translate), 1255 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_datetime_smart_translate),
1256 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_datetime_smart_focus_next_manager_is), 1256 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_datetime_smart_focus_next_manager_is),
1257 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_datetime_smart_focus_next), 1257 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_datetime_smart_focus_next),
1258 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_datetime_smart_theme), 1258 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_datetime_smart_theme),
1259 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus), 1259 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus),
1260 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable), 1260 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable),
1261 1261
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)
140 140
141 Elm_Dayselector_Smart_Data *sd = _pd; 141 Elm_Dayselector_Smart_Data *sd = _pd;
142 142
143 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 143 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
144 if (!int_ret) return; 144 if (!int_ret) return;
145 145
146 EINA_LIST_FOREACH(sd->items, l, it) 146 EINA_LIST_FOREACH(sd->items, l, it)
@@ -733,7 +733,7 @@ _class_constructor(Eo_Class *klass)
733 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_dayselector_smart_add), 733 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_dayselector_smart_add),
734 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_dayselector_smart_del), 734 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_dayselector_smart_del),
735 735
736 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_dayselector_smart_theme), 736 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_dayselector_smart_theme),
737 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_dayselector_smart_translate), 737 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_dayselector_smart_translate),
738 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_dayselector_smart_focus_direction_manager_is), 738 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_dayselector_smart_focus_direction_manager_is),
739 739
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)
805 805
806 Elm_Diskselector_Smart_Data *sd = _pd; 806 Elm_Diskselector_Smart_Data *sd = _pd;
807 807
808 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 808 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
809 if (!int_ret) return; 809 if (!int_ret) return;
810 810
811 evas = evas_object_evas_get(obj); 811 evas = evas_object_evas_get(obj);
@@ -1306,7 +1306,7 @@ _elm_diskselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1306 1306
1307 eo_do(obj, 1307 eo_do(obj,
1308 elm_scrollable_interface_objects_set(edje, priv->hit_rect), 1308 elm_scrollable_interface_objects_set(edje, priv->hit_rect),
1309 elm_wdg_theme(NULL), 1309 elm_wdg_theme_apply(NULL),
1310 elm_scrollable_interface_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF), 1310 elm_scrollable_interface_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF),
1311 elm_scrollable_interface_bounce_allow_set(EINA_TRUE, EINA_FALSE), 1311 elm_scrollable_interface_bounce_allow_set(EINA_TRUE, EINA_FALSE),
1312 elm_scrollable_interface_animate_start_cb_set(_scroll_animate_start_cb), 1312 elm_scrollable_interface_animate_start_cb_set(_scroll_animate_start_cb),
@@ -1992,7 +1992,7 @@ _class_constructor(Eo_Class *klass)
1992 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_diskselector_smart_resize), 1992 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_diskselector_smart_resize),
1993 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_diskselector_smart_move), 1993 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_diskselector_smart_move),
1994 1994
1995 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_diskselector_smart_theme), 1995 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_diskselector_smart_theme),
1996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_diskselector_smart_translate), 1996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_diskselector_smart_translate),
1997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_diskselector_smart_event), 1997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_diskselector_smart_event),
1998 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_diskselector_smart_on_focus), 1998 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)
554 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 554 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
555 555
556 Eina_Bool int_ret = EINA_FALSE; 556 Eina_Bool int_ret = EINA_FALSE;
557 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 557 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
558 if (!int_ret) return; 558 if (!int_ret) return;
559 559
560 evas_event_freeze(evas_object_evas_get(obj)); 560 evas_event_freeze(evas_object_evas_get(obj));
@@ -3537,7 +3537,7 @@ _text_style_user_push(Eo *obj, void *_pd, va_list *list)
3537 Elm_Entry_Smart_Data *sd = _pd; 3537 Elm_Entry_Smart_Data *sd = _pd;
3538 3538
3539 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style); 3539 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style);
3540 eo_do(obj, elm_wdg_theme(NULL)); 3540 eo_do(obj, elm_wdg_theme_apply(NULL));
3541} 3541}
3542 3542
3543EAPI void 3543EAPI void
@@ -3554,7 +3554,7 @@ _text_style_user_pop(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
3554 3554
3555 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text"); 3555 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text");
3556 3556
3557 eo_do(obj, elm_wdg_theme(NULL)); 3557 eo_do(obj, elm_wdg_theme_apply(NULL));
3558} 3558}
3559 3559
3560EAPI const char * 3560EAPI const char *
@@ -3595,7 +3595,7 @@ _single_line_set(Eo *obj, void *_pd, va_list *list)
3595 sd->line_wrap = ELM_WRAP_NONE; 3595 sd->line_wrap = ELM_WRAP_NONE;
3596 if (elm_entry_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP) 3596 if (elm_entry_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP)
3597 elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE); 3597 elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE);
3598 eo_do(obj, elm_wdg_theme(NULL)); 3598 eo_do(obj, elm_wdg_theme_apply(NULL));
3599 3599
3600 if (sd->scroll) 3600 if (sd->scroll)
3601 { 3601 {
@@ -3668,7 +3668,7 @@ _password_set(Eo *obj, void *_pd, va_list *list)
3668 _entry_selection_callbacks_register(obj); 3668 _entry_selection_callbacks_register(obj);
3669 } 3669 }
3670 3670
3671 eo_do(obj, elm_wdg_theme(NULL)); 3671 eo_do(obj, elm_wdg_theme_apply(NULL));
3672} 3672}
3673 3673
3674EAPI Eina_Bool 3674EAPI Eina_Bool
@@ -3913,7 +3913,7 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list)
3913 if (sd->line_wrap == wrap) return; 3913 if (sd->line_wrap == wrap) return;
3914 sd->last_w = -1; 3914 sd->last_w = -1;
3915 sd->line_wrap = wrap; 3915 sd->line_wrap = wrap;
3916 eo_do(obj, elm_wdg_theme(NULL)); 3916 eo_do(obj, elm_wdg_theme_apply(NULL));
3917} 3917}
3918 3918
3919EAPI Elm_Wrap_Type 3919EAPI Elm_Wrap_Type
@@ -3950,7 +3950,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list)
3950 3950
3951 if (sd->editable == editable) return; 3951 if (sd->editable == editable) return;
3952 sd->editable = editable; 3952 sd->editable = editable;
3953 eo_do(obj, elm_wdg_theme(NULL)); 3953 eo_do(obj, elm_wdg_theme_apply(NULL));
3954 3954
3955 if (editable) 3955 if (editable)
3956 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, 3956 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,
@@ -5109,7 +5109,7 @@ _scrollable_set(Eo *obj, void *_pd, va_list *list)
5109 elm_widget_on_show_region_hook_set(obj, NULL, NULL); 5109 elm_widget_on_show_region_hook_set(obj, NULL, NULL);
5110 } 5110 }
5111 sd->last_w = -1; 5111 sd->last_w = -1;
5112 eo_do(obj, elm_wdg_theme(NULL)); 5112 eo_do(obj, elm_wdg_theme_apply(NULL));
5113} 5113}
5114 5114
5115EAPI Eina_Bool 5115EAPI Eina_Bool
@@ -5856,7 +5856,7 @@ _class_constructor(Eo_Class *klass)
5856 5856
5857 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_entry_smart_on_focus), 5857 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_entry_smart_on_focus),
5858 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_entry_smart_disable), 5858 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_entry_smart_disable),
5859 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_entry_smart_theme), 5859 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_entry_smart_theme),
5860 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_entry_smart_translate), 5860 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_entry_smart_translate),
5861 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_entry_smart_on_focus_region), 5861 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_entry_smart_on_focus_region),
5862 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_entry_smart_sub_object_del), 5862 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)
100 Eina_Bool int_ret; 100 Eina_Bool int_ret;
101 if (ret) *ret = EINA_FALSE; 101 if (ret) *ret = EINA_FALSE;
102 102
103 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 103 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
104 if (!int_ret) return; 104 if (!int_ret) return;
105 105
106 _sizing_eval(obj); 106 _sizing_eval(obj);
@@ -2220,7 +2220,7 @@ _class_constructor(Eo_Class *klass)
2220 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flip_smart_add), 2220 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flip_smart_add),
2221 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flip_smart_del), 2221 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flip_smart_del),
2222 2222
2223 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_flip_smart_theme), 2223 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_flip_smart_theme),
2224 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flip_smart_focus_next_manager_is), 2224 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flip_smart_focus_next_manager_is),
2225 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_flip_smart_focus_next), 2225 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_flip_smart_focus_next),
2226 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flip_smart_focus_direction_manager_is), 2226 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)
369 Elm_Flipselector_Smart_Data *sd = _pd; 369 Elm_Flipselector_Smart_Data *sd = _pd;
370 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 370 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
371 371
372 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 372 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
373 if (!int_ret) return; 373 if (!int_ret) return;
374 374
375 max_len = edje_object_data_get(wd->resize_obj, "max_len"); 375 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)
572 572
573 elm_widget_can_focus_set(obj, EINA_TRUE); 573 elm_widget_can_focus_set(obj, EINA_TRUE);
574 574
575 eo_do(obj, elm_wdg_theme(NULL)); 575 eo_do(obj, elm_wdg_theme_apply(NULL));
576} 576}
577 577
578static void 578static void
@@ -993,7 +993,7 @@ _class_constructor(Eo_Class *klass)
993 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flipselector_smart_add), 993 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_flipselector_smart_add),
994 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flipselector_smart_del), 994 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_flipselector_smart_del),
995 995
996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_flipselector_smart_theme), 996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_flipselector_smart_theme),
997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_flipselector_smart_event), 997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_flipselector_smart_event),
998 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flipselector_smart_focus_next_manager_is), 998 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_flipselector_smart_focus_next_manager_is),
999 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_flipselector_smart_focus_direction_manager_is), 999 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)
2005 if (ret) *ret = EINA_FALSE; 2005 if (ret) *ret = EINA_FALSE;
2006 Eina_Bool int_ret; 2006 Eina_Bool int_ret;
2007 2007
2008 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 2008 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
2009 if (!int_ret) return; 2009 if (!int_ret) return;
2010 2010
2011 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 2011 _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -4080,7 +4080,7 @@ _class_constructor(Eo_Class *klass)
4080 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_gengrid_smart_resize), 4080 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_gengrid_smart_resize),
4081 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_gengrid_smart_move), 4081 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_gengrid_smart_move),
4082 4082
4083 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_gengrid_smart_theme), 4083 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_gengrid_smart_theme),
4084 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_gengrid_smart_event), 4084 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_gengrid_smart_event),
4085 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_gengrid_smart_on_focus), 4085 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_gengrid_smart_on_focus),
4086 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_gengrid_smart_focus_next_manager_is), 4086 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)
2780 2780
2781 Elm_Genlist_Smart_Data *sd = _pd; 2781 Elm_Genlist_Smart_Data *sd = _pd;
2782 2782
2783 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 2783 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
2784 if (!int_ret) return; 2784 if (!int_ret) return;
2785 2785
2786 evas_event_freeze(evas_object_evas_get(obj)); 2786 evas_event_freeze(evas_object_evas_get(obj));
@@ -7600,7 +7600,7 @@ _class_constructor(Eo_Class *klass)
7600 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_genlist_smart_resize), 7600 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_genlist_smart_resize),
7601 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_genlist_smart_move), 7601 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_genlist_smart_move),
7602 7602
7603 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_genlist_smart_theme), 7603 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_genlist_smart_theme),
7604 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_genlist_smart_translate), 7604 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_genlist_smart_translate),
7605 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_genlist_smart_event), 7605 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_genlist_smart_event),
7606 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_genlist_smart_on_focus), 7606 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)
121 if (ret) *ret = EINA_FALSE; 121 if (ret) *ret = EINA_FALSE;
122 Eina_Bool int_ret; 122 Eina_Bool int_ret;
123 123
124 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 124 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
125 if (!int_ret) return; 125 if (!int_ret) return;
126 126
127 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 127 _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)
145 145
146 elm_widget_can_focus_set(obj, EINA_FALSE); 146 elm_widget_can_focus_set(obj, EINA_FALSE);
147 147
148 eo_do(obj, elm_wdg_theme(NULL)); 148 eo_do(obj, elm_wdg_theme_apply(NULL));
149} 149}
150 150
151static void 151static void
@@ -358,7 +358,7 @@ _class_constructor(Eo_Class *klass)
358 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_grid_smart_add), 358 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_grid_smart_add),
359 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_grid_smart_del), 359 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_grid_smart_del),
360 360
361 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_grid_smart_theme), 361 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_grid_smart_theme),
362 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_grid_smart_focus_next_manager_is), 362 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_grid_smart_focus_next_manager_is),
363 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_grid_smart_focus_next), 363 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_grid_smart_focus_next),
364 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_grid_smart_focus_direction_manager_is), 364 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)
291 Eina_Bool int_ret; 291 Eina_Bool int_ret;
292 Elm_Hover_Smart_Data *sd = _pd; 292 Elm_Hover_Smart_Data *sd = _pd;
293 293
294 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 294 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
295 if (!int_ret) return; 295 if (!int_ret) return;
296 296
297 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); 297 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
@@ -863,7 +863,7 @@ _class_constructor(Eo_Class *klass)
863 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hover_smart_show), 863 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_hover_smart_show),
864 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hover_smart_hide), 864 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_hover_smart_hide),
865 865
866 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_hover_smart_theme), 866 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_hover_smart_theme),
867 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_hover_smart_sub_object_add), 867 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_ADD), _elm_hover_smart_sub_object_add),
868 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_hover_smart_sub_object_del), 868 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_hover_smart_sub_object_del),
869 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hover_smart_parent_set), 869 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)
449 if (sd->stdicon) 449 if (sd->stdicon)
450 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 450 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
451 451
452 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 452 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
453 if (!int_ret) return; 453 if (!int_ret) return;
454 454
455 if (ret) *ret = EINA_TRUE; 455 if (ret) *ret = EINA_TRUE;
@@ -1081,7 +1081,7 @@ _class_constructor(Eo_Class *klass)
1081 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_icon_smart_add), 1081 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_icon_smart_add),
1082 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_icon_smart_del), 1082 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_icon_smart_del),
1083 1083
1084 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_icon_smart_theme), 1084 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_icon_smart_theme),
1085 1085
1086 EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_FILE_SET), _elm_icon_smart_file_set), 1086 EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_FILE_SET), _elm_icon_smart_file_set),
1087 EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_MEMFILE_SET), _elm_icon_smart_memfile_set), 1087 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)
628 if (ret) *ret = EINA_FALSE; 628 if (ret) *ret = EINA_FALSE;
629 Eina_Bool int_ret = EINA_FALSE; 629 Eina_Bool int_ret = EINA_FALSE;
630 630
631 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 631 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
632 if (!int_ret) return; 632 if (!int_ret) return;
633 633
634 eo_do(obj, elm_obj_image_sizing_eval()); 634 eo_do(obj, elm_obj_image_sizing_eval());
@@ -1729,7 +1729,7 @@ _class_constructor(Eo_Class *klass)
1729 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_SET), _elm_image_smart_clip_set), 1729 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_SET), _elm_image_smart_clip_set),
1730 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_UNSET), _elm_image_smart_clip_unset), 1730 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CLIP_UNSET), _elm_image_smart_clip_unset),
1731 1731
1732 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_image_smart_theme), 1732 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_image_smart_theme),
1733 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_image_smart_event), 1733 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_image_smart_event),
1734 1734
1735 EO_OP_FUNC(ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_ASPECT_FIXED_SET), _elm_image_smart_aspect_fixed_set), 1735 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)
344 else 344 else
345 eina_stringshare_replace(&ld->group, "base/vertical"); 345 eina_stringshare_replace(&ld->group, "base/vertical");
346 346
347 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 347 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
348 if (!int_ret) return; 348 if (!int_ret) return;
349 349
350 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 350 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -1642,7 +1642,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
1642 if (horizontal == sd->horizontal) return; 1642 if (horizontal == sd->horizontal) return;
1643 1643
1644 sd->horizontal = horizontal; 1644 sd->horizontal = horizontal;
1645 eo_do(obj, elm_wdg_theme(NULL)); 1645 eo_do(obj, elm_wdg_theme_apply(NULL));
1646} 1646}
1647 1647
1648EAPI Eina_Bool 1648EAPI Eina_Bool
@@ -1749,7 +1749,7 @@ _class_constructor(Eo_Class *klass)
1749 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_index_smart_add), 1749 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_index_smart_add),
1750 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_index_smart_del), 1750 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_index_smart_del),
1751 1751
1752 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_index_smart_theme), 1752 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_index_smart_theme),
1753 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_index_smart_focus_next_manager_is), 1753 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_index_smart_focus_next_manager_is),
1754 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_index_smart_focus_next), 1754 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_index_smart_focus_next),
1755 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_index_smart_access), 1755 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)
167 167
168 evas_event_freeze(evas_object_evas_get(obj)); 168 evas_event_freeze(evas_object_evas_get(obj));
169 169
170 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 170 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
171 if (!int_ret) goto end; 171 if (!int_ret) goto end;
172 172
173 _label_format_set(wd->resize_obj, sd->format); 173 _label_format_set(wd->resize_obj, sd->format);
@@ -733,7 +733,7 @@ _class_constructor(Eo_Class *klass)
733 733
734 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_label_smart_add), 734 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_label_smart_add),
735 735
736 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_label_smart_theme), 736 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_label_smart_theme),
737 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_label_smart_translate), 737 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_label_smart_translate),
738 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_label_smart_focus_next_manager_is), 738 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_label_smart_focus_next_manager_is),
739 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_label_smart_focus_direction_manager_is), 739 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)
370 370
371 Elm_Layout_Smart_Data *sd = _pd; 371 Elm_Layout_Smart_Data *sd = _pd;
372 372
373 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 373 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
374 if (!int_ret) return; 374 if (!int_ret) return;
375 /* The following lines are here to support entry design; the _theme function 375 /* The following lines are here to support entry design; the _theme function
376 * of entry needs to call directly the widget _theme function */ 376 * of entry needs to call directly the widget _theme function */
@@ -2262,7 +2262,7 @@ _class_constructor(Eo_Class *klass)
2262 2262
2263 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_layout_smart_on_focus), 2263 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_layout_smart_on_focus),
2264 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_layout_smart_disable), 2264 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_layout_smart_disable),
2265 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_layout_smart_theme), 2265 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_layout_smart_theme),
2266 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_layout_smart_translate), 2266 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_layout_smart_translate),
2267 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_layout_smart_focus_next_manager_is), 2267 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_layout_smart_focus_next_manager_is),
2268 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_layout_smart_focus_next), 2268 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)
877 Eina_Bool int_ret = EINA_FALSE; 877 Eina_Bool int_ret = EINA_FALSE;
878 Elm_List_Smart_Data *sd = _pd; 878 Elm_List_Smart_Data *sd = _pd;
879 879
880 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 880 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
881 if (!int_ret) return; 881 if (!int_ret) return;
882 882
883 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 883 _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -2800,7 +2800,7 @@ _class_constructor(Eo_Class *klass)
2800 2800
2801 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_list_smart_on_focus), 2801 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_list_smart_on_focus),
2802 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_list_smart_disable), 2802 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_list_smart_disable),
2803 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_list_smart_theme), 2803 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_list_smart_theme),
2804 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_list_smart_translate), 2804 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_list_smart_translate),
2805 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_list_smart_event), 2805 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_list_smart_event),
2806 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_list_smart_focus_next_manager_is), 2806 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)
3849 if (ret) *ret = EINA_FALSE; 3849 if (ret) *ret = EINA_FALSE;
3850 Eina_Bool int_ret = EINA_FALSE; 3850 Eina_Bool int_ret = EINA_FALSE;
3851 3851
3852 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 3852 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
3853 if (!int_ret) return; 3853 if (!int_ret) return;
3854 3854
3855 _sizing_eval(obj); 3855 _sizing_eval(obj);
@@ -5994,7 +5994,7 @@ _class_constructor(Eo_Class *klass)
5994 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_map_smart_move), 5994 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_map_smart_move),
5995 5995
5996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_map_smart_on_focus), 5996 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_map_smart_on_focus),
5997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_map_smart_theme), 5997 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_map_smart_theme),
5998 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_map_smart_event), 5998 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_map_smart_event),
5999 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_map_smart_translate), 5999 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_map_smart_translate),
6000 6000
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)
38 if (ret) *ret = EINA_FALSE; 38 if (ret) *ret = EINA_FALSE;
39 Eina_Bool int_ret = EINA_FALSE; 39 Eina_Bool int_ret = EINA_FALSE;
40 40
41 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 41 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
42 if (!int_ret) return; 42 if (!int_ret) return;
43 43
44 _sizing_eval(obj); 44 _sizing_eval(obj);
@@ -582,7 +582,7 @@ _class_constructor(Eo_Class *klass)
582 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_mapbuf_smart_show), 582 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_mapbuf_smart_show),
583 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_mapbuf_smart_hide), 583 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_HIDE), _elm_mapbuf_smart_hide),
584 584
585 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_mapbuf_smart_theme), 585 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_mapbuf_smart_theme),
586 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_mapbuf_smart_sub_object_del), 586 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_mapbuf_smart_sub_object_del),
587 587
588 EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_mapbuf_smart_content_set), 588 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)
202 Elm_Menu_Item *item; 202 Elm_Menu_Item *item;
203 const char *s; 203 const char *s;
204 204
205 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 205 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
206 if (!int_ret) return; 206 if (!int_ret) return;
207 207
208 ll = eina_list_append(ll, sd->items); 208 ll = eina_list_append(ll, sd->items);
@@ -688,7 +688,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
688 } 688 }
689 } 689 }
690 690
691 eo_do(obj, elm_wdg_theme(NULL)); 691 eo_do(obj, elm_wdg_theme_apply(NULL));
692} 692}
693 693
694EAPI Evas_Object * 694EAPI Evas_Object *
@@ -1310,7 +1310,7 @@ _class_constructor(Eo_Class *klass)
1310 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_menu_smart_del), 1310 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_menu_smart_del),
1311 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_menu_smart_show), 1311 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_menu_smart_show),
1312 1312
1313 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_menu_smart_theme), 1313 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_menu_smart_theme),
1314 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_menu_smart_translate), 1314 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_menu_smart_translate),
1315 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _parent_set), 1315 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _parent_set),
1316 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _parent_get), 1316 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)
126 if (ret) *ret = EINA_FALSE; 126 if (ret) *ret = EINA_FALSE;
127 Eina_Bool int_ret = EINA_FALSE; 127 Eina_Bool int_ret = EINA_FALSE;
128 128
129 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 129 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
130 if (!int_ret) return; 130 if (!int_ret) return;
131 131
132 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 132 _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -811,7 +811,7 @@ _class_constructor(Eo_Class *klass)
811 811
812 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_notify_smart_parent_set), 812 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_notify_smart_parent_set),
813 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _elm_notify_smart_parent_get), 813 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_GET), _elm_notify_smart_parent_get),
814 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_notify_smart_theme), 814 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_notify_smart_theme),
815 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_notify_smart_focus_next_manager_is), 815 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_notify_smart_focus_next_manager_is),
816 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_notify_smart_focus_next), 816 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_notify_smart_focus_next),
817 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_notify_smart_focus_direction_manager_is), 817 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)
134 134
135 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 135 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
136 136
137 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 137 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
138 if (!int_ret) return; 138 if (!int_ret) return;
139 139
140 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 140 _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)
361 elm_widget_sub_object_parent_add(obj); 361 elm_widget_sub_object_parent_add(obj);
362 elm_widget_can_focus_set(obj, EINA_TRUE); 362 elm_widget_can_focus_set(obj, EINA_TRUE);
363 363
364 eo_do(obj, elm_wdg_theme(NULL)); 364 eo_do(obj, elm_wdg_theme_apply(NULL));
365 365
366 priv->bx = evas_object_box_add(evas_object_evas_get(obj)); 366 priv->bx = evas_object_box_add(evas_object_evas_get(obj));
367 evas_object_size_hint_align_set(priv->bx, 0.5, 0.5); 367 evas_object_size_hint_align_set(priv->bx, 0.5, 0.5);
@@ -557,7 +557,7 @@ _class_constructor(Eo_Class *klass)
557 557
558 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panel_smart_focus_next_manager_is), 558 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panel_smart_focus_next_manager_is),
559 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panel_smart_focus_next), 559 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panel_smart_focus_next),
560 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_panel_smart_theme), 560 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_panel_smart_theme),
561 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_panel_smart_event), 561 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_panel_smart_event),
562 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_panel_smart_access), 562 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_panel_smart_access),
563 563
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)
63 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 63 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
64 evas_object_size_hint_min_set(sd->event, minw, minh); 64 evas_object_size_hint_min_set(sd->event, minw, minh);
65 65
66 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 66 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
67 if (!int_ret) return; 67 if (!int_ret) return;
68 68
69 size = elm_panes_content_left_size_get(obj); 69 size = elm_panes_content_left_size_get(obj);
@@ -390,7 +390,7 @@ _elm_panes_smart_horizontal_set(Eo *obj, void *_pd, va_list *list)
390 Elm_Panes_Smart_Data *sd = _pd; 390 Elm_Panes_Smart_Data *sd = _pd;
391 391
392 sd->horizontal = horizontal; 392 sd->horizontal = horizontal;
393 eo_do(obj, elm_wdg_theme(NULL)); 393 eo_do(obj, elm_wdg_theme_apply(NULL));
394 394
395 elm_panes_content_left_size_set(obj, 0.5); 395 elm_panes_content_left_size_set(obj, 0.5);
396} 396}
@@ -483,7 +483,7 @@ _class_constructor(Eo_Class *klass)
483 483
484 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_panes_smart_add), 484 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_panes_smart_add),
485 485
486 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_panes_smart_theme), 486 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_panes_smart_theme),
487 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panes_smart_focus_next_manager_is), 487 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_panes_smart_focus_next_manager_is),
488 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panes_smart_focus_next), 488 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_panes_smart_focus_next),
489 489
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)
57 Elm_Photo_Smart_Data *sd = _pd; 57 Elm_Photo_Smart_Data *sd = _pd;
58 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 58 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
59 59
60 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 60 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
61 if (!int_ret) return; 61 if (!int_ret) return;
62 62
63 edje_object_mirrored_set 63 edje_object_mirrored_set
@@ -506,7 +506,7 @@ _class_constructor(Eo_Class *klass)
506 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_photo_smart_add), 506 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_photo_smart_add),
507 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_photo_smart_del), 507 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_photo_smart_del),
508 508
509 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_photo_smart_theme), 509 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_photo_smart_theme),
510 510
511 EO_OP_FUNC(ELM_OBJ_PHOTO_ID(ELM_OBJ_PHOTO_SUB_ID_FILE_SET), _file_set), 511 EO_OP_FUNC(ELM_OBJ_PHOTO_ID(ELM_OBJ_PHOTO_SUB_ID_FILE_SET), _file_set),
512 EO_OP_FUNC(ELM_OBJ_PHOTO_ID(ELM_OBJ_PHOTO_SUB_ID_SIZE_SET), _size_set), 512 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)
911 if (ret) *ret = EINA_FALSE; 911 if (ret) *ret = EINA_FALSE;
912 Eina_Bool int_ret = EINA_FALSE; 912 Eina_Bool int_ret = EINA_FALSE;
913 913
914 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 914 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
915 if (!int_ret) return; 915 if (!int_ret) return;
916 916
917 _sizing_eval(obj); 917 _sizing_eval(obj);
@@ -2319,7 +2319,7 @@ _class_constructor(Eo_Class *klass)
2319 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_photocam_smart_resize), 2319 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_photocam_smart_resize),
2320 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_photocam_smart_move), 2320 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_photocam_smart_move),
2321 2321
2322 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_photocam_smart_theme), 2322 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_photocam_smart_theme),
2323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_photocam_smart_event), 2323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_photocam_smart_event),
2324 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_photocam_smart_on_focus), 2324 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_photocam_smart_on_focus),
2325 2325
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)
90 if (ret) *ret = EINA_FALSE; 90 if (ret) *ret = EINA_FALSE;
91 Eina_Bool int_ret = EINA_FALSE; 91 Eina_Bool int_ret = EINA_FALSE;
92 92
93 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 93 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
94 if (!int_ret) return; 94 if (!int_ret) return;
95 95
96 _sizing_eval(obj); 96 _sizing_eval(obj);
@@ -221,7 +221,7 @@ _class_constructor(Eo_Class *klass)
221 221
222 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_plug_smart_add), 222 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_plug_smart_add),
223 223
224 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_plug_smart_theme), 224 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_plug_smart_theme),
225 225
226 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), 226 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS),
227 _elm_plug_smart_on_focus), 227 _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)
184 eina_stringshare_replace(&ld->group, "horizontal"); 184 eina_stringshare_replace(&ld->group, "horizontal");
185 else eina_stringshare_replace(&ld->group, "vertical"); 185 else eina_stringshare_replace(&ld->group, "vertical");
186 186
187 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 187 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
188 if (!int_ret) return; 188 if (!int_ret) return;
189 189
190 if (sd->pulse) 190 if (sd->pulse)
@@ -369,7 +369,7 @@ _pulse_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
369 369
370 sd->pulse = pulse; 370 sd->pulse = pulse;
371 371
372 eo_do(obj, elm_wdg_theme(NULL)); 372 eo_do(obj, elm_wdg_theme_apply(NULL));
373} 373}
374 374
375EAPI Eina_Bool 375EAPI Eina_Bool
@@ -670,7 +670,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
670 if (sd->horizontal == horizontal) return; 670 if (sd->horizontal == horizontal) return;
671 671
672 sd->horizontal = horizontal; 672 sd->horizontal = horizontal;
673 eo_do(obj, elm_wdg_theme(NULL)); 673 eo_do(obj, elm_wdg_theme_apply(NULL));
674} 674}
675 675
676EAPI Eina_Bool 676EAPI Eina_Bool
@@ -760,7 +760,7 @@ _class_constructor(Eo_Class *klass)
760 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_progressbar_smart_add), 760 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_progressbar_smart_add),
761 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_progressbar_smart_del), 761 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_progressbar_smart_del),
762 762
763 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_progressbar_smart_theme), 763 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_progressbar_smart_theme),
764 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_progressbar_smart_sub_object_del), 764 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_progressbar_smart_sub_object_del),
765 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_progressbar_smart_focus_next_manager_is), 765 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_progressbar_smart_focus_next_manager_is),
766 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_progressbar_smart_focus_direction_manager_is), 766 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)
186 if (ret) *ret = EINA_FALSE; 186 if (ret) *ret = EINA_FALSE;
187 Eina_Bool int_ret = EINA_FALSE; 187 Eina_Bool int_ret = EINA_FALSE;
188 188
189 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 189 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
190 if (!int_ret) return; 190 if (!int_ret) return;
191 191
192 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 192 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
@@ -549,7 +549,7 @@ _class_constructor(Eo_Class *klass)
549 549
550 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_radio_smart_disable), 550 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_radio_smart_disable),
551 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_radio_smart_sub_object_del), 551 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_radio_smart_sub_object_del),
552 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_radio_smart_theme), 552 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_radio_smart_theme),
553 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_radio_smart_event), 553 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_radio_smart_event),
554 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_radio_smart_focus_next_manager_is), 554 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_radio_smart_focus_next_manager_is),
555 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_radio_smart_focus_direction_manager_is), 555 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)
95 if (ret) *ret = EINA_FALSE; 95 if (ret) *ret = EINA_FALSE;
96 Eina_Bool int_ret = EINA_FALSE; 96 Eina_Bool int_ret = EINA_FALSE;
97 97
98 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 98 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
99 if (!int_ret) return; 99 if (!int_ret) return;
100 100
101 //TODO 101 //TODO
@@ -320,7 +320,7 @@ _class_constructor(Eo_Class *klass)
320 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_route_smart_add), 320 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_route_smart_add),
321 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_route_smart_del), 321 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_route_smart_del),
322 322
323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_route_smart_theme), 323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_route_smart_theme),
324 EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_EMAP_SET), _emap_set), 324 EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_EMAP_SET), _emap_set),
325 EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_LONGITUDE_MIN_MAX_GET), _longitude_min_max_get), 325 EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_LONGITUDE_MIN_MAX_GET), _longitude_min_max_get),
326 EO_OP_FUNC(ELM_OBJ_ROUTE_ID(ELM_OBJ_ROUTE_SUB_ID_LATITUDE_MIN_MAX_GET), _latitude_min_max_get), 326 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)
371 if (ret) *ret = EINA_FALSE; 371 if (ret) *ret = EINA_FALSE;
372 Eina_Bool int_ret; 372 Eina_Bool int_ret;
373 373
374 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 374 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
375 if (!int_ret) return; 375 if (!int_ret) return;
376 376
377 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 377 _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)
868 868
869 if (eina_stringshare_replace(&(ld->klass), klass) || 869 if (eina_stringshare_replace(&(ld->klass), klass) ||
870 eina_stringshare_replace(&(ld->group), group)) 870 eina_stringshare_replace(&(ld->group), group))
871 eo_do(obj, elm_wdg_theme(NULL)); 871 eo_do(obj, elm_wdg_theme_apply(NULL));
872} 872}
873 873
874EAPI void 874EAPI void
@@ -1264,7 +1264,7 @@ _class_constructor(Eo_Class *klass)
1264 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_scroller_smart_resize), 1264 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_RESIZE), _elm_scroller_smart_resize),
1265 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_scroller_smart_move), 1265 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_scroller_smart_move),
1266 1266
1267 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_scroller_smart_theme), 1267 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_scroller_smart_theme),
1268 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_scroller_smart_event), 1268 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_scroller_smart_event),
1269 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_scroller_smart_focus_next_manager_is), 1269 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_scroller_smart_focus_next_manager_is),
1270 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_scroller_smart_focus_next), 1270 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)
219 if (ret) *ret = EINA_FALSE; 219 if (ret) *ret = EINA_FALSE;
220 Eina_Bool int_ret; 220 Eina_Bool int_ret;
221 221
222 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 222 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
223 if (!int_ret) return; 223 if (!int_ret) return;
224 224
225 rtl = elm_widget_mirrored_get(obj); 225 rtl = elm_widget_mirrored_get(obj);
@@ -953,7 +953,7 @@ _class_constructor(Eo_Class *klass)
953 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_segment_control_smart_add), 953 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_segment_control_smart_add),
954 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_segment_control_smart_del), 954 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_segment_control_smart_del),
955 955
956 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_segment_control_smart_theme), 956 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_segment_control_smart_theme),
957 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_segment_control_smart_translate), 957 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_segment_control_smart_translate),
958 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_segment_control_smart_disable), 958 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_segment_control_smart_disable),
959 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_segment_control_smart_focus_next_manager_is), 959 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)
29 else 29 else
30 eina_stringshare_replace(&ld->group, "vertical"); 30 eina_stringshare_replace(&ld->group, "vertical");
31 31
32 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 32 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
33 if (!int_ret) return; 33 if (!int_ret) return;
34 34
35 if (ret) *ret = EINA_TRUE; 35 if (ret) *ret = EINA_TRUE;
@@ -98,7 +98,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
98 98
99 sd->horizontal = horizontal; 99 sd->horizontal = horizontal;
100 100
101 eo_do(obj, elm_wdg_theme(NULL)); 101 eo_do(obj, elm_wdg_theme_apply(NULL));
102} 102}
103 103
104EAPI Eina_Bool 104EAPI Eina_Bool
@@ -140,7 +140,7 @@ _class_constructor(Eo_Class *klass)
140 140
141 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_separator_smart_add), 141 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_separator_smart_add),
142 142
143 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_separator_smart_theme), 143 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_separator_smart_theme),
144 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_separator_smart_focus_next_manager_is), 144 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_separator_smart_focus_next_manager_is),
145 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_separator_smart_focus_direction_manager_is), 145 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_separator_smart_focus_direction_manager_is),
146 146
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)
518 elm_widget_style_get(obj)); 518 elm_widget_style_get(obj));
519 } 519 }
520 520
521 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 521 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
522 if (!int_ret) return; 522 if (!int_ret) return;
523 523
524 if (sd->popup) 524 if (sd->popup)
@@ -1098,7 +1098,7 @@ _elm_slider_horizontal_set(Eo *obj, void *_pd, va_list *list)
1098 if (sd->horizontal == horizontal) return; 1098 if (sd->horizontal == horizontal) return;
1099 sd->horizontal = horizontal; 1099 sd->horizontal = horizontal;
1100 1100
1101 eo_do(obj, elm_wdg_theme(NULL)); 1101 eo_do(obj, elm_wdg_theme_apply(NULL));
1102} 1102}
1103 1103
1104EAPI Eina_Bool 1104EAPI Eina_Bool
@@ -1464,7 +1464,7 @@ _class_constructor(Eo_Class *klass)
1464 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_slider_smart_del), 1464 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_slider_smart_del),
1465 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_slider_smart_calculate), 1465 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_CALCULATE), _elm_slider_smart_calculate),
1466 1466
1467 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_slider_smart_theme), 1467 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_slider_smart_theme),
1468 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_slider_smart_event), 1468 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_slider_smart_event),
1469 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_slider_smart_activate), 1469 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_slider_smart_activate),
1470 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_slider_smart_focus_next_manager_is), 1470 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)
1278 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_spinner_smart_add), 1278 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_spinner_smart_add),
1279 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_spinner_smart_del), 1279 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_spinner_smart_del),
1280 1280
1281 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_spinner_smart_theme), 1281 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_spinner_smart_theme),
1282 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_spinner_smart_translate), 1282 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_spinner_smart_translate),
1283 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_spinner_smart_on_focus), 1283 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_spinner_smart_on_focus),
1284 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_spinner_smart_event), 1284 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)
125 if (ret) *ret = EINA_FALSE; 125 if (ret) *ret = EINA_FALSE;
126 126
127 Eina_Bool super_ret; 127 Eina_Bool super_ret;
128 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&super_ret)); 128 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&super_ret));
129 if (super_ret == EINA_FALSE) 129 if (super_ret == EINA_FALSE)
130 return; 130 return;
131 131
@@ -199,7 +199,7 @@ _elm_table_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
199 elm_widget_can_focus_set(obj, EINA_FALSE); 199 elm_widget_can_focus_set(obj, EINA_FALSE);
200 elm_widget_highlight_ignore_set(obj, EINA_FALSE); 200 elm_widget_highlight_ignore_set(obj, EINA_FALSE);
201 201
202 eo_do(obj, elm_wdg_theme(NULL)); 202 eo_do(obj, elm_wdg_theme_apply(NULL));
203} 203}
204 204
205static void 205static void
@@ -512,7 +512,7 @@ _class_constructor(Eo_Class *klass)
512 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_table_smart_add), 512 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_table_smart_add),
513 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_table_smart_del), 513 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_table_smart_del),
514 514
515 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_table_smart_theme), 515 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_table_smart_theme),
516 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_table_smart_focus_next_manager_is), 516 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_table_smart_focus_next_manager_is),
517 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_table_smart_focus_next), 517 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_table_smart_focus_next),
518 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_table_smart_focus_direction_manager_is), 518 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)
1158 } 1158 }
1159 1159
1160 Eina_Bool int_ret; 1160 Eina_Bool int_ret;
1161 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 1161 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
1162 if (!int_ret) return; 1162 if (!int_ret) return;
1163 1163
1164 elm_widget_theme_object_set 1164 elm_widget_theme_object_set
@@ -2020,7 +2020,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
2020 _item_del(item); 2020 _item_del(item);
2021 2021
2022 if (item != sd->more_item) 2022 if (item != sd->more_item)
2023 eo_do(obj, elm_wdg_theme(NULL)); 2023 eo_do(obj, elm_wdg_theme_apply(NULL));
2024 2024
2025 return EINA_TRUE; 2025 return EINA_TRUE;
2026} 2026}
@@ -2760,7 +2760,7 @@ _icon_size_set(Eo *obj, void *_pd, va_list *list)
2760 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; 2760 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
2761 else sd->icon_size = sd->theme_icon_size; 2761 else sd->icon_size = sd->theme_icon_size;
2762 2762
2763 eo_do(obj, elm_wdg_theme(NULL)); 2763 eo_do(obj, elm_wdg_theme_apply(NULL));
2764} 2764}
2765 2765
2766EAPI int 2766EAPI int
@@ -3969,7 +3969,7 @@ _class_constructor(Eo_Class *klass)
3969 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_toolbar_smart_move), 3969 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _elm_toolbar_smart_move),
3970 3970
3971 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_toolbar_smart_on_focus), 3971 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_toolbar_smart_on_focus),
3972 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_toolbar_smart_theme), 3972 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_toolbar_smart_theme),
3973 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_toolbar_smart_translate), 3973 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_toolbar_smart_translate),
3974 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_toolbar_smart_event), 3974 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_toolbar_smart_event),
3975 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_toolbar_smart_focus_next_manager_is), 3975 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)
115 115
116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
117 117
118 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 118 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
119 if (!int_ret) return; 119 if (!int_ret) return;
120 120
121 theme = elm_object_theme_get(obj); 121 theme = elm_object_theme_get(obj);
@@ -1191,7 +1191,7 @@ _elm_web_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1191 priv->zoom.current = 1.0; 1191 priv->zoom.current = 1.0;
1192 1192
1193 _view_smart_callback_proxy(resize_obj, obj); 1193 _view_smart_callback_proxy(resize_obj, obj);
1194 eo_do(obj, elm_wdg_theme(NULL)); 1194 eo_do(obj, elm_wdg_theme_apply(NULL));
1195 1195
1196 elm_widget_can_focus_set(obj, EINA_TRUE); 1196 elm_widget_can_focus_set(obj, EINA_TRUE);
1197#else 1197#else
@@ -2924,7 +2924,7 @@ _class_constructor(Eo_Class *klass)
2924 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_web_smart_add), 2924 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_web_smart_add),
2925 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_web_smart_del), 2925 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_web_smart_del),
2926 2926
2927 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_web_smart_theme), 2927 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_web_smart_theme),
2928 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_web_smart_on_focus), 2928 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_web_smart_on_focus),
2929 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_web_smart_event), 2929 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_web_smart_event),
2930 2930
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)
756 elm_cursor_theme(cur); 756 elm_cursor_theme(cur);
757 757
758 Eina_Bool ret2; 758 Eina_Bool ret2;
759 eo_do(obj, elm_wdg_theme(&ret2)); 759 eo_do(obj, elm_wdg_theme_apply(&ret2));
760 ret &= ret2; 760 ret &= ret2;
761 761
762 return ret; 762 return ret;
@@ -801,7 +801,7 @@ elm_widget_theme_specific(Evas_Object *obj,
801 elm_tooltip_theme(tt); 801 elm_tooltip_theme(tt);
802 EINA_LIST_FOREACH(sd->cursors, l, cur) 802 EINA_LIST_FOREACH(sd->cursors, l, cur)
803 elm_cursor_theme(cur); 803 elm_cursor_theme(cur);
804 eo_do(obj, elm_wdg_theme(NULL)); 804 eo_do(obj, elm_wdg_theme_apply(NULL));
805} 805}
806 806
807static void 807static void
@@ -6318,7 +6318,7 @@ _class_constructor(Eo_Class *klass)
6318 6318
6319 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_widget_on_focus), 6319 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_widget_on_focus),
6320 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_widget_disable), 6320 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_widget_disable),
6321 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_widget_theme_func), 6321 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_widget_theme_func),
6322 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_widget_translate), 6322 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_widget_translate),
6323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_widget_event), 6323 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_widget_event),
6324 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS_REGION), _elm_widget_on_focus_region), 6324 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)
6461static const Eo_Op_Description op_desc[] = { 6461static const Eo_Op_Description op_desc[] = {
6462 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ON_FOCUS, "'Virtual' function handling focus in/out events on the widget."), 6462 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_ON_FOCUS, "'Virtual' function handling focus in/out events on the widget."),
6463 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISABLE, "'Virtual' function on the widget being disabled."), 6463 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_DISABLE, "'Virtual' function on the widget being disabled."),
6464 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME, "'Virtual' function on the widget being re-themed."), 6464 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_THEME_APPLY, "'Virtual' function on the widget being re-themed."),
6465 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TRANSLATE, "'Virtual' function handling language changes on Elementary."), 6465 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_TRANSLATE, "'Virtual' function handling language changes on Elementary."),
6466 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT, "'Virtual' function handling input events on the widget."), 6466 EO_OP_DESCRIPTION(ELM_WIDGET_SUB_ID_EVENT, "'Virtual' function handling input events on the widget."),
6467 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."), 6467 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
1109{ 1109{
1110 ELM_WIDGET_SUB_ID_ON_FOCUS, 1110 ELM_WIDGET_SUB_ID_ON_FOCUS,
1111 ELM_WIDGET_SUB_ID_DISABLE, 1111 ELM_WIDGET_SUB_ID_DISABLE,
1112 ELM_WIDGET_SUB_ID_THEME, 1112 ELM_WIDGET_SUB_ID_THEME_APPLY,
1113 ELM_WIDGET_SUB_ID_TRANSLATE, 1113 ELM_WIDGET_SUB_ID_TRANSLATE,
1114 ELM_WIDGET_SUB_ID_EVENT, 1114 ELM_WIDGET_SUB_ID_EVENT,
1115 ELM_WIDGET_SUB_ID_ON_FOCUS_REGION, 1115 ELM_WIDGET_SUB_ID_ON_FOCUS_REGION,
@@ -1247,7 +1247,7 @@ enum
1247 ELM_WIDGET_SUB_ID_CAN_FOCUS_CHILD_LIST_GET, 1247 ELM_WIDGET_SUB_ID_CAN_FOCUS_CHILD_LIST_GET,
1248 ELM_WIDGET_SUB_ID_NEWEST_FOCUS_ORDER_GET, 1248 ELM_WIDGET_SUB_ID_NEWEST_FOCUS_ORDER_GET,
1249#if 0 1249#if 0
1250 ELM_WIDGET_SUB_ID_THEME, /* API + virtual*/ 1250 ELM_WIDGET_SUB_ID_THEME_APPLY, /* API + virtual*/
1251 ELM_WIDGET_SUB_ID_THEME_SPECIFIC, 1251 ELM_WIDGET_SUB_ID_THEME_SPECIFIC,
1252 ELM_WIDGET_SUB_ID_TRANSLATE, /* API + virtual*/ 1252 ELM_WIDGET_SUB_ID_TRANSLATE, /* API + virtual*/
1253#endif 1253#endif
@@ -1293,7 +1293,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l);
1293 * @param[out] ret 1293 * @param[out] ret
1294 * 1294 *
1295 */ 1295 */
1296#define elm_wdg_theme(ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), EO_TYPECHECK(Eina_Bool *, ret) 1296#define elm_wdg_theme_apply(ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), EO_TYPECHECK(Eina_Bool *, ret)
1297 1297
1298/** 1298/**
1299 * @def elm_wdg_translate 1299 * @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)
5269 5269
5270 if (ret) *ret = EINA_TRUE; 5270 if (ret) *ret = EINA_TRUE;
5271 5271
5272 eo_do_super(obj, MY_CLASS, elm_wdg_theme(&int_ret)); 5272 eo_do_super(obj, MY_CLASS, elm_wdg_theme_apply(&int_ret));
5273 if (!int_ret) return; 5273 if (!int_ret) return;
5274 5274
5275 sd->focus_highlight.theme_changed = EINA_TRUE; 5275 sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -5586,7 +5586,7 @@ _class_constructor(Eo_Class *klass)
5586 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_win_smart_focus_next), 5586 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_NEXT), _elm_win_smart_focus_next),
5587 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_win_smart_focus_direction_manager_is), 5587 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_win_smart_focus_direction_manager_is),
5588 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_win_smart_focus_direction), 5588 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_win_smart_focus_direction),
5589 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_win_smart_theme), 5589 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME_APPLY), _elm_win_smart_theme),
5590 5590
5591 EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR), _win_constructor), 5591 EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR), _win_constructor),
5592 EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD), _resize_object_add), 5592 EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD), _resize_object_add),