summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:36:41 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:36:41 -0500
commit644b771fe43ad76a70de8f6e1a07ca9159c3458c (patch)
tree0640b7519233d4691ae0b43ee29470da97e1c327 /src/lib
parent2f007f7a08b680988c6a4728f2809facebec6f79 (diff)
efl.ui: Efl.Ui.Theme_Apply_Result -> Efl.Ui.Theme_Apply_Error
Summary: this swaps the values of "no error" and "error" in order to maintain consistency with the rest of efl where the zero value means "no error" Depends on D8060 Reviewers: cedric Reviewed By: cedric Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl_api Differential Revision: https://phab.enlightenment.org/D8063
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui.eot8
-rw-r--r--src/lib/elementary/efl_ui_bg.c4
-rw-r--r--src/lib/elementary/efl_ui_button.c10
-rw-r--r--src/lib/elementary/efl_ui_calendar.c10
-rw-r--r--src/lib/elementary/efl_ui_check.c15
-rw-r--r--src/lib/elementary/efl_ui_clock.c10
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c8
-rw-r--r--src/lib/elementary/efl_ui_flip.c6
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_grid_default_item.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c6
-rw-r--r--src/lib/elementary/efl_ui_layout.c26
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo4
-rw-r--r--src/lib/elementary/efl_ui_list.c10
-rw-r--r--src/lib/elementary/efl_ui_list_default_item.c4
-rw-r--r--src/lib/elementary/efl_ui_list_empty_item.c4
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c8
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c8
-rw-r--r--src/lib/elementary/efl_ui_nstate.c6
-rw-r--r--src/lib/elementary/efl_ui_pager.c8
-rw-r--r--src/lib/elementary/efl_ui_panel.c8
-rw-r--r--src/lib/elementary/efl_ui_panes.c10
-rw-r--r--src/lib/elementary/efl_ui_popup.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c23
-rw-r--r--src/lib/elementary/efl_ui_radio.c14
-rw-r--r--src/lib/elementary/efl_ui_scroller.c6
-rw-r--r--src/lib/elementary/efl_ui_slider.c16
-rw-r--r--src/lib/elementary/efl_ui_spin.c8
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c17
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c13
-rw-r--r--src/lib/elementary/efl_ui_tab_page.c9
-rw-r--r--src/lib/elementary/efl_ui_table.c6
-rw-r--r--src/lib/elementary/efl_ui_tags.c6
-rw-r--r--src/lib/elementary/efl_ui_text.c12
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.c2
-rw-r--r--src/lib/elementary/efl_ui_textpath.c6
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c8
-rw-r--r--src/lib/elementary/efl_ui_video.c4
-rw-r--r--src/lib/elementary/efl_ui_widget.c74
-rw-r--r--src/lib/elementary/efl_ui_widget.eo6
-rw-r--r--src/lib/elementary/efl_ui_win.c22
-rw-r--r--src/lib/elementary/elc_combobox.c8
-rw-r--r--src/lib/elementary/elc_ctxpopup.c8
-rw-r--r--src/lib/elementary/elc_fileselector.c6
-rw-r--r--src/lib/elementary/elc_fileselector_button.c8
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c10
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elc_player.c6
-rw-r--r--src/lib/elementary/elc_popup.c4
-rw-r--r--src/lib/elementary/elm_actionslider.c8
-rw-r--r--src/lib/elementary/elm_box.c8
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_clock.c6
-rw-r--r--src/lib/elementary/elm_code_widget.c12
-rw-r--r--src/lib/elementary/elm_colorselector.c8
-rw-r--r--src/lib/elementary/elm_conform.c6
-rw-r--r--src/lib/elementary/elm_dayselector.c6
-rw-r--r--src/lib/elementary/elm_diskselector.c6
-rw-r--r--src/lib/elementary/elm_entry.c22
-rw-r--r--src/lib/elementary/elm_flipselector.c8
-rw-r--r--src/lib/elementary/elm_gengrid.c10
-rw-r--r--src/lib/elementary/elm_genlist.c10
-rw-r--r--src/lib/elementary/elm_grid.c6
-rw-r--r--src/lib/elementary/elm_hover.c6
-rw-r--r--src/lib/elementary/elm_icon.c6
-rw-r--r--src/lib/elementary/elm_index.c6
-rw-r--r--src/lib/elementary/elm_label.c8
-rw-r--r--src/lib/elementary/elm_list.c6
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c8
-rw-r--r--src/lib/elementary/elm_mapbuf.c6
-rw-r--r--src/lib/elementary/elm_menu.c6
-rw-r--r--src/lib/elementary/elm_notify.c8
-rw-r--r--src/lib/elementary/elm_panel.c8
-rw-r--r--src/lib/elementary/elm_photo.c6
-rw-r--r--src/lib/elementary/elm_plug.c6
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/elementary/elm_route.c6
-rw-r--r--src/lib/elementary/elm_scroller.c6
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_separator.c6
-rw-r--r--src/lib/elementary/elm_slider.c10
-rw-r--r--src/lib/elementary/elm_spinner.c10
-rw-r--r--src/lib/elementary/elm_table.c6
-rw-r--r--src/lib/elementary/elm_theme.c17
-rw-r--r--src/lib/elementary/elm_toolbar.c10
-rw-r--r--src/lib/elementary/elm_widget.h8
-rw-r--r--src/lib/elementary/els_cursor.c12
-rw-r--r--src/lib/elementary/els_tooltip.c4
-rw-r--r--src/lib/elementary/elu_ews_wm.c2
94 files changed, 429 insertions, 403 deletions
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index ea61daf..7f643fd 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -1,14 +1,14 @@
1/* Efl.Ui enum and struct types */ 1/* Efl.Ui enum and struct types */
2 2
3enum Efl.Ui.Theme_Apply_Result 3enum Efl.Ui.Theme_Apply_Error
4{ 4{
5 [[Return error code when setting the style on a widget.]] 5 [[Return error code when setting the style on a widget.]]
6 fail = 0, [[Failed to apply theme. The widget may become unusable.]] 6 none = 0, [[Successfully applied the requested style from the current
7 theme.]]
7 default = 1, [[Successfully applied the default style. The widget may 8 default = 1, [[Successfully applied the default style. The widget may
8 look different from the rest of the UI if a custom theme 9 look different from the rest of the UI if a custom theme
9 is in use, but it should be usable.]] 10 is in use, but it should be usable.]]
10 success = 3 [[Successfully applied the requested style from the current 11 generic = 2, [[Failed to apply theme. The widget may become unusable.]]
11 theme.]]
12} 12}
13 13
14enum Efl.Ui.Focus.Direction 14enum Efl.Ui.Focus.Direction
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 54b29d9..ad7b69e 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -32,10 +32,10 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
32 elm_widget_sub_object_parent_add(obj); 32 elm_widget_sub_object_parent_add(obj);
33 elm_widget_can_focus_set(obj, EINA_FALSE); 33 elm_widget_can_focus_set(obj, EINA_FALSE);
34 34
35 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 35 if (elm_widget_theme_object_set(obj, wd->resize_obj,
36 elm_widget_theme_klass_get(obj), 36 elm_widget_theme_klass_get(obj),
37 elm_widget_theme_element_get(obj), 37 elm_widget_theme_element_get(obj),
38 elm_widget_theme_style_get(obj))) 38 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
39 CRI("Failed to set layout!"); 39 CRI("Failed to set layout!");
40 40
41 if (elm_widget_is_legacy(obj)) 41 if (elm_widget_is_legacy(obj))
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 1be677d..f854881 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -255,10 +255,10 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
255 255
256 elm_widget_can_focus_set(obj, EINA_TRUE); 256 elm_widget_can_focus_set(obj, EINA_TRUE);
257 257
258 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 258 if (elm_widget_theme_object_set(obj, wd->resize_obj,
259 elm_widget_theme_klass_get(obj), 259 elm_widget_theme_klass_get(obj),
260 elm_widget_theme_element_get(obj), 260 elm_widget_theme_element_get(obj),
261 elm_widget_theme_style_get(obj))) 261 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
262 CRI("Failed to set layout!"); 262 CRI("Failed to set layout!");
263} 263}
264 264
@@ -442,13 +442,13 @@ _icon_signal_emit(Evas_Object *obj)
442/* FIXME: replicated from elm_layout just because button's icon spot 442/* FIXME: replicated from elm_layout just because button's icon spot
443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
444 * can changed the theme API */ 444 * can changed the theme API */
445EOLIAN static Efl_Ui_Theme_Apply_Result 445EOLIAN static Efl_Ui_Theme_Apply_Error
446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
447{ 447{
448 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 448 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
449 449
450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS)); 450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS));
451 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 451 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
452 _icon_signal_emit(obj); 452 _icon_signal_emit(obj);
453 453
454 return int_ret; 454 return int_ret;
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 3e5d34d..b2602d3 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -510,13 +510,13 @@ _spinner_buttons_add(Evas_Object *obj, Efl_Ui_Calendar_Data *sd)
510 } 510 }
511} 511}
512 512
513EOLIAN static Efl_Ui_Theme_Apply_Result 513EOLIAN static Efl_Ui_Theme_Apply_Error
514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) 514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
515{ 515{
516 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 516 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
517 517
518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
519 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 519 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
520 520
521 _spinner_buttons_add(obj, sd); 521 _spinner_buttons_add(obj, sd);
522 522
@@ -938,10 +938,10 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
938 938
939 if (!elm_widget_theme_klass_get(obj)) 939 if (!elm_widget_theme_klass_get(obj))
940 elm_widget_theme_klass_set(obj, "calendar"); 940 elm_widget_theme_klass_set(obj, "calendar");
941 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 941 if (elm_widget_theme_object_set(obj, wd->resize_obj,
942 elm_widget_theme_klass_get(obj), 942 elm_widget_theme_klass_get(obj),
943 elm_widget_theme_element_get(obj), 943 elm_widget_theme_element_get(obj),
944 elm_widget_theme_style_get(obj))) 944 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
945 CRI("Failed to set layout!"); 945 CRI("Failed to set layout!");
946 946
947 evas_object_smart_changed(obj); 947 evas_object_smart_changed(obj);
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 6b5dd01..b079796 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -135,16 +135,15 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
135 return EINA_TRUE; 135 return EINA_TRUE;
136} 136}
137 137
138EOLIAN static Efl_Ui_Theme_Apply_Result 138EOLIAN static Efl_Ui_Theme_Apply_Error
139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
140{ 140{
141 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 141 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
142 142
143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
144 144
145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
146 146 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
147 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL;
148 147
149 if (elm_widget_is_legacy(obj)) 148 if (elm_widget_is_legacy(obj))
150 { 149 {
@@ -492,13 +491,13 @@ _icon_signal_emit(Evas_Object *obj)
492/* FIXME: replicated from elm_layout just because check's icon spot 491/* FIXME: replicated from elm_layout just because check's icon spot
493 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 492 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
494 * can changed the theme API */ 493 * can changed the theme API */
495EOLIAN static Efl_Ui_Theme_Apply_Result 494EOLIAN static Efl_Ui_Theme_Apply_Error
496_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 495_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
497{ 496{
498 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 497 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
499 498
500 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); 499 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS));
501 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 500 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
502 501
503 _icon_signal_emit(obj); 502 _icon_signal_emit(obj);
504 503
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index e5a2eb9..c44b47a 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -514,10 +514,10 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
514 evas_object_size_hint_max_set(obj, -1, -1); 514 evas_object_size_hint_max_set(obj, -1, -1);
515} 515}
516 516
517EOLIAN static Efl_Ui_Theme_Apply_Result 517EOLIAN static Efl_Ui_Theme_Apply_Error
518_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) 518_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
519{ 519{
520 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 520 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
521 521
522 Clock_Field *field; 522 Clock_Field *field;
523 char buf[BUFFER_SIZE]; 523 char buf[BUFFER_SIZE];
@@ -527,7 +527,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
527 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 527 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
528 528
529 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 529 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
530 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 530 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
531 531
532 dt_mod = _dt_mod_init(); 532 dt_mod = _dt_mod_init();
533 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE; 533 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;
@@ -857,10 +857,10 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
857 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 857 efl_canvas_group_add(efl_super(obj, MY_CLASS));
858 elm_widget_sub_object_parent_add(obj); 858 elm_widget_sub_object_parent_add(obj);
859 859
860 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 860 if (elm_widget_theme_object_set(obj, wd->resize_obj,
861 elm_widget_theme_klass_get(obj), 861 elm_widget_theme_klass_get(obj),
862 elm_widget_theme_element_get(obj), 862 elm_widget_theme_element_get(obj),
863 elm_widget_theme_style_get(obj))) 863 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
864 CRI("Failed to set layout!"); 864 CRI("Failed to set layout!");
865 865
866 // module - initialise module for clock 866 // module - initialise module for clock
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 493dbfa..872f67b 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -244,10 +244,10 @@ _efl_ui_datepicker_efl_object_constructor(Eo *obj, Efl_Ui_Datepicker_Data *pd)
244 elm_widget_theme_klass_set(obj, "datepicker"); 244 elm_widget_theme_klass_set(obj, "datepicker");
245 obj = efl_constructor(efl_super(obj, MY_CLASS)); 245 obj = efl_constructor(efl_super(obj, MY_CLASS));
246 246
247 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 247 if (elm_widget_theme_object_set(obj, wd->resize_obj,
248 elm_widget_theme_klass_get(obj), 248 elm_widget_theme_klass_get(obj),
249 elm_widget_theme_element_get(obj), 249 elm_widget_theme_element_get(obj),
250 elm_widget_theme_style_get(obj))) 250 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
251 CRI("Failed to set layout!"); 251 CRI("Failed to set layout!");
252 252
253 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj); 253 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj);
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 7461505..84b4683 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -97,12 +97,12 @@ _sizing_eval(Evas_Object *obj)
97 evas_object_size_hint_max_set(obj, maxw, maxh); 97 evas_object_size_hint_max_set(obj, maxw, maxh);
98} 98}
99 99
100EOLIAN static Efl_Ui_Theme_Apply_Result 100EOLIAN static Efl_Ui_Theme_Apply_Error
101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 103 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
108 108
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 686fdc6..45d1f91 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -136,10 +136,10 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
136 136
137 elm_widget_can_focus_set(obj, EINA_FALSE); 137 elm_widget_can_focus_set(obj, EINA_FALSE);
138 138
139 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 139 if (elm_widget_theme_object_set(obj, wd->resize_obj,
140 elm_widget_theme_klass_get(obj), 140 elm_widget_theme_klass_get(obj),
141 elm_widget_theme_element_get(obj), 141 elm_widget_theme_element_get(obj),
142 elm_widget_theme_style_get(obj))) 142 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
143 CRI("Failed to set layout!"); 143 CRI("Failed to set layout!");
144 144
145 elm_layout_sizing_eval(obj); 145 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index a42dcbb..863a880 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -844,12 +844,12 @@ _efl_ui_grid_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Gr
844} 844}
845 845
846 846
847EOLIAN static Efl_Ui_Theme_Apply_Result 847EOLIAN static Efl_Ui_Theme_Apply_Error
848_efl_ui_grid_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd) 848_efl_ui_grid_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd)
849{ 849{
850 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 850 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
851 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 851 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
852 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 852 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
853 853
854 efl_ui_mirrored_set(pd->smanager, efl_ui_mirrored_get(obj)); 854 efl_ui_mirrored_set(pd->smanager, efl_ui_mirrored_get(obj));
855 855
diff --git a/src/lib/elementary/efl_ui_grid_default_item.c b/src/lib/elementary/efl_ui_grid_default_item.c
index ffc5e67..d874823 100644
--- a/src/lib/elementary/efl_ui_grid_default_item.c
+++ b/src/lib/elementary/efl_ui_grid_default_item.c
@@ -23,9 +23,9 @@ _efl_ui_grid_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
23 Eo *eo; 23 Eo *eo;
24 eo = efl_finalize(efl_super(obj, MY_CLASS)); 24 eo = efl_finalize(efl_super(obj, MY_CLASS));
25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
26 Efl_Ui_Theme_Apply_Result theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL); 26 Efl_Ui_Theme_Apply_Error theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL);
27 27
28 if (theme_apply == EFL_UI_THEME_APPLY_RESULT_FAIL) 28 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC)
29 CRI("Default Item(%p) failed to set theme [efl/grid_item]!", eo); 29 CRI("Default Item(%p) failed to set theme [efl/grid_item]!", eo);
30 return eo; 30 return eo;
31} 31}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 479f1e4..91b70a2 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -717,16 +717,16 @@ _efl_ui_image_efl_canvas_object_clipper_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas
717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); 717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
718} 718}
719 719
720EOLIAN static Efl_Ui_Theme_Apply_Result 720EOLIAN static Efl_Ui_Theme_Apply_Error
721_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) 721_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
722{ 722{
723 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 723 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
724 724
725 if (sd->stdicon) 725 if (sd->stdicon)
726 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 726 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
727 727
728 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 728 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
729 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 729 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
730 730
731 _efl_ui_image_sizing_eval(obj); 731 _efl_ui_image_sizing_eval(obj);
732 732
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 21d3d6f..51506f5 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -920,17 +920,17 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image
920 return EINA_TRUE; 920 return EINA_TRUE;
921} 921}
922 922
923EOLIAN static Efl_Ui_Theme_Apply_Result 923EOLIAN static Efl_Ui_Theme_Apply_Error
924_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) 924_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
925{ 925{
926 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 926 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
927 Eina_Bool fdo = EINA_FALSE; 927 Eina_Bool fdo = EINA_FALSE;
928 928
929 if (sd->stdicon) 929 if (sd->stdicon)
930 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE); 930 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE);
931 931
932 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 932 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
933 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 933 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
934 934
935 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); 935 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
936 936
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 17260f4..3e90016 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -445,12 +445,12 @@ _efl_ui_layout_base_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Layout_Data *_pd
445 _flush_mirrored_state(obj); 445 _flush_mirrored_state(obj);
446} 446}
447 447
448static Efl_Ui_Theme_Apply_Result 448static Efl_Ui_Theme_Apply_Error
449_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) 449_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
450{ 450{
451 Efl_Ui_Theme_Apply_Result ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 451 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
452 452
453 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 453 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
454 454
455 /* function already prints error messages, if any */ 455 /* function already prints error messages, if any */
456 if (!sd->file_set) 456 if (!sd->file_set)
@@ -462,22 +462,22 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
462 elm_widget_theme_style_get(obj)); 462 elm_widget_theme_style_get(obj));
463 } 463 }
464 464
465 if (ret) 465 if (ret != EFL_UI_THEME_APPLY_ERROR_GENERIC)
466 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); 466 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
467 467
468 if (!_visuals_refresh(obj, sd)) 468 if (!_visuals_refresh(obj, sd))
469 ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 469 ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
470 470
471 return ret; 471 return ret;
472} 472}
473 473
474EOLIAN static Efl_Ui_Theme_Apply_Result 474EOLIAN static Efl_Ui_Theme_Apply_Error
475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) 475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
476{ 476{
477 Efl_Ui_Theme_Apply_Result theme_apply_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 477 Efl_Ui_Theme_Apply_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
478 478
479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
480 if (!theme_apply_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 480 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
481 481
482 theme_apply_ret &= _efl_ui_layout_theme_internal(obj, sd); 482 theme_apply_ret &= _efl_ui_layout_theme_internal(obj, sd);
483 return theme_apply_ret; 483 return theme_apply_ret;
@@ -920,7 +920,7 @@ _efl_ui_layout_base_theme_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
920 if (style) *style = elm_widget_theme_style_get(obj); 920 if (style) *style = elm_widget_theme_style_get(obj);
921} 921}
922 922
923EOLIAN static Efl_Ui_Theme_Apply_Result 923EOLIAN static Efl_Ui_Theme_Apply_Error
924_efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) 924_efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style)
925{ 925{
926 Eina_Bool changed = EINA_FALSE; 926 Eina_Bool changed = EINA_FALSE;
@@ -928,7 +928,7 @@ _efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass
928 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) 928 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
929 { 929 {
930 ERR("Efl.Ui.Layout_theme can only be set before finalize!"); 930 ERR("Efl.Ui.Layout_theme can only be set before finalize!");
931 return EFL_UI_THEME_APPLY_RESULT_FAIL; 931 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
932 } 932 }
933 933
934 if (sd->file_set) sd->file_set = EINA_FALSE; 934 if (sd->file_set) sd->file_set = EINA_FALSE;
@@ -939,7 +939,7 @@ _efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass
939 939
940 if (changed) 940 if (changed)
941 return efl_ui_widget_theme_apply(obj); 941 return efl_ui_widget_theme_apply(obj);
942 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 942 return EFL_UI_THEME_APPLY_ERROR_NONE;
943} 943}
944 944
945EOLIAN static void 945EOLIAN static void
@@ -2944,10 +2944,10 @@ elm_layout_data_get(const Evas_Object *obj, const char *key)
2944EAPI Eina_Bool 2944EAPI Eina_Bool
2945elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style) 2945elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style)
2946{ 2946{
2947 Efl_Ui_Theme_Apply_Result theme_apply_ret; 2947 Efl_Ui_Theme_Apply_Error theme_apply_ret;
2948 2948
2949 theme_apply_ret = efl_ui_layout_theme_set(obj, klass, group, style); 2949 theme_apply_ret = efl_ui_layout_theme_set(obj, klass, group, style);
2950 return (theme_apply_ret != EFL_UI_THEME_APPLY_RESULT_FAIL); 2950 return (theme_apply_ret != EFL_UI_THEME_APPLY_ERROR_GENERIC);
2951} 2951}
2952 2952
2953#include "efl_ui_layout_legacy.eo.c" 2953#include "efl_ui_layout_legacy.eo.c"
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index 5525aa0..e63d7dc 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -30,9 +30,9 @@ abstract @beta Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container
30 If this returns $false the widget is very likely to become 30 If this returns $false the widget is very likely to become
31 non-functioning. 31 non-functioning.
32 ]] 32 ]]
33 return: Efl.Ui.Theme_Apply_Result(0); 33 return: Efl.Ui.Theme_Apply_Error(2);
34 [[Whether the style was successfully applied or not, see 34 [[Whether the style was successfully applied or not, see
35 the values of @Efl.Ui.Theme_Apply_Result for more information.]] 35 the values of @Efl.Ui.Theme_Apply_Error for more information.]]
36 } 36 }
37 get { 37 get {
38 [[Get information about the current theme in use.]] 38 [[Get information about the current theme in use.]]
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 148e8f4..f27beb0 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -426,8 +426,8 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
426 426
427 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 427 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
428 428
429 Efl_Ui_Theme_Apply_Result theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj)); 429 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj));
430 if (theme_apply_ret == EFL_UI_THEME_APPLY_RESULT_FAIL) 430 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
431 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL"); 431 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL");
432 432
433 pd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj); 433 pd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj);
@@ -599,12 +599,12 @@ _efl_ui_list_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_List_Data
599 } 599 }
600 */ 600 */
601 601
602EOLIAN static Efl_Ui_Theme_Apply_Result 602EOLIAN static Efl_Ui_Theme_Apply_Error
603_efl_ui_list_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_List_Data *pd) 603_efl_ui_list_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_List_Data *pd)
604{ 604{
605 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 605 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
606 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 606 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
607 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 607 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
608 608
609 efl_ui_mirrored_set(pd->smanager, efl_ui_mirrored_get(obj)); 609 efl_ui_mirrored_set(pd->smanager, efl_ui_mirrored_get(obj));
610 610
diff --git a/src/lib/elementary/efl_ui_list_default_item.c b/src/lib/elementary/efl_ui_list_default_item.c
index 98138b1..2021d84 100644
--- a/src/lib/elementary/efl_ui_list_default_item.c
+++ b/src/lib/elementary/efl_ui_list_default_item.c
@@ -23,9 +23,9 @@ _efl_ui_list_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
23 Eo *eo; 23 Eo *eo;
24 eo = efl_finalize(efl_super(obj, MY_CLASS)); 24 eo = efl_finalize(efl_super(obj, MY_CLASS));
25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
26 Efl_Ui_Theme_Apply_Result theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL); 26 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL);
27 27
28 if (theme_apply_ret == EFL_UI_THEME_APPLY_RESULT_FAIL) 28 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
29 CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo); 29 CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo);
30 return eo; 30 return eo;
31} 31}
diff --git a/src/lib/elementary/efl_ui_list_empty_item.c b/src/lib/elementary/efl_ui_list_empty_item.c
index 3325950..168be2d 100644
--- a/src/lib/elementary/efl_ui_list_empty_item.c
+++ b/src/lib/elementary/efl_ui_list_empty_item.c
@@ -21,9 +21,9 @@ _efl_ui_list_empty_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
21 Eo *eo; 21 Eo *eo;
22 eo = efl_finalize(efl_super(obj, MY_CLASS)); 22 eo = efl_finalize(efl_super(obj, MY_CLASS));
23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
24 Efl_Ui_Theme_Apply_Result theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty"); 24 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty");
25 25
26 if (theme_apply_ret == EFL_UI_THEME_APPLY_RESULT_FAIL) 26 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
27 CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo); 27 CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo);
28 return eo; 28 return eo;
29} 29}
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 035d922..e8102ba 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -42,10 +42,10 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
42 elm_widget_sub_object_parent_add(obj); 42 elm_widget_sub_object_parent_add(obj);
43 43
44 elm_widget_can_focus_set(obj, EINA_TRUE); 44 elm_widget_can_focus_set(obj, EINA_TRUE);
45 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 45 if (elm_widget_theme_object_set(obj, wd->resize_obj,
46 elm_widget_theme_klass_get(obj), 46 elm_widget_theme_klass_get(obj),
47 elm_widget_theme_element_get(obj), 47 elm_widget_theme_element_get(obj),
48 elm_widget_theme_style_get(obj))) 48 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
49 CRI("Failed to set layout!"); 49 CRI("Failed to set layout!");
50 50
51 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj, 51 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index 16bcea2..0b59884 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -40,10 +40,10 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
40 elm_widget_sub_object_parent_add(obj); 40 elm_widget_sub_object_parent_add(obj);
41 41
42 elm_widget_can_focus_set(obj, EINA_TRUE); 42 elm_widget_can_focus_set(obj, EINA_TRUE);
43 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 43 if (elm_widget_theme_object_set(obj, wd->resize_obj,
44 elm_widget_theme_klass_get(obj), 44 elm_widget_theme_klass_get(obj),
45 elm_widget_theme_element_get(obj), 45 elm_widget_theme_element_get(obj),
46 elm_widget_theme_style_get(obj))) 46 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
47 CRI("Failed to set layout!"); 47 CRI("Failed to set layout!");
48 48
49 return obj; 49 return obj;
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 8a16d25..341f2b3 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -116,13 +116,13 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state)
116 _state_active(obj, pd); 116 _state_active(obj, pd);
117} 117}
118 118
119EOLIAN static Efl_Ui_Theme_Apply_Result 119EOLIAN static Efl_Ui_Theme_Apply_Error
120_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) 120_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
121{ 121{
122 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 122 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
123 123
124 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 124 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
125 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 125 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
126 126
127 _state_signal_emit(obj, pd); 127 _state_signal_emit(obj, pd);
128 128
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index cacdac5..b8ceb97 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -328,10 +328,10 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
328 328
329 obj = efl_constructor(efl_super(obj, MY_CLASS)); 329 obj = efl_constructor(efl_super(obj, MY_CLASS));
330 330
331 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 331 if (elm_widget_theme_object_set(obj, wd->resize_obj,
332 elm_widget_theme_klass_get(obj), 332 elm_widget_theme_klass_get(obj),
333 elm_widget_theme_element_get(obj), 333 elm_widget_theme_element_get(obj),
334 elm_widget_theme_style_get(obj))) 334 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
335 CRI("Failed to set layout!"); 335 CRI("Failed to set layout!");
336 336
337 elm_widget_sub_object_parent_add(obj); 337 elm_widget_sub_object_parent_add(obj);
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index 285cebf..48f854c 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -198,18 +198,18 @@ _scrollable_layout_theme_set(Eo *obj, Efl_Ui_Panel_Data *sd)
198 _access_obj_process(obj, EINA_TRUE); 198 _access_obj_process(obj, EINA_TRUE);
199} 199}
200 200
201EOLIAN static Efl_Ui_Theme_Apply_Result 201EOLIAN static Efl_Ui_Theme_Apply_Error
202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd) 202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd)
203{ 203{
204 const char *str; 204 const char *str;
205 Evas_Coord minw = 0, minh = 0; 205 Evas_Coord minw = 0, minh = 0;
206 206
207 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 207 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
208 208
209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
210 210
211 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 211 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
212 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 212 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
213 213
214 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 214 _mirrored_set(obj, efl_ui_mirrored_get(obj));
215 215
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 285a6eb..d7a13b4 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -110,14 +110,14 @@ _efl_ui_panes_theme_group_get(Evas_Object *obj, Efl_Ui_Panes_Data *sd)
110 return eina_strbuf_release(new_group); 110 return eina_strbuf_release(new_group);
111} 111}
112 112
113EOLIAN static Efl_Ui_Theme_Apply_Result 113EOLIAN static Efl_Ui_Theme_Apply_Error
114_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) 114_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
115{ 115{
116 double size; 116 double size;
117 Evas_Coord minw = 0, minh = 0; 117 Evas_Coord minw = 0, minh = 0;
118 char *group; 118 char *group;
119 119
120 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 120 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
121 121
122 group = _efl_ui_panes_theme_group_get(obj, sd); 122 group = _efl_ui_panes_theme_group_get(obj, sd);
123 if (group) 123 if (group)
@@ -131,7 +131,7 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
131 evas_object_size_hint_min_set(sd->event, minw, minh); 131 evas_object_size_hint_min_set(sd->event, minw, minh);
132 132
133 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 133 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
134 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 134 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
135 135
136 size = elm_panes_content_left_size_get(obj); 136 size = elm_panes_content_left_size_get(obj);
137 137
@@ -411,10 +411,10 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
411 elm_widget_sub_object_parent_add(obj); 411 elm_widget_sub_object_parent_add(obj);
412 412
413 group = _efl_ui_panes_theme_group_get(obj, sd); 413 group = _efl_ui_panes_theme_group_get(obj, sd);
414 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 414 if (elm_widget_theme_object_set(obj, wd->resize_obj,
415 elm_widget_theme_klass_get(obj), 415 elm_widget_theme_klass_get(obj),
416 group, 416 group,
417 elm_widget_theme_style_get(obj))) 417 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
418 CRI("Failed to set layout!"); 418 CRI("Failed to set layout!");
419 419
420 free(group); 420 free(group);
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index f48e304..cc8772d 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -218,10 +218,10 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
218 elm_widget_sub_object_parent_add(obj); 218 elm_widget_sub_object_parent_add(obj);
219 219
220 elm_widget_can_focus_set(obj, EINA_TRUE); 220 elm_widget_can_focus_set(obj, EINA_TRUE);
221 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 221 if (elm_widget_theme_object_set(obj, wd->resize_obj,
222 elm_widget_theme_klass_get(obj), 222 elm_widget_theme_klass_get(obj),
223 elm_widget_theme_element_get(obj), 223 elm_widget_theme_element_get(obj),
224 elm_widget_theme_style_get(obj))) 224 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
225 CRI("Failed to set layout!"); 225 CRI("Failed to set layout!");
226 226
227 pd->backwall = edje_object_add(evas_object_evas_get(obj)); 227 pd->backwall = edje_object_add(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index ccaaf7e..ecd6cc7 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -232,11 +232,11 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s
232 return eina_strbuf_release(new_group); 232 return eina_strbuf_release(new_group);
233} 233}
234 234
235EOLIAN static Efl_Ui_Theme_Apply_Result 235EOLIAN static Efl_Ui_Theme_Apply_Error
236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) 236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
237{ 237{
238 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 238 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
240 char *group; 240 char *group;
241 241
242 group = _efl_ui_progressbar_theme_group_get(obj, sd); 242 group = _efl_ui_progressbar_theme_group_get(obj, sd);
@@ -247,7 +247,7 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
247 } 247 }
248 248
249 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 249 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
250 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 250 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
251 251
252 if (elm_widget_is_legacy(obj)) 252 if (elm_widget_is_legacy(obj))
253 { 253 {
@@ -366,11 +366,10 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
366 priv->val_max = 1.0; 366 priv->val_max = 1.0;
367 group = _efl_ui_progressbar_theme_group_get(obj, priv); 367 group = _efl_ui_progressbar_theme_group_get(obj, priv);
368 368
369 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 369 if (elm_widget_theme_object_set(obj, wd->resize_obj,
370 elm_widget_theme_klass_get(obj), 370 elm_widget_theme_klass_get(obj),
371 group, 371 group,
372 elm_widget_theme_style_get(obj))) 372 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
373 CRI("Failed to set layout!");
374 373
375 free(group); 374 free(group);
376 375
@@ -820,13 +819,13 @@ _icon_signal_emit(Evas_Object *obj)
820/* FIXME: replicated from elm_layout just because progressbar's icon spot 819/* FIXME: replicated from elm_layout just because progressbar's icon spot
821 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 820 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
822 * can changed the theme API */ 821 * can changed the theme API */
823EOLIAN static Efl_Ui_Theme_Apply_Result 822EOLIAN static Efl_Ui_Theme_Apply_Error
824_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 823_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
825{ 824{
826 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 825 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
827 826
828 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS)); 827 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS));
829 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 828 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
830 _icon_signal_emit(obj); 829 _icon_signal_emit(obj);
831 830
832 return int_ret; 831 return int_ret;
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 009ca71..cdb6678 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -147,13 +147,13 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
147 return EINA_TRUE; 147 return EINA_TRUE;
148} 148}
149 149
150EOLIAN static Efl_Ui_Theme_Apply_Result 150EOLIAN static Efl_Ui_Theme_Apply_Error
151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) 151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
152{ 152{
153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
154 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 154 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
156 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 156 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
157 157
158 if (elm_widget_is_legacy(obj)) 158 if (elm_widget_is_legacy(obj))
159 { 159 {
@@ -414,12 +414,12 @@ _icon_signal_emit(Evas_Object *obj)
414 elm_layout_sizing_eval(obj); 414 elm_layout_sizing_eval(obj);
415} 415}
416 416
417EOLIAN static Efl_Ui_Theme_Apply_Result 417EOLIAN static Efl_Ui_Theme_Apply_Error
418_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 418_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
419{ 419{
420 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 420 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
421 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS)); 421 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS));
422 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 422 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
423 423
424 /* FIXME: replicated from elm_layout just because radio's icon 424 /* FIXME: replicated from elm_layout just because radio's icon
425 * spot is elm.swallow.content, not elm.swallow.icon. Fix that 425 * spot is elm.swallow.content, not elm.swallow.icon. Fix that
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 52af40b..72d1786 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -678,12 +678,12 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
678 efl_gfx_hint_size_min_set(obj, size); 678 efl_gfx_hint_size_min_set(obj, size);
679} 679}
680 680
681EOLIAN static Efl_Ui_Theme_Apply_Result 681EOLIAN static Efl_Ui_Theme_Apply_Error
682_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) 682_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
683{ 683{
684 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 684 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
685 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 685 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
686 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 686 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
687 687
688 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); 688 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
689 689
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index e0953a1..fbb11ed 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -423,11 +423,11 @@ _efl_ui_slider_theme_group_get(Evas_Object *obj, Efl_Ui_Slider_Data *sd)
423 return eina_strbuf_release(new_group); 423 return eina_strbuf_release(new_group);
424} 424}
425 425
426EOLIAN static Efl_Ui_Theme_Apply_Result 426EOLIAN static Efl_Ui_Theme_Apply_Error
427_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) 427_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
428{ 428{
429 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 429 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
430 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 430 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
431 char *group; 431 char *group;
432 432
433 group = _efl_ui_slider_theme_group_get(obj, sd); 433 group = _efl_ui_slider_theme_group_get(obj, sd);
@@ -438,7 +438,7 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
438 } 438 }
439 439
440 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 440 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
441 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 441 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
442 442
443 if (elm_widget_is_legacy(obj)) 443 if (elm_widget_is_legacy(obj))
444 { 444 {
@@ -640,10 +640,10 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
640 elm_widget_sub_object_parent_add(obj); 640 elm_widget_sub_object_parent_add(obj);
641 641
642 group = _efl_ui_slider_theme_group_get(obj, priv); 642 group = _efl_ui_slider_theme_group_get(obj, priv);
643 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 643 if (elm_widget_theme_object_set(obj, wd->resize_obj,
644 elm_widget_theme_klass_get(obj), 644 elm_widget_theme_klass_get(obj),
645 group, 645 group,
646 elm_widget_theme_style_get(obj))) 646 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
647 CRI("Failed to set layout!"); 647 CRI("Failed to set layout!");
648 648
649 free(group); 649 free(group);
diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c
index a3b345e..9f85d87 100644
--- a/src/lib/elementary/efl_ui_spin.c
+++ b/src/lib/elementary/efl_ui_spin.c
@@ -245,10 +245,10 @@ _efl_ui_spin_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Data *sd)
245 sd->step = 1.0; 245 sd->step = 1.0;
246 sd->special_values = eina_array_new(sizeof(Efl_Ui_Spin_Special_Value)); 246 sd->special_values = eina_array_new(sizeof(Efl_Ui_Spin_Special_Value));
247 247
248 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 248 if (elm_widget_theme_object_set(obj, wd->resize_obj,
249 elm_widget_theme_klass_get(obj), 249 elm_widget_theme_klass_get(obj),
250 elm_widget_theme_element_get(obj), 250 elm_widget_theme_element_get(obj),
251 elm_widget_theme_style_get(obj))) 251 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
252 CRI("Failed to set layout!"); 252 CRI("Failed to set layout!");
253 253
254 _label_write(obj); 254 _label_write(obj);
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 3442de9..8a26509 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -788,10 +788,10 @@ _efl_ui_spin_button_theme_group_get(Evas_Object *obj, Efl_Ui_Spin_Button_Data *s
788} 788}
789 789
790 790
791EOLIAN static Efl_Ui_Theme_Apply_Result 791EOLIAN static Efl_Ui_Theme_Apply_Error
792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) 792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
793{ 793{
794 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 794 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
795 char *group; 795 char *group;
796 796
797 group = _efl_ui_spin_button_theme_group_get(obj, sd); 797 group = _efl_ui_spin_button_theme_group_get(obj, sd);
@@ -802,7 +802,7 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
802 } 802 }
803 803
804 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 804 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
805 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 805 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
806 806
807 if (sd->ent) 807 if (sd->ent)
808 elm_widget_element_update(obj, sd->ent, PART_NAME_ENTRY); 808 elm_widget_element_update(obj, sd->ent, PART_NAME_ENTRY);
@@ -821,7 +821,7 @@ _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *
821 821
822 _label_write(obj); 822 _label_write(obj);
823 elm_layout_sizing_eval(obj); 823 elm_layout_sizing_eval(obj);
824 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 824 return EFL_UI_THEME_APPLY_ERROR_NONE;
825} 825}
826 826
827EOLIAN static Eo * 827EOLIAN static Eo *
@@ -836,12 +836,13 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
836 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 836 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
837 837
838 group = _efl_ui_spin_button_theme_group_get(obj, sd); 838 group = _efl_ui_spin_button_theme_group_get(obj, sd);
839 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 839 if (elm_widget_theme_object_set(obj, wd->resize_obj,
840 elm_widget_theme_klass_get(obj), 840 elm_widget_theme_klass_get(obj),
841 group, 841 group,
842 elm_widget_theme_style_get(obj))) 842 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
843 CRI("Failed to set layout!"); 843 CRI("Failed to set layout!");
844 844
845
845 free(group); 846 free(group);
846 847
847 sd->first_interval = 0.85; 848 sd->first_interval = 0.85;
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index 6f49b40..9d1a0f6 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -213,7 +213,7 @@ _tab_add(Eo *obj, const char *label, const char *icon)
213{ 213{
214 Eo *tab, *icon_obj; 214 Eo *tab, *icon_obj;
215 Tab_Info *ti; 215 Tab_Info *ti;
216 Efl_Ui_Theme_Apply_Result theme_apply; 216 Efl_Ui_Theme_Apply_Error theme_apply;
217 217
218 ti = calloc(1, sizeof(*ti)); 218 ti = calloc(1, sizeof(*ti));
219 219
@@ -243,7 +243,7 @@ _tab_add(Eo *obj, const char *label, const char *icon)
243 243
244 theme_apply = elm_widget_element_update(obj, tab, PART_NAME_TAB); 244 theme_apply = elm_widget_element_update(obj, tab, PART_NAME_TAB);
245 245
246 if (theme_apply == EFL_UI_THEME_APPLY_RESULT_FAIL) 246 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC)
247 CRI("Failed to set layout!"); 247 CRI("Failed to set layout!");
248 248
249 efl_layout_signal_callback_add 249 efl_layout_signal_callback_add
@@ -370,12 +370,13 @@ _efl_ui_tab_bar_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Bar_Data *sd)
370 370
371 obj = efl_constructor(efl_super(obj, MY_CLASS)); 371 obj = efl_constructor(efl_super(obj, MY_CLASS));
372 372
373 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 373 if (elm_widget_theme_object_set(obj, wd->resize_obj,
374 elm_widget_theme_klass_get(obj), 374 elm_widget_theme_klass_get(obj),
375 elm_widget_theme_element_get(obj), 375 elm_widget_theme_element_get(obj),
376 elm_widget_theme_style_get(obj))) 376 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
377 CRI("Failed to set layout!"); 377 CRI("Failed to set layout!");
378 378
379
379 elm_widget_sub_object_parent_add(obj); 380 elm_widget_sub_object_parent_add(obj);
380 381
381 sd->dir = EFL_UI_DIR_HORIZONTAL; 382 sd->dir = EFL_UI_DIR_HORIZONTAL;
diff --git a/src/lib/elementary/efl_ui_tab_page.c b/src/lib/elementary/efl_ui_tab_page.c
index 8023115..1f7fc2f 100644
--- a/src/lib/elementary/efl_ui_tab_page.c
+++ b/src/lib/elementary/efl_ui_tab_page.c
@@ -49,12 +49,13 @@ _efl_ui_tab_page_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Page_Data *sd)
49 49
50 obj = efl_constructor(efl_super(obj, MY_CLASS)); 50 obj = efl_constructor(efl_super(obj, MY_CLASS));
51 51
52 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 52 if (elm_widget_theme_object_set(obj, wd->resize_obj,
53 elm_widget_theme_klass_get(obj), 53 elm_widget_theme_klass_get(obj),
54 elm_widget_theme_element_get(obj), 54 elm_widget_theme_element_get(obj),
55 elm_widget_theme_style_get(obj))) 55 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
56 CRI("Failed to set layout!"); 56 CRI("Failed to set layout!");
57 57
58
58 elm_widget_sub_object_parent_add(obj); 59 elm_widget_sub_object_parent_add(obj);
59 60
60 efl_ui_widget_focus_allow_set(obj, EINA_TRUE); 61 efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 541fb7f..197a69e 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -28,12 +28,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
28 evas_object_table_mirrored_set(wd->resize_obj, rtl); 28 evas_object_table_mirrored_set(wd->resize_obj, rtl);
29} 29}
30 30
31EOLIAN static Efl_Ui_Theme_Apply_Result 31EOLIAN static Efl_Ui_Theme_Apply_Error
32_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) 32_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED)
33{ 33{
34 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 34 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
36 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 36 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
37 37
38 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 38 _mirrored_set(obj, efl_ui_mirrored_get(obj));
39 39
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index acf6153..8714c34 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -403,7 +403,7 @@ _item_new(Efl_Ui_Tags_Data *sd,
403 403
404 layout = efl_add(EFL_UI_LAYOUT_CLASS, obj); 404 layout = efl_add(EFL_UI_LAYOUT_CLASS, obj);
405 405
406 if (!elm_widget_element_update(obj, layout, PART_NAME_BUTTON)) 406 if (elm_widget_element_update(obj, layout, PART_NAME_BUTTON) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
407 CRI("Failed to set layout!"); 407 CRI("Failed to set layout!");
408 408
409 efl_text_set(efl_part(layout, "efl.btn.text"), str); 409 efl_text_set(efl_part(layout, "efl.btn.text"), str);
@@ -1011,10 +1011,10 @@ _efl_ui_tags_efl_object_constructor(Eo *obj, Efl_Ui_Tags_Data *sd)
1011 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1011 obj = efl_constructor(efl_super(obj, MY_CLASS));
1012 elm_widget_sub_object_parent_add(obj); 1012 elm_widget_sub_object_parent_add(obj);
1013 1013
1014 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 1014 if (elm_widget_theme_object_set(obj, wd->resize_obj,
1015 elm_widget_theme_klass_get(obj), 1015 elm_widget_theme_klass_get(obj),
1016 elm_widget_theme_element_get(obj), 1016 elm_widget_theme_element_get(obj),
1017 elm_widget_theme_style_get(obj))) 1017 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
1018 CRI("Failed to set layout!"); 1018 CRI("Failed to set layout!");
1019 1019
1020 elm_widget_can_focus_set(obj, EINA_FALSE); 1020 elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index b079bf2..aed0c99 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -733,17 +733,17 @@ _efl_ui_text_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool
733 733
734/* we can't issue the layout's theming code here, cause it assumes an 734/* we can't issue the layout's theming code here, cause it assumes an
735 * unique edje object, always */ 735 * unique edje object, always */
736EOLIAN static Efl_Ui_Theme_Apply_Result 736EOLIAN static Efl_Ui_Theme_Apply_Error
737_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) 737_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
738{ 738{
739 Efl_Ui_Theme_Apply_Result theme_apply; 739 Efl_Ui_Theme_Apply_Error theme_apply;
740 740
741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
742 742
743 // Note: We are skipping elm_layout here! This is by design. 743 // Note: We are skipping elm_layout here! This is by design.
744 // This assumes the following inheritance: my_class -> layout -> widget ... 744 // This assumes the following inheritance: my_class -> layout -> widget ...
745 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)); 745 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS));
746 if (!theme_apply) return EFL_UI_THEME_APPLY_RESULT_FAIL; 746 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
747 747
748 efl_event_freeze(obj); 748 efl_event_freeze(obj);
749 749
@@ -2165,11 +2165,11 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2165 _dnd_pos_cb, NULL, 2165 _dnd_pos_cb, NULL,
2166 _dnd_drop_cb, NULL); 2166 _dnd_drop_cb, NULL);
2167 2167
2168 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 2168 if (elm_widget_theme_object_set(obj, wd->resize_obj,
2169 elm_widget_theme_klass_get(obj), 2169 elm_widget_theme_klass_get(obj),
2170 elm_widget_theme_element_get(obj), 2170 elm_widget_theme_element_get(obj),
2171 elm_widget_theme_style_get(obj))) 2171 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
2172 CRI("Failed tp set layout!"); 2172 CRI("Failed to set layout!");
2173 2173
2174 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 2174 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
2175 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); 2175 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.c b/src/lib/elementary/efl_ui_text_factory_emoticons.c
index 97b93b5..f66c99d 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.c
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.c
@@ -24,7 +24,7 @@ EOLIAN static Efl_Canvas_Object
24 Eo *o; 24 Eo *o;
25 25
26 o = efl_add(EFL_CANVAS_LAYOUT_CLASS, object); 26 o = efl_add(EFL_CANVAS_LAYOUT_CLASS, object);
27 if (!elm_widget_element_update(object, o, key)) 27 if (elm_widget_element_update(object, o, key) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
28 { 28 {
29 elm_widget_element_update(object, o, "wtf"); 29 elm_widget_element_update(object, o, "wtf");
30 } 30 }
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 59b8548..1c39f11 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -653,13 +653,13 @@ _efl_ui_textpath_efl_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Da
653 return edje_object_part_text_get(pd->text_obj, "efl.text"); 653 return edje_object_part_text_get(pd->text_obj, "efl.text");
654} 654}
655 655
656EOLIAN static Efl_Ui_Theme_Apply_Result 656EOLIAN static Efl_Ui_Theme_Apply_Error
657_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) 657_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
658{ 658{
659 Efl_Ui_Theme_Apply_Result ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 659 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
660 660
661 ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 661 ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
662 if (!ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 662 if (ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
663 663
664 elm_widget_theme_object_set(obj, pd->text_obj, "textpath", "base", 664 elm_widget_theme_object_set(obj, pd->text_obj, "textpath", "base",
665 elm_widget_style_get(obj)); 665 elm_widget_style_get(obj));
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index dac4170..a77238b 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -218,10 +218,10 @@ _efl_ui_timepicker_efl_object_constructor(Eo *obj, Efl_Ui_Timepicker_Data *pd EI
218 elm_widget_theme_klass_set(obj, "timepicker"); 218 elm_widget_theme_klass_set(obj, "timepicker");
219 obj = efl_constructor(efl_super(obj, MY_CLASS)); 219 obj = efl_constructor(efl_super(obj, MY_CLASS));
220 220
221 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 221 if (elm_widget_theme_object_set(obj, wd->resize_obj,
222 elm_widget_theme_klass_get(obj), 222 elm_widget_theme_klass_get(obj),
223 elm_widget_theme_element_get(obj), 223 elm_widget_theme_element_get(obj),
224 elm_widget_theme_style_get(obj))) 224 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
225 CRI("Failed to set layout!"); 225 CRI("Failed to set layout!");
226 226
227 _fields_init(obj); 227 _fields_init(obj);
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index ec9bce6..a732e31 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -249,10 +249,10 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
249 if (!emotion_object_init(priv->emotion, NULL)) 249 if (!emotion_object_init(priv->emotion, NULL))
250 CRI("Failed to init emotion object"); 250 CRI("Failed to init emotion object");
251 251
252 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 252 if (elm_widget_theme_object_set(obj, wd->resize_obj,
253 elm_widget_theme_klass_get(obj), 253 elm_widget_theme_klass_get(obj),
254 elm_widget_theme_element_get(obj), 254 elm_widget_theme_element_get(obj),
255 elm_widget_theme_style_get(obj))) 255 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
256 CRI("Failed to set layout!"); 256 CRI("Failed to set layout!");
257 257
258 if (elm_widget_is_legacy(obj)) 258 if (elm_widget_is_legacy(obj))
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 0d9114c..cddeb68 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1192,31 +1192,63 @@ _efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd
1192{ 1192{
1193} 1193}
1194 1194
1195EAPI Efl_Ui_Theme_Apply_Result 1195EAPI Efl_Ui_Theme_Apply_Error
1196elm_widget_theme(Evas_Object *obj) 1196elm_widget_theme(Evas_Object *obj)
1197{ 1197{
1198 const Eina_List *l; 1198 const Eina_List *l;
1199 Evas_Object *child; 1199 Evas_Object *child;
1200 Elm_Tooltip *tt; 1200 Elm_Tooltip *tt;
1201 Elm_Cursor *cur; 1201 Elm_Cursor *cur;
1202 Efl_Ui_Theme_Apply_Result ret = EFL_UI_THEME_APPLY_RESULT_SUCCESS; 1202 Eina_Bool err_default = EINA_FALSE;
1203 Eina_Bool err_generic = EINA_FALSE;
1203 1204
1204 API_ENTRY return EFL_UI_THEME_APPLY_RESULT_FAIL; 1205 API_ENTRY return EFL_UI_THEME_APPLY_ERROR_GENERIC;
1205 1206
1206 EINA_LIST_FOREACH(sd->subobjs, l, child) 1207 EINA_LIST_FOREACH(sd->subobjs, l, child)
1207 if (_elm_widget_is(child)) 1208 if (_elm_widget_is(child))
1208 ret &= elm_widget_theme(child); 1209 {
1210 switch (elm_widget_theme(child))
1211 {
1212 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1213 err_default = EINA_TRUE;
1214 break;
1215 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1216 err_generic = EINA_TRUE;
1217 break;
1218 default: break;
1219 }
1220 }
1209 1221
1210 if (sd->hover_obj) ret &= elm_widget_theme(sd->hover_obj); 1222 if (sd->hover_obj)
1223 switch (elm_widget_theme(sd->hover_obj))
1224 {
1225 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1226 err_default = EINA_TRUE;
1227 break;
1228 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1229 err_generic = EINA_TRUE;
1230 break;
1231 default: break;
1232 }
1211 1233
1212 EINA_LIST_FOREACH(sd->tooltips, l, tt) 1234 EINA_LIST_FOREACH(sd->tooltips, l, tt)
1213 elm_tooltip_theme(tt); 1235 elm_tooltip_theme(tt);
1214 EINA_LIST_FOREACH(sd->cursors, l, cur) 1236 EINA_LIST_FOREACH(sd->cursors, l, cur)
1215 elm_cursor_theme(cur); 1237 elm_cursor_theme(cur);
1216 1238
1217 ret &= efl_ui_widget_theme_apply(obj); 1239 switch (efl_ui_widget_theme_apply(obj))
1218 1240 {
1219 return ret; 1241 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1242 err_default = EINA_TRUE;
1243 break;
1244 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1245 err_generic = EINA_TRUE;
1246 break;
1247 default: break;
1248 }
1249 if (err_generic) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
1250 if (err_default) return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
1251 return EFL_UI_THEME_APPLY_ERROR_NONE;
1220} 1252}
1221 1253
1222EAPI void 1254EAPI void
@@ -1264,12 +1296,12 @@ elm_widget_theme_specific(Evas_Object *obj,
1264 efl_ui_widget_theme_apply(obj); 1296 efl_ui_widget_theme_apply(obj);
1265} 1297}
1266 1298
1267EOLIAN static Efl_Ui_Theme_Apply_Result 1299EOLIAN static Efl_Ui_Theme_Apply_Error
1268_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 1300_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
1269{ 1301{
1270 _elm_widget_mirrored_reload(obj); 1302 _elm_widget_mirrored_reload(obj);
1271 1303
1272 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 1304 return EFL_UI_THEME_APPLY_ERROR_NONE;
1273} 1305}
1274 1306
1275/** 1307/**
@@ -2795,19 +2827,19 @@ elm_widget_theme_get(const Evas_Object *obj)
2795 return sd->theme; 2827 return sd->theme;
2796} 2828}
2797 2829
2798EOLIAN static Efl_Ui_Theme_Apply_Result 2830EOLIAN static Efl_Ui_Theme_Apply_Error
2799_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) 2831_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
2800{ 2832{
2801 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) 2833 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
2802 { 2834 {
2803 ERR("Efl.Ui.Widget.style can only be set before finalize!"); 2835 ERR("Efl.Ui.Widget.style can only be set before finalize!");
2804 return EFL_UI_THEME_APPLY_RESULT_FAIL; 2836 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
2805 } 2837 }
2806 2838
2807 if (eina_stringshare_replace(&sd->style, style)) 2839 if (eina_stringshare_replace(&sd->style, style))
2808 return elm_widget_theme(obj); 2840 return elm_widget_theme(obj);
2809 2841
2810 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 2842 return EFL_UI_THEME_APPLY_ERROR_NONE;
2811} 2843}
2812 2844
2813EOLIAN static const char* 2845EOLIAN static const char*
@@ -2906,23 +2938,17 @@ elm_widget_scroll_child_locked_y_get(const Eo *obj)
2906 return sd->child_drag_y_locked; 2938 return sd->child_drag_y_locked;
2907} 2939}
2908 2940
2909EAPI Efl_Ui_Theme_Apply_Result 2941EAPI Efl_Ui_Theme_Apply_Error
2910elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) 2942elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
2911{ 2943{
2912 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 2944 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
2913 if (!sd) return EFL_UI_THEME_APPLY_RESULT_FAIL; 2945 if (!sd) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
2914 2946
2915 if (eina_streq(welement, "base")) 2947 if (eina_streq(welement, "base"))
2916 welement = NULL; 2948 welement = NULL;
2917 if (eina_streq(wstyle, "default")) 2949 if (eina_streq(wstyle, "default"))
2918 wstyle = NULL; 2950 wstyle = NULL;
2919 Efl_Ui_Theme_Apply_Result ret = _elm_theme_object_set(obj, edj, wname, welement, wstyle); 2951 return _elm_theme_object_set(obj, edj, wname, welement, wstyle);
2920 if (!ret)
2921 {
2922 return EFL_UI_THEME_APPLY_RESULT_FAIL;
2923 }
2924
2925 return ret;
2926} 2952}
2927 2953
2928static void 2954static void
@@ -3528,10 +3554,10 @@ elm_widget_theme_style_get(const Evas_Object *obj)
3528 * @param name An element name of sub object. 3554 * @param name An element name of sub object.
3529 * @return Whether the style was successfully applied or not. 3555 * @return Whether the style was successfully applied or not.
3530 */ 3556 */
3531EAPI Efl_Ui_Theme_Apply_Result 3557EAPI Efl_Ui_Theme_Apply_Error
3532elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name) 3558elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name)
3533{ 3559{
3534 Efl_Ui_Theme_Apply_Result ret = EFL_UI_THEME_APPLY_RESULT_SUCCESS; 3560 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_NONE;
3535 Eina_Bool changed = EINA_FALSE; 3561 Eina_Bool changed = EINA_FALSE;
3536 const char *obj_group; 3562 const char *obj_group;
3537 Eina_Stringshare *group; 3563 Eina_Stringshare *group;
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 47ce812..35e0495 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -144,9 +144,9 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
144 ]] 144 ]]
145 set @protected { 145 set @protected {
146 [[Can only be called during construction, before finalize.]] 146 [[Can only be called during construction, before finalize.]]
147 return: Efl.Ui.Theme_Apply_Result(0); 147 return: Efl.Ui.Theme_Apply_Error(2);
148 [[Whether the style was successfully applied or not, see 148 [[Whether the style was successfully applied or not, see
149 the values of @Efl.Ui.Theme_Apply_Result for more information.]] 149 the values of @Efl.Ui.Theme_Apply_Error for more information.]]
150 } 150 }
151 get { 151 get {
152 [[Returns the current style of a widget.]] 152 [[Returns the current style of a widget.]]
@@ -325,7 +325,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
325 Note: even widgets not based on layouts may override this method 325 Note: even widgets not based on layouts may override this method
326 to handle widget updates (scale, mirrored mode, etc...). 326 to handle widget updates (scale, mirrored mode, etc...).
327 ]] 327 ]]
328 return: Efl.Ui.Theme_Apply_Result; [[Indicates success, and if the current 328 return: Efl.Ui.Theme_Apply_Error; [[Indicates success, and if the current
329 theme or default theme was used.]] 329 theme or default theme was used.]]
330 } 330 }
331 331
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 6e7ec7e..786c093 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -378,7 +378,7 @@ _elm_win_on_resize_obj_changed_size_hints(void *data,
378 void *event_info); 378 void *event_info);
379static void 379static void
380_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); 380_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
381static Efl_Ui_Theme_Apply_Result _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); 381static Efl_Ui_Theme_Apply_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
382static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); 382static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style);
383static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); 383static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc);
384static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); 384static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine);
@@ -3285,7 +3285,7 @@ _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor)
3285 3285
3286 if (cursor) 3286 if (cursor)
3287 { 3287 {
3288 if (!elm_widget_theme_object_set(sd->obj, sd->pointer.obj, 3288 if (elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
3289 "cursor", cursor, "default")) 3289 "cursor", cursor, "default"))
3290 { 3290 {
3291 elm_widget_theme_object_set(sd->obj, sd->pointer.obj, 3291 elm_widget_theme_object_set(sd->obj, sd->pointer.obj,
@@ -4501,8 +4501,8 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4501 v = version ? atoi(version) : 0; 4501 v = version ? atoi(version) : 0;
4502 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION)) 4502 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION))
4503 { 4503 {
4504 if (!elm_widget_theme_object_set 4504 if (elm_widget_theme_object_set
4505 (sd->obj, sd->frame_obj, "border", element, style)) 4505 (sd->obj, sd->frame_obj, "border", element, style) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
4506 { 4506 {
4507 ERR("Failed to set main border theme for the window."); 4507 ERR("Failed to set main border theme for the window.");
4508 ELM_SAFE_FREE(sd->frame_obj, evas_object_del); 4508 ELM_SAFE_FREE(sd->frame_obj, evas_object_del);
@@ -6959,16 +6959,16 @@ _efl_ui_win_focus_highlight_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Da
6959 return sd->focus_highlight.enabled; 6959 return sd->focus_highlight.enabled;
6960} 6960}
6961 6961
6962static Efl_Ui_Theme_Apply_Result 6962static Efl_Ui_Theme_Apply_Error
6963_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) 6963_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6964{ 6964{
6965 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 6965 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
6966 Eina_Bool prev_alpha; 6966 Eina_Bool prev_alpha;
6967 const char *s; 6967 const char *s;
6968 6968
6969 int_ret = elm_widget_theme_object_set(obj, sd->legacy.edje, "win", "base", 6969 int_ret = elm_widget_theme_object_set(obj, sd->legacy.edje, "win", "base",
6970 elm_widget_style_get(obj)); 6970 elm_widget_style_get(obj));
6971 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 6971 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
6972 6972
6973 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj)); 6973 edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
6974 edje_object_scale_set(sd->legacy.edje, 6974 edje_object_scale_set(sd->legacy.edje,
@@ -6985,17 +6985,17 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6985 return int_ret; 6985 return int_ret;
6986} 6986}
6987 6987
6988EOLIAN static Efl_Ui_Theme_Apply_Result 6988EOLIAN static Efl_Ui_Theme_Apply_Error
6989_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6989_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6990{ 6990{
6991 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 6991 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
6992 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 6992 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
6993 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 6993 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
6994 6994
6995 sd->focus_highlight.theme_changed = EINA_TRUE; 6995 sd->focus_highlight.theme_changed = EINA_TRUE;
6996 6996
6997 int_ret = _elm_win_theme_internal(obj, sd) & int_ret; 6997 int_ret = _elm_win_theme_internal(obj, sd) & int_ret;
6998 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 6998 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
6999 _elm_win_focus_highlight_reconfigure_job_start(sd); 6999 _elm_win_focus_highlight_reconfigure_job_start(sd);
7000 7000
7001 return int_ret; 7001 return int_ret;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 2b231aa..532f707 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -79,15 +79,15 @@ _elm_combobox_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Combobox_D
79 efl_ui_l10n_translation_update(sd->hover); 79 efl_ui_l10n_translation_update(sd->hover);
80} 80}
81 81
82EOLIAN static Efl_Ui_Theme_Apply_Result 82EOLIAN static Efl_Ui_Theme_Apply_Error
83_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) 83_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
84{ 84{
85 const char *style; 85 const char *style;
86 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 86 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
87 Eina_Bool mirrored; 87 Eina_Bool mirrored;
88 char buf[128]; 88 char buf[128];
89 89
90 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 90 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
91 91
92 style = eina_stringshare_add(elm_widget_style_get(obj)); 92 style = eina_stringshare_add(elm_widget_style_get(obj));
93 93
@@ -97,7 +97,7 @@ _elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
97 eina_stringshare_replace(&(wd->style), buf); 97 eina_stringshare_replace(&(wd->style), buf);
98 98
99 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 99 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
100 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 100 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
101 101
102 eina_stringshare_replace(&(wd->style), style); 102 eina_stringshare_replace(&(wd->style), style);
103 103
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 1f6ed09..11ee0f4 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -666,13 +666,13 @@ _on_content_resized(void *data,
666} 666}
667 667
668//FIXME: lost the content size when theme hook is called. 668//FIXME: lost the content size when theme hook is called.
669EOLIAN static Efl_Ui_Theme_Apply_Result 669EOLIAN static Efl_Ui_Theme_Apply_Error
670_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) 670_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
671{ 671{
672 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 672 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
673 673
674 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 674 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
675 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 675 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
676 676
677 elm_widget_theme_object_set 677 elm_widget_theme_object_set
678 (obj, sd->bg, "ctxpopup", "bg", elm_widget_style_get(obj)); 678 (obj, sd->bg, "ctxpopup", "bg", elm_widget_style_get(obj));
@@ -1044,7 +1044,7 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1044 1044
1045 //Background 1045 //Background
1046 priv->bg = edje_object_add(evas_object_evas_get(obj)); 1046 priv->bg = edje_object_add(evas_object_evas_get(obj));
1047 if (!elm_widget_theme_object_set(obj, priv->bg, "ctxpopup", "bg", "default")) 1047 if (elm_widget_theme_object_set(obj, priv->bg, "ctxpopup", "bg", "default"))
1048 CRI("ctxpopup(%p) failed to set theme [efl/ctxpopup/bg/default]!", obj); 1048 CRI("ctxpopup(%p) failed to set theme [efl/ctxpopup/bg/default]!", obj);
1049 1049
1050 edje_object_signal_callback_add 1050 edje_object_signal_callback_add
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 6dabb93..41aa86b 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -226,16 +226,16 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char
226 return efl_model_property_set(model, property_name, eina_value_string_new(property_value)); 226 return efl_model_property_set(model, property_name, eina_value_string_new(property_value));
227} 227}
228 228
229EOLIAN static Efl_Ui_Theme_Apply_Result 229EOLIAN static Efl_Ui_Theme_Apply_Error
230_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) 230_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
231{ 231{
232 const char *style; 232 const char *style;
233 const char *data; 233 const char *data;
234 char buf[1024]; 234 char buf[1024];
235 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 235 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
236 236
237 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 237 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
238 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 238 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
239 239
240 style = elm_widget_style_get(obj); 240 style = elm_widget_style_get(obj);
241 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 241 _mirrored_set(obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 6724a0e..abbf8bd 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -38,15 +38,15 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
38}; 38};
39#undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS 39#undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS
40 40
41EOLIAN static Efl_Ui_Theme_Apply_Result 41EOLIAN static Efl_Ui_Theme_Apply_Error
42_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) 42_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
43{ 43{
44 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 44 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
45 45
46 char buf[4096]; 46 char buf[4096];
47 const char *style; 47 const char *style;
48 48
49 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 49 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
50 50
51 style = eina_stringshare_add(elm_widget_style_get(obj)); 51 style = eina_stringshare_add(elm_widget_style_get(obj));
52 52
@@ -56,7 +56,7 @@ _elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_But
56 eina_stringshare_replace(&(wd->style), buf); 56 eina_stringshare_replace(&(wd->style), buf);
57 57
58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
59 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 59 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
60 60
61 eina_stringshare_replace(&(wd->style), style); 61 eina_stringshare_replace(&(wd->style), style);
62 62
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 02b22fe..c9ec1ac 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -127,17 +127,17 @@ _elm_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Entry_D
127 evas_object_size_hint_max_set(obj, -1, -1); 127 evas_object_size_hint_max_set(obj, -1, -1);
128} 128}
129 129
130EOLIAN static Efl_Ui_Theme_Apply_Result 130EOLIAN static Efl_Ui_Theme_Apply_Error
131_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) 131_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
132{ 132{
133 const char *style; 133 const char *style;
134 char buf[1024]; 134 char buf[1024];
135 135
136 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 136 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
137 137
138 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 138 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
140 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 140 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
141 141
142 style = elm_widget_style_get(obj); 142 style = elm_widget_style_get(obj);
143 143
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 07b251d..25df36a 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -63,14 +63,14 @@ _elm_hoversel_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Hoversel_D
63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); 63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS));
64} 64}
65 65
66EOLIAN static Efl_Ui_Theme_Apply_Result 66EOLIAN static Efl_Ui_Theme_Apply_Error
67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) 67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
68{ 68{
69 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 69 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
70 Eina_List *l; 70 Eina_List *l;
71 Elm_Object_Item *eo_item; 71 Elm_Object_Item *eo_item;
72 72
73 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 73 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
74 74
75 char buf[4096]; 75 char buf[4096];
76 const char *style; 76 const char *style;
@@ -86,7 +86,7 @@ _elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
86 elm_widget_theme_style_set(obj, buf); 86 elm_widget_theme_style_set(obj, buf);
87 87
88 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 88 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
89 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 89 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
90 90
91 elm_widget_theme_style_set(obj, style); 91 elm_widget_theme_style_set(obj, style);
92 92
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 57d6126..89b34de 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -91,7 +91,7 @@ _format_count(int count, void *data EINA_UNUSED)
91 return strdup(buf); 91 return strdup(buf);
92} 92}
93 93
94EOLIAN static Efl_Ui_Theme_Apply_Result 94EOLIAN static Efl_Ui_Theme_Apply_Error
95_elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) 95_elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd)
96{ 96{
97 const char *str; 97 const char *str;
@@ -100,9 +100,9 @@ _elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Da
100 Elm_Object_Item *eo_item; 100 Elm_Object_Item *eo_item;
101 double pad_scale; 101 double pad_scale;
102 102
103 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 103 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
107 str = elm_layout_data_get(obj, "horizontal_pad"); 107 str = elm_layout_data_get(obj, "horizontal_pad");
108 if (str) hpad = atoi(str); 108 if (str) hpad = atoi(str);
@@ -1564,10 +1564,10 @@ _elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_D
1564 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1564 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1565 elm_widget_sub_object_parent_add(obj); 1565 elm_widget_sub_object_parent_add(obj);
1566 1566
1567 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 1567 if (elm_widget_theme_object_set(obj, wd->resize_obj,
1568 elm_widget_theme_klass_get(obj), 1568 elm_widget_theme_klass_get(obj),
1569 elm_widget_theme_element_get(obj), 1569 elm_widget_theme_element_get(obj),
1570 elm_widget_theme_style_get(obj))) 1570 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
1571 CRI("Failed to set layout!"); 1571 CRI("Failed to set layout!");
1572 1572
1573 elm_widget_can_focus_set(obj, EINA_FALSE); 1573 elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 23dca67..40b97c2 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -366,7 +366,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition)
366 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); 366 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
367} 367}
368 368
369EOLIAN static Efl_Ui_Theme_Apply_Result 369EOLIAN static Efl_Ui_Theme_Apply_Error
370_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) 370_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
371{ 371{
372 Elm_Naviframe_Item_Data *it; 372 Elm_Naviframe_Item_Data *it;
@@ -384,7 +384,7 @@ _elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
384 } 384 }
385 385
386 elm_layout_sizing_eval(obj); 386 elm_layout_sizing_eval(obj);
387 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 387 return EFL_UI_THEME_APPLY_ERROR_NONE;
388} 388}
389 389
390static char * 390static char *
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 96a703e..a28d92d 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -185,12 +185,12 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const
185 elm_object_disabled_set(sl, elm_widget_disabled_get(obj)); 185 elm_object_disabled_set(sl, elm_widget_disabled_get(obj));
186} 186}
187 187
188EOLIAN static Efl_Ui_Theme_Apply_Result 188EOLIAN static Efl_Ui_Theme_Apply_Error
189_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) 189_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
190{ 190{
191 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 191 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
192 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 192 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
193 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 193 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
194 194
195 _update_theme_button(obj, sd->forward, "forward"); 195 _update_theme_button(obj, sd->forward, "forward");
196 _update_theme_button(obj, sd->info, "info"); 196 _update_theme_button(obj, sd->info, "info");
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 4806d5f..6c934ee 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -365,7 +365,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd)
365 sd->theme_scroll = EINA_FALSE; 365 sd->theme_scroll = EINA_FALSE;
366} 366}
367 367
368EOLIAN static Efl_Ui_Theme_Apply_Result 368EOLIAN static Efl_Ui_Theme_Apply_Error
369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) 369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
370{ 370{
371 Elm_Popup_Item_Data *it; 371 Elm_Popup_Item_Data *it;
@@ -439,7 +439,7 @@ _elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
439 /* access */ 439 /* access */
440 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE); 440 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
441 441
442 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 442 return EFL_UI_THEME_APPLY_ERROR_NONE;
443} 443}
444 444
445static void 445static void
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index b9f295f..889e4ad 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -113,18 +113,18 @@ _mirroredness_change_eval(Evas_Object *obj)
113 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5); 113 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5);
114} 114}
115 115
116EOLIAN static Efl_Ui_Theme_Apply_Result 116EOLIAN static Efl_Ui_Theme_Apply_Error
117_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) 117_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
118{ 118{
119 Eina_Bool mirrored; 119 Eina_Bool mirrored;
120 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 120 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
121 121
122 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 122 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
123 123
124 mirrored = elm_object_mirrored_get(obj); 124 mirrored = elm_object_mirrored_get(obj);
125 125
126 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 126 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
127 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 127 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
128 128
129 if (elm_object_mirrored_get(obj) != mirrored) 129 if (elm_object_mirrored_get(obj) != mirrored)
130 _mirroredness_change_eval(obj); 130 _mirroredness_change_eval(obj);
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 71af0b5..b08a25b 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -57,15 +57,15 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event)
57 efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); 57 efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
58} 58}
59 59
60EOLIAN static Efl_Ui_Theme_Apply_Result 60EOLIAN static Efl_Ui_Theme_Apply_Error
61_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) 61_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
62{ 62{
63 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 63 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
64 64
65 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 65 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
66 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 66 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
67 67
68 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 68 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
69 evas_object_smart_calculate(wd->resize_obj); 69 evas_object_smart_calculate(wd->resize_obj);
70 70
71 return int_ret; 71 return int_ret;
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index e150e54..600f9d6 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -842,13 +842,13 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd)
842 } 842 }
843} 843}
844 844
845EOLIAN static Efl_Ui_Theme_Apply_Result 845EOLIAN static Efl_Ui_Theme_Apply_Error
846_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) 846_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
847{ 847{
848 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 848 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
849 849
850 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 850 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
851 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 851 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
852 852
853 _spinner_buttons_add(obj, sd); 853 _spinner_buttons_add(obj, sd);
854 854
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 2ace344..7b57b2b 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -627,13 +627,13 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
627 sd->cur.ampm = -1; 627 sd->cur.ampm = -1;
628} 628}
629 629
630EOLIAN static Efl_Ui_Theme_Apply_Result 630EOLIAN static Efl_Ui_Theme_Apply_Error
631_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) 631_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
632{ 632{
633 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 633 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
634 634
635 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 635 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
636 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 636 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
637 637
638 _time_update(obj, EINA_TRUE); 638 _time_update(obj, EINA_TRUE);
639 639
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 3cb4167..e22ddf2 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -2341,15 +2341,15 @@ _elm_code_widget_theme_refresh(Eo *obj, Elm_Code_Widget_Data *pd)
2341 } 2341 }
2342} 2342}
2343 2343
2344EOLIAN static Efl_Ui_Theme_Apply_Result 2344EOLIAN static Efl_Ui_Theme_Apply_Error
2345_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) 2345_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd)
2346{ 2346{
2347 if (!efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS))) 2347 if (efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
2348 return EFL_UI_THEME_APPLY_RESULT_FAIL; 2348 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
2349 2349
2350 _elm_code_widget_theme_refresh(obj, pd); 2350 _elm_code_widget_theme_refresh(obj, pd);
2351 2351
2352 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 2352 return EFL_UI_THEME_APPLY_ERROR_NONE;
2353} 2353}
2354 2354
2355EOLIAN static int 2355EOLIAN static int
@@ -2382,10 +2382,10 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
2382 elm_widget_can_focus_set(obj, EINA_TRUE); 2382 elm_widget_can_focus_set(obj, EINA_TRUE);
2383 pd->alpha = 255; 2383 pd->alpha = 255;
2384 2384
2385 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 2385 if (elm_widget_theme_object_set(obj, wd->resize_obj,
2386 elm_widget_theme_klass_get(obj), 2386 elm_widget_theme_klass_get(obj),
2387 elm_widget_theme_element_get(obj), 2387 elm_widget_theme_element_get(obj),
2388 elm_widget_theme_style_get(obj))) 2388 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
2389 CRI("Failed to set layout!"); 2389 CRI("Failed to set layout!");
2390 2390
2391 scroller = elm_scroller_add(obj); 2391 scroller = elm_scroller_add(obj);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 851c42f..8c12e5b 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1317,7 +1317,7 @@ _color_bars_add(Evas_Object *obj)
1317 } 1317 }
1318} 1318}
1319 1319
1320EOLIAN static Efl_Ui_Theme_Apply_Result 1320EOLIAN static Efl_Ui_Theme_Apply_Error
1321_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) 1321_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1322{ 1322{
1323 int i; 1323 int i;
@@ -1328,11 +1328,11 @@ _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd
1328 unsigned int h_pad = DEFAULT_HOR_PAD; 1328 unsigned int h_pad = DEFAULT_HOR_PAD;
1329 unsigned int v_pad = DEFAULT_VER_PAD; 1329 unsigned int v_pad = DEFAULT_VER_PAD;
1330 1330
1331 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 1331 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
1332 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 1332 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1333 1333
1334 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1334 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1335 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 1335 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1336 1336
1337 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || 1337 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
1338 (sd->mode == ELM_COLORSELECTOR_ALL) || 1338 (sd->mode == ELM_COLORSELECTOR_ALL) ||
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 4c4035d..5a3ad49 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -573,13 +573,13 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED)
573 } 573 }
574} 574}
575 575
576EOLIAN static Efl_Ui_Theme_Apply_Result 576EOLIAN static Efl_Ui_Theme_Apply_Error
577_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 577_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
578{ 578{
579 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 579 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
580 580
581 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 581 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
582 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 582 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
583 583
584 _conformant_parts_swallow(obj); 584 _conformant_parts_swallow(obj);
585 585
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index eb051c0..cd39c5a 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -123,17 +123,17 @@ _item_location_get(Elm_Dayselector_Data *sd,
123 ELM_DAYSELECTOR_MAX; 123 ELM_DAYSELECTOR_MAX;
124} 124}
125 125
126EOLIAN static Efl_Ui_Theme_Apply_Result 126EOLIAN static Efl_Ui_Theme_Apply_Error
127_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) 127_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
128{ 128{
129 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 129 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
130 130
131 Eina_List *l; 131 Eina_List *l;
132 char buf[1024]; 132 char buf[1024];
133 Elm_Dayselector_Item_Data *it; 133 Elm_Dayselector_Item_Data *it;
134 134
135 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 135 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
136 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 136 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
137 137
138 EINA_LIST_FOREACH(sd->items, l, it) 138 EINA_LIST_FOREACH(sd->items, l, it)
139 { 139 {
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 6994f8d..d789295 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -811,18 +811,18 @@ _theme_data_get(Evas_Object *obj)
811 else sd->minh = -1; 811 else sd->minh = -1;
812} 812}
813 813
814EOLIAN static Efl_Ui_Theme_Apply_Result 814EOLIAN static Efl_Ui_Theme_Apply_Error
815_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) 815_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
816{ 816{
817 Eina_List *l; 817 Eina_List *l;
818 Elm_Diskselector_Item_Data *it; 818 Elm_Diskselector_Item_Data *it;
819 Evas_Object *blank; 819 Evas_Object *blank;
820 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 820 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
821 Evas *evas; 821 Evas *evas;
822 const char *style = elm_widget_style_get(obj); 822 const char *style = elm_widget_style_get(obj);
823 823
824 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 824 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
825 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 825 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
826 826
827 evas = evas_object_evas_get(obj); 827 evas = evas_object_evas_get(obj);
828 evas_event_freeze(evas); 828 evas_event_freeze(evas);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 981a108..06fb546 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -872,22 +872,22 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
872 872
873/* we can't issue the layout's theming code here, cause it assumes an 873/* we can't issue the layout's theming code here, cause it assumes an
874 * unique edje object, always */ 874 * unique edje object, always */
875EOLIAN static Efl_Ui_Theme_Apply_Result 875EOLIAN static Efl_Ui_Theme_Apply_Error
876_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) 876_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
877{ 877{
878 const char *str; 878 const char *str;
879 const char *t; 879 const char *t;
880 const char *stl_user; 880 const char *stl_user;
881 const char *style = elm_widget_style_get(obj); 881 const char *style = elm_widget_style_get(obj);
882 Efl_Ui_Theme_Apply_Result theme_apply; 882 Efl_Ui_Theme_Apply_Error theme_apply;
883 int cursor_pos; 883 int cursor_pos;
884 884
885 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 885 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
886 886
887 // Note: We are skipping elm_layout here! This is by design. 887 // Note: We are skipping elm_layout here! This is by design.
888 // This assumes the following inheritance: my_class -> layout -> widget ... 888 // This assumes the following inheritance: my_class -> layout -> widget ...
889 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)); 889 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS));
890 if (!theme_apply) return EFL_UI_THEME_APPLY_RESULT_FAIL; 890 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
891 891
892 evas_event_freeze(evas_object_evas_get(obj)); 892 evas_event_freeze(evas_object_evas_get(obj));
893 893
@@ -974,14 +974,14 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
974 974
975 if (sd->scroll) 975 if (sd->scroll)
976 { 976 {
977 Efl_Ui_Theme_Apply_Result ok = EFL_UI_THEME_APPLY_RESULT_FAIL; 977 Efl_Ui_Theme_Apply_Error err = EFL_UI_THEME_APPLY_ERROR_GENERIC;
978 978
979 efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj)); 979 efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj));
980 980
981 if (sd->single_line) 981 if (sd->single_line)
982 ok = elm_widget_theme_object_set 982 err = elm_widget_theme_object_set
983 (obj, sd->scr_edje, "scroller", "entry_single", style); 983 (obj, sd->scr_edje, "scroller", "entry_single", style);
984 if (!ok) 984 if (err)
985 elm_widget_theme_object_set 985 elm_widget_theme_object_set
986 (obj, sd->scr_edje, "scroller", "entry", style); 986 (obj, sd->scr_edje, "scroller", "entry", style);
987 987
@@ -2854,8 +2854,8 @@ _item_get(void *data,
2854 } 2854 }
2855 2855
2856 o = edje_object_add(evas_object_evas_get(data)); 2856 o = edje_object_add(evas_object_evas_get(data));
2857 if (!_elm_theme_object_set 2857 if (_elm_theme_object_set
2858 (data, o, "entry", item, style)) 2858 (data, o, "entry", item, style) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
2859 _elm_theme_object_set 2859 _elm_theme_object_set
2860 (data, o, "entry/emoticon", "wtf", style); 2860 (data, o, "entry/emoticon", "wtf", style);
2861 return o; 2861 return o;
@@ -3799,10 +3799,10 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3799 _dnd_pos_cb, NULL, 3799 _dnd_pos_cb, NULL,
3800 _dnd_drop_cb, NULL); 3800 _dnd_drop_cb, NULL);
3801 3801
3802 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 3802 if (elm_widget_theme_object_set(obj, wd->resize_obj,
3803 elm_widget_theme_klass_get(obj), 3803 elm_widget_theme_klass_get(obj),
3804 elm_widget_theme_element_get(obj), 3804 elm_widget_theme_element_get(obj),
3805 elm_widget_theme_style_get(obj))) 3805 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
3806 CRI("Failed to set layout!"); 3806 CRI("Failed to set layout!");
3807 3807
3808 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 3808 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 1262f9f..99c1f94 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -350,16 +350,16 @@ _item_new(Evas_Object *obj,
350 return eo_item; 350 return eo_item;
351} 351}
352 352
353EOLIAN static Efl_Ui_Theme_Apply_Result 353EOLIAN static Efl_Ui_Theme_Apply_Error
354_elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) 354_elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
355{ 355{
356 const char *max_len; 356 const char *max_len;
357 357
358 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 358 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
360 360
361 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 361 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
362 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 362 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
363 363
364 max_len = edje_object_data_get(wd->resize_obj, "max_len"); 364 max_len = edje_object_data_get(wd->resize_obj, "max_len");
365 if (!max_len) sd->max_len = MAX_LEN_DEFAULT; 365 if (!max_len) sd->max_len = MAX_LEN_DEFAULT;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 6047ad8..243e5d6 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -1170,10 +1170,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
1170 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 1170 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
1171 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default"); 1171 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default");
1172 1172
1173 Efl_Ui_Theme_Apply_Result th_ret = 1173 Efl_Ui_Theme_Apply_Error th_ret =
1174 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf, 1174 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf,
1175 elm_widget_style_get(WIDGET(it))); 1175 elm_widget_style_get(WIDGET(it)));
1176 if (th_ret == EFL_UI_THEME_APPLY_RESULT_FAIL) 1176 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
1177 { 1177 {
1178 ERR("%s is not a valid gengrid item style. " 1178 ERR("%s is not a valid gengrid item style. "
1179 "Automatically falls back into default style.", 1179 "Automatically falls back into default style.",
@@ -3589,12 +3589,12 @@ _mirrored_set(Evas_Object *obj,
3589 } 3589 }
3590} 3590}
3591 3591
3592EOLIAN static Efl_Ui_Theme_Apply_Result 3592EOLIAN static Efl_Ui_Theme_Apply_Error
3593_elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) 3593_elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
3594{ 3594{
3595 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 3595 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
3596 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 3596 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3597 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 3597 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
3598 3598
3599 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3599 _mirrored_set(obj, efl_ui_mirrored_get(obj));
3600 3600
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index f224c0f..164deaa 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -566,10 +566,10 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
566 "",style ? : "default"); 566 "",style ? : "default");
567 } 567 }
568 568
569 Efl_Ui_Theme_Apply_Result th_ret = 569 Efl_Ui_Theme_Apply_Error th_ret =
570 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf, 570 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
571 elm_widget_style_get(WIDGET(it))); 571 elm_widget_style_get(WIDGET(it)));
572 if (th_ret == EFL_UI_THEME_APPLY_RESULT_FAIL) 572 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
573 { 573 {
574 ERR("%s is not a valid genlist item style. " 574 ERR("%s is not a valid genlist item style. "
575 "Automatically falls back into default style.", 575 "Automatically falls back into default style.",
@@ -3533,17 +3533,17 @@ _mirrored_set(Evas_Object *obj,
3533 efl_ui_mirrored_set(obj, rtl); 3533 efl_ui_mirrored_set(obj, rtl);
3534} 3534}
3535 3535
3536EOLIAN static Efl_Ui_Theme_Apply_Result 3536EOLIAN static Efl_Ui_Theme_Apply_Error
3537_elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) 3537_elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
3538{ 3538{
3539 Item_Block *itb; 3539 Item_Block *itb;
3540 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 3540 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
3541 Eina_List *l; 3541 Eina_List *l;
3542 Elm_Gen_Item *it; 3542 Elm_Gen_Item *it;
3543 Evas *e; 3543 Evas *e;
3544 3544
3545 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 3545 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3546 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 3546 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
3547 3547
3548 e = evas_object_evas_get(obj); 3548 e = evas_object_evas_get(obj);
3549 evas_event_freeze(e); 3549 evas_event_freeze(e);
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index b927981..453da6c 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -40,13 +40,13 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
40 evas_object_grid_mirrored_set(wd->resize_obj, rtl); 40 evas_object_grid_mirrored_set(wd->resize_obj, rtl);
41} 41}
42 42
43EOLIAN static Efl_Ui_Theme_Apply_Result 43EOLIAN static Efl_Ui_Theme_Apply_Error
44_elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 44_elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
45{ 45{
46 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 46 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
47 47
48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
49 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 49 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
50 50
51 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 51 _mirrored_set(obj, efl_ui_mirrored_get(obj));
52 52
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index c653b36..ddd711b 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -298,12 +298,12 @@ _hov_show_do(Evas_Object *obj)
298 } 298 }
299} 299}
300 300
301EOLIAN static Efl_Ui_Theme_Apply_Result 301EOLIAN static Efl_Ui_Theme_Apply_Error
302_elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) 302_elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
303{ 303{
304 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 304 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
305 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 305 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
306 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 306 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
307 307
308 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); 308 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
309 309
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 6b00dcc..e326553 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -366,16 +366,16 @@ _elm_icon_efl_file_load(Eo *obj, Elm_Icon_Data *sd)
366 return 0; 366 return 0;
367} 367}
368 368
369EOLIAN static Efl_Ui_Theme_Apply_Result 369EOLIAN static Efl_Ui_Theme_Apply_Error
370_elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) 370_elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
371{ 371{
372 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 372 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
373 373
374 if (sd->stdicon) 374 if (sd->stdicon)
375 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 375 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
376 376
377 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 377 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
378 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 378 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
379 379
380 return int_ret; 380 return int_ret;
381} 381}
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index c82ab64..67ee93e 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -432,13 +432,13 @@ _index_priority_change(void *data, Elm_Index_Item_Data *it)
432 } 432 }
433} 433}
434 434
435EOLIAN static Efl_Ui_Theme_Apply_Result 435EOLIAN static Efl_Ui_Theme_Apply_Error
436_elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) 436_elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
437{ 437{
438 Evas_Coord minw = 0, minh = 0; 438 Evas_Coord minw = 0, minh = 0;
439 Elm_Object_Item *eo_item; 439 Elm_Object_Item *eo_item;
440 440
441 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 441 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
442 442
443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
444 444
@@ -451,7 +451,7 @@ _elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
451 elm_widget_theme_element_set(obj, "base/vertical"); 451 elm_widget_theme_element_set(obj, "base/vertical");
452 452
453 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 453 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
454 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 454 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
455 455
456 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 456 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
457 evas_object_size_hint_min_set(sd->event_rect[0], minw, minh); 457 evas_object_size_hint_min_set(sd->event_rect[0], minw, minh);
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 51c367a..9e2dbae 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -182,17 +182,17 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd)
182 edje_object_message_signal_process(wd->resize_obj); 182 edje_object_message_signal_process(wd->resize_obj);
183} 183}
184 184
185EOLIAN static Efl_Ui_Theme_Apply_Result 185EOLIAN static Efl_Ui_Theme_Apply_Error
186_elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) 186_elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
187{ 187{
188 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 188 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
189 189
190 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 190 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
191 191
192 evas_event_freeze(evas_object_evas_get(obj)); 192 evas_event_freeze(evas_object_evas_get(obj));
193 193
194 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 194 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
195 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 195 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
196 196
197 _elm_label_horizontal_size_policy_update(obj, sd); 197 _elm_label_horizontal_size_policy_update(obj, sd);
198 198
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index b678bc1..686a04b 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1115,15 +1115,15 @@ _mirrored_set(Evas_Object *obj,
1115 } 1115 }
1116} 1116}
1117 1117
1118EOLIAN static Efl_Ui_Theme_Apply_Result 1118EOLIAN static Efl_Ui_Theme_Apply_Error
1119_elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd) 1119_elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
1120{ 1120{
1121 Elm_Object_Item *eo_it; 1121 Elm_Object_Item *eo_it;
1122 Eina_List *n; 1122 Eina_List *n;
1123 1123
1124 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 1124 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1125 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1125 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1126 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 1126 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1127 1127
1128 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 1128 _mirrored_set(obj, efl_ui_mirrored_get(obj));
1129 1129
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index e29f513..3cb2318 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1559,9 +1559,7 @@ elm_object_style_set(Evas_Object *obj,
1559 const char *style) 1559 const char *style)
1560{ 1560{
1561 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 1561 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
1562 if (elm_widget_style_set(obj, style)) 1562 return elm_widget_style_set(obj, style) == EFL_UI_THEME_APPLY_ERROR_NONE;
1563 return EINA_TRUE;
1564 return EINA_FALSE;
1565} 1563}
1566 1564
1567EAPI Eina_Bool 1565EAPI Eina_Bool
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 5d13cdd..fb61438 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3997,13 +3997,13 @@ _elm_map_pan_class_constructor(Efl_Class *klass)
3997 3997
3998#include "elm_map_pan.eo.c" 3998#include "elm_map_pan.eo.c"
3999 3999
4000EOLIAN static Efl_Ui_Theme_Apply_Result 4000EOLIAN static Efl_Ui_Theme_Apply_Error
4001_elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) 4001_elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
4002{ 4002{
4003 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 4003 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
4004 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 4004 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
4005 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 4005 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
4006 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 4006 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
4007 4007
4008 4008
4009 elm_widget_theme_object_set 4009 elm_widget_theme_object_set
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 9e8369f..7b45fbb 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -36,12 +36,12 @@ _sizing_eval(Evas_Object *obj)
36 evas_object_size_hint_max_set(obj, maxw, maxh); 36 evas_object_size_hint_max_set(obj, maxw, maxh);
37} 37}
38 38
39EOLIAN static Efl_Ui_Theme_Apply_Result 39EOLIAN static Efl_Ui_Theme_Apply_Error
40_elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 40_elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
41{ 41{
42 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 42 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
43 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 43 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
44 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 44 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
45 45
46 _sizing_eval(obj); 46 _sizing_eval(obj);
47 47
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 19225b7..bd97969 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -231,10 +231,10 @@ _sizing_eval(Evas_Object *obj)
231 } 231 }
232} 232}
233 233
234EOLIAN static Efl_Ui_Theme_Apply_Result 234EOLIAN static Efl_Ui_Theme_Apply_Error
235_elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) 235_elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
236{ 236{
237 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 237 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
238 238
239 Eina_List *l, *_l, *_ll, *ll = NULL; 239 Eina_List *l, *_l, *_ll, *ll = NULL;
240 Elm_Object_Item *eo_item; 240 Elm_Object_Item *eo_item;
@@ -242,7 +242,7 @@ _elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
242 char style[1024]; 242 char style[1024];
243 243
244 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 244 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
245 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 245 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
246 246
247 if (sd->menu_bar) 247 if (sd->menu_bar)
248 snprintf(style, sizeof(style), "main_menu/%s", elm_widget_style_get(obj)); 248 snprintf(style, sizeof(style), "main_menu/%s", elm_widget_style_get(obj));
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 97e92ac..fe091b9 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -20,7 +20,7 @@
20#define MY_CLASS_NAME "Elm_Notify" 20#define MY_CLASS_NAME "Elm_Notify"
21#define MY_CLASS_NAME_LEGACY "elm_notify" 21#define MY_CLASS_NAME_LEGACY "elm_notify"
22 22
23static Efl_Ui_Theme_Apply_Result 23static Efl_Ui_Theme_Apply_Error
24_notify_theme_apply(Evas_Object *obj) 24_notify_theme_apply(Evas_Object *obj)
25{ 25{
26 const char *style = elm_widget_style_get(obj); 26 const char *style = elm_widget_style_get(obj);
@@ -139,12 +139,12 @@ _sizing_eval(Evas_Object *obj)
139 evas_object_geometry_set(obj, x, y, w, h); 139 evas_object_geometry_set(obj, x, y, w, h);
140} 140}
141 141
142EOLIAN static Efl_Ui_Theme_Apply_Result 142EOLIAN static Efl_Ui_Theme_Apply_Error
143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) 143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
144{ 144{
145 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 145 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
146 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 146 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
147 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 147 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
148 148
149 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 149 _mirrored_set(obj, efl_ui_mirrored_get(obj));
150 150
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index a0f4798..b3c9ed5 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -216,18 +216,18 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd)
216 _access_obj_process(obj, EINA_TRUE); 216 _access_obj_process(obj, EINA_TRUE);
217} 217}
218 218
219EOLIAN static Efl_Ui_Theme_Apply_Result 219EOLIAN static Efl_Ui_Theme_Apply_Error
220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) 220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
221{ 221{
222 const char *str; 222 const char *str;
223 Evas_Coord minw = 0, minh = 0; 223 Evas_Coord minw = 0, minh = 0;
224 224
225 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 225 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
226 226
227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
228 228
229 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 229 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
230 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 230 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
231 231
232 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 232 _mirrored_set(obj, efl_ui_mirrored_get(obj));
233 233
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 0130385..fdb2ac5 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -49,14 +49,14 @@ _sizing_eval(Evas_Object *obj)
49 evas_object_size_hint_max_set(obj, maxw, maxh); 49 evas_object_size_hint_max_set(obj, maxw, maxh);
50} 50}
51 51
52EOLIAN static Efl_Ui_Theme_Apply_Result 52EOLIAN static Efl_Ui_Theme_Apply_Error
53_elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) 53_elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
54{ 54{
55 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 55 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
57 57
58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
59 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 59 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
60 60
61 edje_object_mirrored_set 61 edje_object_mirrored_set
62 (wd->resize_obj, efl_ui_mirrored_get(obj)); 62 (wd->resize_obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 178e4a9..c851c8a 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -80,12 +80,12 @@ _elm_plug_efl_ui_focus_object_on_focus_update(Eo *obj, void *sd EINA_UNUSED)
80 return EINA_TRUE; 80 return EINA_TRUE;
81} 81}
82 82
83EOLIAN static Efl_Ui_Theme_Apply_Result 83EOLIAN static Efl_Ui_Theme_Apply_Error
84_elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 84_elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
85{ 85{
86 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 86 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
87 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 87 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
88 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 88 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
89 89
90 _sizing_eval(obj); 90 _sizing_eval(obj);
91 91
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 780b20a..73c4769 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -589,7 +589,7 @@ void _elm_win_standard_init(Eo *win);
589 589
590Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee); 590Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee);
591 591
592Efl_Ui_Theme_Apply_Result _elm_theme_object_set(Evas_Object *parent, 592Efl_Ui_Theme_Apply_Error _elm_theme_object_set(Evas_Object *parent,
593 Evas_Object *o, 593 Evas_Object *o,
594 const char *clas, 594 const char *clas,
595 const char *group, 595 const char *group,
@@ -597,7 +597,7 @@ Efl_Ui_Theme_Apply_Result _elm_theme_object_set(Evas_Object *parent,
597Eina_Bool _elm_theme_object_icon_set(Evas_Object *o, 597Eina_Bool _elm_theme_object_icon_set(Evas_Object *o,
598 const char *group, 598 const char *group,
599 const char *style); 599 const char *style);
600Efl_Ui_Theme_Apply_Result _elm_theme_set(Elm_Theme *th, 600Efl_Ui_Theme_Apply_Error _elm_theme_set(Elm_Theme *th,
601 Evas_Object *o, 601 Evas_Object *o,
602 const char *clas, 602 const char *clas,
603 const char *group, 603 const char *group,
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index dc8b861..6b28cd2 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -86,12 +86,12 @@ _move_resize_cb(void *data EINA_UNUSED,
86 _sizing_eval(obj); 86 _sizing_eval(obj);
87} 87}
88 88
89EOLIAN static Efl_Ui_Theme_Apply_Result 89EOLIAN static Efl_Ui_Theme_Apply_Error
90_elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) 90_elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
91{ 91{
92 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 92 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
93 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 93 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
94 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 94 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
95 95
96 //TODO 96 //TODO
97 97
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 134dd1c..c42a3af 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -398,12 +398,12 @@ _mirrored_set(Evas_Object *obj,
398 efl_ui_mirrored_set(obj, mirrored); 398 efl_ui_mirrored_set(obj, mirrored);
399} 399}
400 400
401EOLIAN static Efl_Ui_Theme_Apply_Result 401EOLIAN static Efl_Ui_Theme_Apply_Error
402_elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) 402_elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
403{ 403{
404 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 404 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
405 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 405 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
406 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 406 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
407 407
408 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 408 _mirrored_set(obj, efl_ui_mirrored_get(obj));
409 409
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 5a51829..4d05c2d 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -215,16 +215,16 @@ _update_list(Elm_Segment_Control_Data *sd)
215 } 215 }
216} 216}
217 217
218EOLIAN static Efl_Ui_Theme_Apply_Result 218EOLIAN static Efl_Ui_Theme_Apply_Error
219_elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) 219_elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd)
220{ 220{
221 Eina_List *l; 221 Eina_List *l;
222 Eina_Bool rtl; 222 Eina_Bool rtl;
223 Elm_Object_Item *eo_item; 223 Elm_Object_Item *eo_item;
224 224
225 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 225 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
226 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 226 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
227 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 227 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
228 228
229 rtl = efl_ui_mirrored_get(obj); 229 rtl = efl_ui_mirrored_get(obj);
230 230
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 482ebcf..c6ad9e3 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -16,10 +16,10 @@
16#define MY_CLASS_NAME "Elm_Separator" 16#define MY_CLASS_NAME "Elm_Separator"
17#define MY_CLASS_NAME_LEGACY "elm_separator" 17#define MY_CLASS_NAME_LEGACY "elm_separator"
18 18
19EOLIAN static Efl_Ui_Theme_Apply_Result 19EOLIAN static Efl_Ui_Theme_Apply_Error
20_elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 20_elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
21{ 21{
22 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 22 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
23 23
24 if (sd->horizontal) 24 if (sd->horizontal)
25 elm_widget_theme_element_set(obj, "horizontal"); 25 elm_widget_theme_element_set(obj, "horizontal");
@@ -27,7 +27,7 @@ _elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UN
27 elm_widget_theme_element_set(obj, "vertical"); 27 elm_widget_theme_element_set(obj, "vertical");
28 28
29 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 29 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
30 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 30 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
31 31
32 return int_ret; 32 return int_ret;
33} 33}
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index d7af7d6..4810f1b 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -804,12 +804,12 @@ _elm_slider_theme_group_get(Evas_Object *obj, Elm_Slider_Data *sd)
804 return eina_strbuf_release(new_group); 804 return eina_strbuf_release(new_group);
805} 805}
806 806
807EOLIAN static Efl_Ui_Theme_Apply_Result 807EOLIAN static Efl_Ui_Theme_Apply_Error
808_elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd) 808_elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
809{ 809{
810 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 810 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
811 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 811 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
812 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2, EFL_UI_THEME_APPLY_RESULT_FAIL); 812 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2, EFL_UI_THEME_APPLY_ERROR_GENERIC);
813 char *group; 813 char *group;
814 814
815 group = _elm_slider_theme_group_get(obj, sd); 815 group = _elm_slider_theme_group_get(obj, sd);
@@ -820,7 +820,7 @@ _elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
820 } 820 }
821 821
822 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 822 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
823 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 823 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
824 824
825 if (_is_horizontal(sd2->dir)) 825 if (_is_horizontal(sd2->dir))
826 evas_object_size_hint_min_set 826 evas_object_size_hint_min_set
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index db364ac..246f08b 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1299,15 +1299,15 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd)
1299 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 1299 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1300} 1300}
1301 1301
1302EOLIAN static Efl_Ui_Theme_Apply_Result 1302EOLIAN static Efl_Ui_Theme_Apply_Error
1303_elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) 1303_elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd)
1304{ 1304{
1305 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 1305 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
1306 1306
1307 if (!efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS))) 1307 if (efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
1308 { 1308 {
1309 CRI("Failed to set layout!"); 1309 CRI("Failed to set layout!");
1310 return EFL_UI_THEME_APPLY_RESULT_FAIL; 1310 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
1311 } 1311 }
1312 1312
1313 if (edje_object_part_exists(wd->resize_obj, "elm.swallow.dec_button")) 1313 if (edje_object_part_exists(wd->resize_obj, "elm.swallow.dec_button"))
@@ -1351,7 +1351,7 @@ _elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd)
1351 _access_spinner_register(obj, EINA_TRUE); 1351 _access_spinner_register(obj, EINA_TRUE);
1352 1352
1353 elm_layout_sizing_eval(obj); 1353 elm_layout_sizing_eval(obj);
1354 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 1354 return EFL_UI_THEME_APPLY_ERROR_NONE;
1355} 1355}
1356 1356
1357static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE; 1357static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE;
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 87bda3a..f3f20b7 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -41,12 +41,12 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
41 evas_object_table_mirrored_set(wd->resize_obj, rtl); 41 evas_object_table_mirrored_set(wd->resize_obj, rtl);
42} 42}
43 43
44EOLIAN static Efl_Ui_Theme_Apply_Result 44EOLIAN static Efl_Ui_Theme_Apply_Error
45_elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 45_elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
46{ 46{
47 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 47 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
49 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 49 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
50 50
51 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 51 _mirrored_set(obj, efl_ui_mirrored_get(obj));
52 52
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 13ebf23..c397e90 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -302,7 +302,7 @@ _elm_theme_data_find(Elm_Theme *th, const char *key)
302 return NULL; 302 return NULL;
303} 303}
304 304
305Efl_Ui_Theme_Apply_Result 305Efl_Ui_Theme_Apply_Error
306_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style) 306_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style)
307{ 307{
308 Elm_Theme *th = NULL; 308 Elm_Theme *th = NULL;
@@ -323,7 +323,7 @@ _elm_theme_object_icon_set(Evas_Object *o,
323 return _elm_theme_icon_set(th, o, group, style); 323 return _elm_theme_icon_set(th, o, group, style);
324} 324}
325 325
326Efl_Ui_Theme_Apply_Result 326Efl_Ui_Theme_Apply_Error
327_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style, Eina_Bool is_legacy) 327_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style, Eina_Bool is_legacy)
328{ 328{
329 Eina_File *file; 329 Eina_File *file;
@@ -331,9 +331,9 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
331 const char *group_sep = "/"; 331 const char *group_sep = "/";
332 const char *style_sep = ":"; 332 const char *style_sep = ":";
333 333
334 if ((!clas) || !o) return EFL_UI_THEME_APPLY_RESULT_FAIL; 334 if ((!clas) || !o) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
335 if (!th) th = theme_default; 335 if (!th) th = theme_default;
336 if (!th) return EFL_UI_THEME_APPLY_RESULT_FAIL; 336 if (!th) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
337 337
338 if (eina_streq(style, "default")) style = NULL; 338 if (eina_streq(style, "default")) style = NULL;
339 339
@@ -348,7 +348,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
348 file = _elm_theme_group_file_find(th, buf2); 348 file = _elm_theme_group_file_find(th, buf2);
349 if (file) 349 if (file)
350 { 350 {
351 if (edje_object_mmap_set(o, file, buf2)) return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 351 if (edje_object_mmap_set(o, file, buf2)) return EFL_UI_THEME_APPLY_ERROR_NONE;
352 else 352 else
353 { 353 {
354 ERR("could not set theme group '%s' from file '%s': %s", 354 ERR("could not set theme group '%s' from file '%s': %s",
@@ -362,11 +362,12 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
362 } 362 }
363 363
364 if (!style) 364 if (!style)
365 return EFL_UI_THEME_APPLY_RESULT_FAIL; 365 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
366 366
367 // Use the elementary default style. 367 // Use the elementary default style.
368 return (EFL_UI_THEME_APPLY_RESULT_DEFAULT & 368 if (_elm_theme_set(th, o, clas, group, NULL, is_legacy) == EFL_UI_THEME_APPLY_ERROR_NONE)
369 _elm_theme_set(th, o, clas, group, NULL, is_legacy)); 369 return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
370 return EFL_UI_THEME_APPLY_ERROR_GENERIC;
370} 371}
371 372
372Eina_Bool 373Eina_Bool
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index c17f1c4..bf21b81 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -1480,18 +1480,18 @@ _elm_toolbar_highlight_in_theme(Evas_Object *obj)
1480 elm_widget_highlight_in_theme_set(obj, EINA_FALSE); 1480 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
1481} 1481}
1482 1482
1483EOLIAN static Efl_Ui_Theme_Apply_Result 1483EOLIAN static Efl_Ui_Theme_Apply_Error
1484_elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) 1484_elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1485{ 1485{
1486 Elm_Toolbar_Item_Data *it; 1486 Elm_Toolbar_Item_Data *it;
1487 double scale = 0; 1487 double scale = 0;
1488 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 1488 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
1489 1489
1490 if (sd->delete_me) return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 1490 if (sd->delete_me) return EFL_UI_THEME_APPLY_ERROR_NONE;
1491 1491
1492 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 1492 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1493 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1493 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1494 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 1494 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1495 1495
1496 elm_widget_theme_object_set 1496 elm_widget_theme_object_set
1497 (obj, wd->resize_obj, "toolbar", "base", 1497 (obj, wd->resize_obj, "toolbar", "base",
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index e53c3cf..994fd39 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -579,7 +579,7 @@ struct _Elm_Widget_Item_Data
579 579
580EAPI Eina_Bool elm_widget_api_check(int ver); 580EAPI Eina_Bool elm_widget_api_check(int ver);
581EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); 581EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access);
582EAPI Efl_Ui_Theme_Apply_Result elm_widget_theme(Evas_Object *obj); 582EAPI Efl_Ui_Theme_Apply_Error elm_widget_theme(Evas_Object *obj);
583EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); 583EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
584EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb data_free); 584EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb data_free);
585EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj); 585EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj);
@@ -646,7 +646,7 @@ EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj);
646EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); 646EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj);
647EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); 647EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);
648EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); 648EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj);
649EAPI Efl_Ui_Theme_Apply_Result elm_widget_style_set(Evas_Object *obj, const char *style); 649EAPI Efl_Ui_Theme_Apply_Error elm_widget_style_set(Evas_Object *obj, const char *style);
650EAPI const char *elm_widget_style_get(const Evas_Object *obj); 650EAPI const char *elm_widget_style_get(const Evas_Object *obj);
651EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); 651EAPI void elm_widget_type_set(Evas_Object *obj, const char *type);
652EAPI const char *elm_widget_type_get(const Evas_Object *obj); 652EAPI const char *elm_widget_type_get(const Evas_Object *obj);
@@ -658,7 +658,7 @@ EAPI void elm_widget_scroll_lock_set(Evas_Object *obj, Efl_Ui_Scroll
658EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj); 658EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj);
659EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj); 659EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj);
660EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj); 660EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj);
661EAPI Efl_Ui_Theme_Apply_Result elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); 661EAPI Efl_Ui_Theme_Apply_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);
662EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func); 662EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func);
663EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse); 663EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse);
664EAPI Eina_List *elm_widget_stringlist_get(const char *str); 664EAPI Eina_List *elm_widget_stringlist_get(const char *str);
@@ -687,7 +687,7 @@ EAPI Eina_Bool elm_widget_theme_element_set(Evas_Object *obj, const char
687EAPI const char *elm_widget_theme_element_get(const Evas_Object *obj); 687EAPI const char *elm_widget_theme_element_get(const Evas_Object *obj);
688EAPI Eina_Bool elm_widget_theme_style_set(Evas_Object *obj, const char *name); 688EAPI Eina_Bool elm_widget_theme_style_set(Evas_Object *obj, const char *name);
689EAPI const char *elm_widget_theme_style_get(const Evas_Object *obj); 689EAPI const char *elm_widget_theme_style_get(const Evas_Object *obj);
690EAPI Efl_Ui_Theme_Apply_Result elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name); 690EAPI Efl_Ui_Theme_Apply_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
691 691
692/* debug function. don't use it unless you are tracking parenting issues */ 692/* debug function. don't use it unless you are tracking parenting issues */
693EAPI void elm_widget_tree_dump(const Evas_Object *top); 693EAPI void elm_widget_tree_dump(const Evas_Object *top);
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 8b5ee7a..cf4bc76 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -289,8 +289,8 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
289 edje_object_freeze(cur->obj); 289 edje_object_freeze(cur->obj);
290 edje_object_update_hints_set(cur->obj, 1); 290 edje_object_update_hints_set(cur->obj, 1);
291 291
292 if (!elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name, 292 if (elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name,
293 cur->style ? cur->style : "default")) 293 cur->style ? cur->style : "default") == EFL_UI_THEME_APPLY_ERROR_GENERIC)
294 { 294 {
295 ELM_SAFE_FREE(cur->obj, evas_object_del); 295 ELM_SAFE_FREE(cur->obj, evas_object_del);
296 return EINA_FALSE; 296 return EINA_FALSE;
@@ -779,8 +779,8 @@ elm_object_sub_cursor_style_set(Evas_Object *obj, const char *style)
779 } 779 }
780 else 780 else
781 { 781 {
782 if (!elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name, 782 if (elm_widget_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name,
783 style)) 783 style) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
784 { 784 {
785 ERR("Could not apply the theme to the cursor style=%s", style); 785 ERR("Could not apply the theme to the cursor style=%s", style);
786 return EINA_FALSE; 786 return EINA_FALSE;
@@ -820,8 +820,8 @@ void
820elm_cursor_theme(Elm_Cursor *cur) 820elm_cursor_theme(Elm_Cursor *cur)
821{ 821{
822 if ((!cur) || (!cur->obj)) return; 822 if ((!cur) || (!cur->obj)) return;
823 if (!elm_widget_theme_object_set(cur->owner, cur->obj, "cursor", 823 if (elm_widget_theme_object_set(cur->owner, cur->obj, "cursor",
824 cur->cursor_name, cur->style)) 824 cur->cursor_name, cur->style) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
825 ERR("Could not apply the theme to the cursor style=%s", cur->style); 825 ERR("Could not apply the theme to the cursor style=%s", cur->style);
826 else 826 else
827 _elm_cursor_set_hot_spots(cur); 827 _elm_cursor_set_hot_spots(cur);
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index 9b60421..78b09e8 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -445,8 +445,8 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
445 { 445 {
446 const char *style = tt->style ? tt->style : "default"; 446 const char *style = tt->style ? tt->style : "default";
447 const char *str; 447 const char *str;
448 if (!_elm_theme_object_set(tt->tt_win ? : tt->owner, tt->tooltip, 448 if (_elm_theme_object_set(tt->tt_win ? : tt->owner, tt->tooltip,
449 "tooltip", NULL, style)) 449 "tooltip", NULL, style) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
450 { 450 {
451 ERR("Could not apply the theme to the tooltip! style=%s", style); 451 ERR("Could not apply the theme to the tooltip! style=%s", style);
452 if (tt->tt_win) evas_object_del(tt->tt_win); 452 if (tt->tt_win) evas_object_del(tt->tt_win);
diff --git a/src/lib/elementary/elu_ews_wm.c b/src/lib/elementary/elu_ews_wm.c
index 4018424..0120aea 100644
--- a/src/lib/elementary/elu_ews_wm.c
+++ b/src/lib/elementary/elu_ews_wm.c
@@ -476,7 +476,7 @@ _elm_ews_wm_init(void)
476 o = edje_object_add(e); 476 o = edje_object_add(e);
477 if (!o) return EINA_FALSE; 477 if (!o) return EINA_FALSE;
478 478
479 if (!_elm_theme_set(NULL, o, "ews", "background", "default", EINA_TRUE)) 479 if (_elm_theme_set(NULL, o, "ews", "background", "default", EINA_TRUE) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
480 { 480 {
481 ERR("Could not set background theme, fallback to rectangle"); 481 ERR("Could not set background theme, fallback to rectangle");
482 evas_object_del(o); 482 evas_object_del(o);