summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/widgets/widget_preview_layout.c6
-rw-r--r--src/bin/test_layout.c18
-rw-r--r--src/examples/entry_example.c12
-rw-r--r--src/examples/layout_example_02.c5
-rw-r--r--src/lib/elc_ctxpopup.c5
-rw-r--r--src/lib/elc_fileselector.c5
-rw-r--r--src/lib/elc_fileselector_entry.c5
-rw-r--r--src/lib/elc_multibuttonentry.c5
-rw-r--r--src/lib/elc_naviframe.c5
-rw-r--r--src/lib/elc_player.c3
-rw-r--r--src/lib/elc_popup.c33
-rw-r--r--src/lib/elm_actionslider.c5
-rw-r--r--src/lib/elm_bg.c3
-rw-r--r--src/lib/elm_bubble.c3
-rw-r--r--src/lib/elm_button.c3
-rw-r--r--src/lib/elm_calendar.c4
-rw-r--r--src/lib/elm_check.c4
-rw-r--r--src/lib/elm_clock.c24
-rw-r--r--src/lib/elm_colorselector.c16
-rw-r--r--src/lib/elm_conform.c4
-rw-r--r--src/lib/elm_datetime.c4
-rw-r--r--src/lib/elm_dayselector.c3
-rw-r--r--src/lib/elm_entry.c3
-rw-r--r--src/lib/elm_flipselector.c5
-rw-r--r--src/lib/elm_frame.c3
-rw-r--r--src/lib/elm_gengrid.c4
-rw-r--r--src/lib/elm_genlist.c4
-rw-r--r--src/lib/elm_hover.c4
-rw-r--r--src/lib/elm_index.c5
-rw-r--r--src/lib/elm_inwin.c3
-rw-r--r--src/lib/elm_label.c4
-rw-r--r--src/lib/elm_list.c3
-rw-r--r--src/lib/elm_map.c41
-rw-r--r--src/lib/elm_notify.c4
-rw-r--r--src/lib/elm_panel.c42
-rw-r--r--src/lib/elm_panes.c4
-rw-r--r--src/lib/elm_progressbar.c5
-rw-r--r--src/lib/elm_radio.c3
-rw-r--r--src/lib/elm_scroller.c4
-rw-r--r--src/lib/elm_segment_control.c5
-rw-r--r--src/lib/elm_separator.c5
-rw-r--r--src/lib/elm_slider.c5
-rw-r--r--src/lib/elm_slideshow.c4
-rw-r--r--src/lib/elm_spinner.c7
-rw-r--r--src/lib/elm_thumb.c16
-rw-r--r--src/lib/elm_toolbar.c9
-rw-r--r--src/lib/elm_video.c4
47 files changed, 254 insertions, 117 deletions
diff --git a/doc/widgets/widget_preview_layout.c b/doc/widgets/widget_preview_layout.c
index 6ad287319..301f54d00 100644
--- a/doc/widgets/widget_preview_layout.c
+++ b/doc/widgets/widget_preview_layout.c
@@ -2,7 +2,11 @@
2 2
3Evas_Object *layout = elm_layout_add(win); 3Evas_Object *layout = elm_layout_add(win);
4evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 4evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
5elm_layout_theme_set(layout, "layout", "application", "toolbar-content-back-next"); 5
6if (!elm_layout_theme_set
7 (layout, "layout", "application", "toolbar-content-back-next"))
8 fprintf(stderr, "Failed to set layout!");
9
6elm_win_resize_object_add(win, layout); 10elm_win_resize_object_add(win, layout);
7evas_object_show(layout); 11evas_object_show(layout);
8 12
diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c
index 659e86a5a..9caac5c1f 100644
--- a/src/bin/test_layout.c
+++ b/src/bin/test_layout.c
@@ -49,7 +49,11 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
49 evas_object_show(box); 49 evas_object_show(box);
50 50
51 ly = elm_layout_add(win); 51 ly = elm_layout_add(win);
52 elm_layout_theme_set(ly, "layout", "application", "titlebar"); 52
53 if (!elm_layout_theme_set(
54 ly, "layout", "application", "titlebar"))
55 fprintf(stderr, "Failed to set layout");
56
53 elm_object_part_text_set(ly, "elm.text", "Some title"); 57 elm_object_part_text_set(ly, "elm.text", "Some title");
54 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 58 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); 59 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -217,7 +221,11 @@ test_layout2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
217 221
218 /* Layout Box Test */ 222 /* Layout Box Test */
219 api->box_layout = ly = elm_layout_add(win); 223 api->box_layout = ly = elm_layout_add(win);
220 elm_layout_theme_set(ly, "layout", "application", "toolbar-vbox"); 224
225 if (!elm_layout_theme_set(
226 ly, "layout", "application", "toolbar-vbox"))
227 fprintf(stderr, "Failed to set layout");
228
221 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 229 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
222 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); 230 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
223 elm_box_pack_end(box, ly); 231 elm_box_pack_end(box, ly);
@@ -232,7 +240,11 @@ test_layout2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
232 240
233 /* Layout Table Test */ 241 /* Layout Table Test */
234 api->table_layout = ly = elm_layout_add(win); 242 api->table_layout = ly = elm_layout_add(win);
235 elm_layout_theme_set(ly, "layout", "application", "toolbar-table"); 243
244 if (!elm_layout_theme_set(
245 ly, "layout", "application", "toolbar-table"))
246 fprintf(stderr, "Failed to set layout");
247
236 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 248 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
237 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); 249 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
238 elm_box_pack_end(box, ly); 250 elm_box_pack_end(box, ly);
diff --git a/src/examples/entry_example.c b/src/examples/entry_example.c
index b28b76cff..2021fb49a 100644
--- a/src/examples/entry_example.c
+++ b/src/examples/entry_example.c
@@ -57,7 +57,11 @@ _emo_content_get(void *data, Evas_Object *obj, const char *part)
57 if (strcmp(part, "elm.swallow.icon")) 57 if (strcmp(part, "elm.swallow.icon"))
58 return NULL; 58 return NULL;
59 o = elm_layout_add(obj); 59 o = elm_layout_add(obj);
60 elm_layout_theme_set(o, "entry/emoticon", data, "default"); 60 if (!elm_layout_theme_set(o, "entry/emoticon", data, "default"))
61 {
62 fprintf(stderr, "Failed to set layout");
63 return NULL;
64 }
61 return o; 65 return o;
62} 66}
63 67
@@ -545,7 +549,11 @@ elm_main(int argc, char *argv[])
545 evas_object_show(o); 549 evas_object_show(o);
546 550
547 icon = elm_layout_add(win); 551 icon = elm_layout_add(win);
548 elm_layout_theme_set(icon, "entry", "emoticon/haha", "default"); 552
553 if (!elm_layout_theme_set(
554 icon, "entry", "emoticon/haha", "default"))
555 fprintf(stderr, "Failed to set layout");
556
549 elm_object_part_content_set(o, "icon", icon); 557 elm_object_part_content_set(o, "icon", icon);
550 558
551 evas_object_smart_callback_add(o, "clicked", _image_insert_cb, &app); 559 evas_object_smart_callback_add(o, "clicked", _image_insert_cb, &app);
diff --git a/src/examples/layout_example_02.c b/src/examples/layout_example_02.c
index 9bf59dde3..034e59fd0 100644
--- a/src/examples/layout_example_02.c
+++ b/src/examples/layout_example_02.c
@@ -58,8 +58,9 @@ elm_main(int argc, char **argv)
58 layout = elm_layout_add(win); 58 layout = elm_layout_add(win);
59 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 59 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
60 elm_win_resize_object_add(win, layout); 60 elm_win_resize_object_add(win, layout);
61 elm_layout_theme_set( 61 if (!elm_layout_theme_set(
62 layout, "layout", "application", "content-back-next"); 62 layout, "layout", "application", "content-back-next"))
63 fprintf(stderr, "Failed to set layout");
63 evas_object_show(layout); 64 evas_object_show(layout);
64 65
65 icon = elm_icon_add(win); 66 icon = elm_icon_add(win);
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 278c03c11..2395e5795 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1050,7 +1050,10 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1050 1050
1051 eo_do_super(obj, evas_obj_smart_add()); 1051 eo_do_super(obj, evas_obj_smart_add());
1052 1052
1053 elm_layout_theme_set(obj, "ctxpopup", "base", elm_widget_style_get(obj)); 1053 if (!elm_layout_theme_set
1054 (obj, "ctxpopup", "base", elm_widget_style_get(obj)))
1055 CRITICAL("Failed to set layout!");
1056
1054 elm_layout_signal_callback_add 1057 elm_layout_signal_callback_add
1055 (obj, "elm,action,hide,finished", "", _hide_finished_cb, obj); 1058 (obj, "elm,action,hide,finished", "", _hide_finished_cb, obj);
1056 1059
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index fd4760e8f..b25dede34 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -760,8 +760,9 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
760 760
761 priv->expand = !!_elm_config->fileselector_expand_enable; 761 priv->expand = !!_elm_config->fileselector_expand_enable;
762 762
763 elm_layout_theme_set 763 if (!elm_layout_theme_set
764 (obj, "fileselector", "base", elm_widget_style_get(obj)); 764 (obj, "fileselector", "base", elm_widget_style_get(obj)))
765 CRITICAL("Failed to set layout!");
765 766
766 // up btn 767 // up btn
767 ic = elm_icon_add(obj); 768 ic = elm_icon_add(obj);
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 22e961d00..386058ba1 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -342,8 +342,9 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
342 342
343 eo_do_super(obj, evas_obj_smart_add()); 343 eo_do_super(obj, evas_obj_smart_add());
344 344
345 elm_layout_theme_set 345 if (!elm_layout_theme_set
346 (obj, "fileselector_entry", "base", elm_widget_style_get(obj)); 346 (obj, "fileselector_entry", "base", elm_widget_style_get(obj)))
347 CRITICAL("Failed to set layout!");
347 348
348 priv->button = elm_fileselector_button_add(obj); 349 priv->button = elm_fileselector_button_add(obj);
349 elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE); 350 elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE);
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 207293727..38072c949 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1515,8 +1515,9 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1515 1515
1516 eo_do_super(obj, evas_obj_smart_add()); 1516 eo_do_super(obj, evas_obj_smart_add());
1517 1517
1518 elm_layout_theme_set 1518 if (!elm_layout_theme_set
1519 (obj, "multibuttonentry", "base", elm_widget_style_get(obj)); 1519 (obj, "multibuttonentry", "base", elm_widget_style_get(obj)))
1520 CRITICAL("Failed to set layout!");
1520 1521
1521 elm_widget_can_focus_set(obj, EINA_TRUE); 1522 elm_widget_can_focus_set(obj, EINA_TRUE);
1522 1523
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index c992ae928..d5724c970 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -257,8 +257,9 @@ _item_style_set(Elm_Naviframe_Item *it,
257 eina_stringshare_replace(&it->style, item_style); 257 eina_stringshare_replace(&it->style, item_style);
258 } 258 }
259 259
260 elm_layout_theme_set(VIEW(it), "naviframe", buf, 260 if (!elm_layout_theme_set(VIEW(it), "naviframe", buf,
261 elm_widget_style_get(WIDGET(it))); 261 elm_widget_style_get(WIDGET(it))))
262 CRITICAL("Failed to set layout!");
262 263
263 if (sd->freeze_events) 264 if (sd->freeze_events)
264 evas_object_freeze_events_set(VIEW(it), EINA_FALSE); 265 evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 02527f70d..4b1b5d0af 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -510,7 +510,8 @@ _elm_player_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
510 510
511 Elm_Player_Smart_Data *priv = _pd; 511 Elm_Player_Smart_Data *priv = _pd;
512 512
513 elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)); 513 if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
514 CRITICAL("Failed to set layout!");
514 515
515 priv->forward = _player_button_add(obj, "media_player/forward", _forward); 516 priv->forward = _player_button_add(obj, "media_player/forward", _forward);
516 priv->info = _player_button_add(obj, "media_player/info", _info); 517 priv->info = _player_button_add(obj, "media_player/info", _info);
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 6c6e49cb5..09b3b3afb 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -296,16 +296,18 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
296 if (sd->button_count) 296 if (sd->button_count)
297 { 297 {
298 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); 298 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
299 elm_layout_theme_set(sd->action_area, "popup", buf, 299 if (!elm_layout_theme_set(sd->action_area, "popup", buf,
300 elm_widget_style_get(obj)); 300 elm_widget_style_get(obj)))
301 CRITICAL("Failed to set layout!");
301 for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++) 302 for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
302 { 303 {
303 if (!sd->buttons[i]) continue; 304 if (!sd->buttons[i]) continue;
304 elm_object_style_set(sd->buttons[i]->btn, buf); 305 elm_object_style_set(sd->buttons[i]->btn, buf);
305 } 306 }
306 } 307 }
307 elm_layout_theme_set(sd->content_area, "popup", "content", 308 if (!elm_layout_theme_set(sd->content_area, "popup", "content",
308 elm_widget_style_get(obj)); 309 elm_widget_style_get(obj)))
310 CRITICAL("Failed to set layout!");
309 if (sd->text_content_obj) 311 if (sd->text_content_obj)
310 { 312 {
311 snprintf(buf, sizeof(buf), "popup/%s", elm_widget_style_get(obj)); 313 snprintf(buf, sizeof(buf), "popup/%s", elm_widget_style_get(obj));
@@ -543,8 +545,9 @@ _button_remove(Evas_Object *obj,
543 else 545 else
544 { 546 {
545 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); 547 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
546 elm_layout_theme_set 548 if (!elm_layout_theme_set
547 (sd->action_area, "popup", buf, elm_widget_style_get(obj)); 549 (sd->action_area, "popup", buf, elm_widget_style_get(obj)))
550 CRITICAL("Failed to set layout!");
548 } 551 }
549} 552}
550 553
@@ -1085,8 +1088,9 @@ _action_button_set(Evas_Object *obj,
1085 } 1088 }
1086 1089
1087 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); 1090 snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
1088 elm_layout_theme_set 1091 if (!elm_layout_theme_set
1089 (sd->action_area, "popup", buf, elm_widget_style_get(obj)); 1092 (sd->action_area, "popup", buf, elm_widget_style_get(obj)))
1093 CRITICAL("Failed to set layout!");
1090 1094
1091 adata = ELM_NEW(Action_Area_Data); 1095 adata = ELM_NEW(Action_Area_Data);
1092 adata->obj = obj; 1096 adata->obj = obj;
@@ -1452,7 +1456,8 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1452 if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) 1456 if (!elm_widget_sub_object_add(eo_parent_get(obj), obj))
1453 ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); 1457 ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj));
1454 1458
1455 elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj)); 1459 if (!elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj)))
1460 CRITICAL("Failed to set layout!");
1456 1461
1457 priv->notify = elm_notify_add(obj); 1462 priv->notify = elm_notify_add(obj);
1458 elm_notify_align_set(priv->notify, 0.5, 0.5); 1463 elm_notify_align_set(priv->notify, 0.5, 0.5);
@@ -1480,11 +1485,13 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1480 (obj, "elm,state,action_area,hidden", "elm", _layout_change_cb, obj); 1485 (obj, "elm,state,action_area,hidden", "elm", _layout_change_cb, obj);
1481 1486
1482 priv->content_area = elm_layout_add(obj); 1487 priv->content_area = elm_layout_add(obj);
1483 elm_layout_theme_set 1488 if (!elm_layout_theme_set
1484 (priv->content_area, "popup", "content", elm_widget_style_get(obj)); 1489 (priv->content_area, "popup", "content", elm_widget_style_get(obj)))
1490 CRITICAL("Failed to set layout!");
1485 priv->action_area = elm_layout_add(obj); 1491 priv->action_area = elm_layout_add(obj);
1486 elm_layout_theme_set(priv->action_area, "popup", "buttons0", 1492 if (!elm_layout_theme_set(priv->action_area, "popup", "buttons0",
1487 elm_widget_style_get(obj)); 1493 elm_widget_style_get(obj)))
1494 CRITICAL("Failed to set layout!");
1488 evas_object_size_hint_weight_set(priv->action_area, EVAS_HINT_EXPAND, 1495 evas_object_size_hint_weight_set(priv->action_area, EVAS_HINT_EXPAND,
1489 EVAS_HINT_EXPAND); 1496 EVAS_HINT_EXPAND);
1490 evas_object_size_hint_align_set(priv->action_area, EVAS_HINT_FILL, 1497 evas_object_size_hint_align_set(priv->action_area, EVAS_HINT_FILL,
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 82b56bedd..83e7afbd1 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -408,8 +408,9 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
408 (wd->resize_obj, "elm.drag_button,mouse,move", "", 408 (wd->resize_obj, "elm.drag_button,mouse,move", "",
409 _drag_button_move_cb, obj); 409 _drag_button_move_cb, obj);
410 410
411 elm_layout_theme_set 411 if (!elm_layout_theme_set
412 (obj, "actionslider", "base", elm_widget_style_get(obj)); 412 (obj, "actionslider", "base", elm_widget_style_get(obj)))
413 CRITICAL("Failed to set layout!");
413 414
414 elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base); 415 elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base);
415 416
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index db355b81a..fcdc41a07 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -113,7 +113,8 @@ _elm_bg_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
113 113
114 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj); 114 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj);
115 115
116 elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj)); 116 if (!elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj)))
117 CRITICAL("Failed to set layout!");
117} 118}
118 119
119static void 120static void
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 9c187afb3..08bf1459a 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -212,7 +212,8 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
212 _elm_access_callback_set 212 _elm_access_callback_set
213 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 213 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
214 214
215 elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)); 215 if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
216 CRITICAL("Failed to set layout!");
216 217
217 elm_layout_sizing_eval(obj); 218 elm_layout_sizing_eval(obj);
218 219
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index c4ea81f1a..4424cad93 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -317,7 +317,8 @@ _elm_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
317 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, priv); 317 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, priv);
318 318
319 elm_widget_can_focus_set(obj, EINA_TRUE); 319 elm_widget_can_focus_set(obj, EINA_TRUE);
320 elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)); 320 if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))
321 CRITICAL("Failed to set layout!");
321} 322}
322 323
323static void 324static void
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index ffa0ede5a..f2156bf30 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1008,7 +1008,9 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1008 1008
1009 elm_widget_can_focus_set(obj, EINA_TRUE); 1009 elm_widget_can_focus_set(obj, EINA_TRUE);
1010 1010
1011 elm_layout_theme_set(obj, "calendar", "base", elm_object_style_get(obj)); 1011 if (!elm_layout_theme_set(obj, "calendar", "base",
1012 elm_object_style_get(obj)))
1013 CRITICAL("Failed to set layout!");
1012 1014
1013 evas_object_smart_changed(obj); 1015 evas_object_smart_changed(obj);
1014 1016
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index e26b39c46..a554b40c8 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -308,7 +308,9 @@ _elm_check_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
308 308
309 elm_widget_can_focus_set(obj, EINA_TRUE); 309 elm_widget_can_focus_set(obj, EINA_TRUE);
310 310
311 elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)); 311 if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)))
312 CRITICAL("Failed to set layout!");
313
312 elm_layout_sizing_eval(obj); 314 elm_layout_sizing_eval(obj);
313} 315}
314 316
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 74a62ac6e..43084df34 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -361,13 +361,25 @@ _time_update(Evas_Object *obj)
361 } 361 }
362 362
363 if ((sd->seconds) && (sd->am_pm)) 363 if ((sd->seconds) && (sd->am_pm))
364 elm_layout_theme_set(obj, "clock", "base-all", style); 364 {
365 if (!elm_layout_theme_set(obj, "clock", "base-all", style))
366 CRITICAL("Failed to set layout!");
367 }
365 else if (sd->seconds) 368 else if (sd->seconds)
366 elm_layout_theme_set(obj, "clock", "base-seconds", style); 369 {
370 if (!elm_layout_theme_set(obj, "clock", "base-seconds", style))
371 CRITICAL("Failed to set layout!");
372 }
367 else if (sd->am_pm) 373 else if (sd->am_pm)
368 elm_layout_theme_set(obj, "clock", "base-am_pm", style); 374 {
375 if (!elm_layout_theme_set(obj, "clock", "base-am_pm", style))
376 CRITICAL("Failed to set layout!");
377 }
369 else 378 else
370 elm_layout_theme_set(obj, "clock", "base", style); 379 {
380 if (!elm_layout_theme_set(obj, "clock", "base", style))
381 CRITICAL("Failed to set layout!");
382 }
371 383
372 edje_object_scale_set 384 edje_object_scale_set
373 (wd->resize_obj, elm_widget_scale_get(obj) * 385 (wd->resize_obj, elm_widget_scale_get(obj) *
@@ -446,8 +458,8 @@ _time_update(Evas_Object *obj)
446 evas_object_show(sd->am_pm_obj); 458 evas_object_show(sd->am_pm_obj);
447 } 459 }
448 460
449 /* access */ 461 /* access */
450 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 462 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
451 _access_time_register(obj, EINA_TRUE); 463 _access_time_register(obj, EINA_TRUE);
452 464
453 edje_object_size_min_calc(wd->resize_obj, &mw, &mh); 465 edje_object_size_min_calc(wd->resize_obj, &mw, &mh);
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 7407a31e7..d6eca492a 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1093,8 +1093,10 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd, va_list *list)
1093 1093
1094 EINA_LIST_FOREACH(sd->items, elist, item) 1094 EINA_LIST_FOREACH(sd->items, elist, item)
1095 { 1095 {
1096 elm_layout_theme_set 1096 if (!elm_layout_theme_set
1097 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)); 1097 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
1098 CRITICAL("Failed to set layout!");
1099
1098 elm_widget_theme_object_set 1100 elm_widget_theme_object_set
1099 (obj, item->color_obj, "colorselector", "item/color", 1101 (obj, item->color_obj, "colorselector", "item/color",
1100 elm_widget_style_get(obj)); 1102 elm_widget_style_get(obj));
@@ -1357,8 +1359,9 @@ _item_new(Evas_Object *obj)
1357 if (!item) return NULL; 1359 if (!item) return NULL;
1358 1360
1359 VIEW(item) = elm_layout_add(obj); 1361 VIEW(item) = elm_layout_add(obj);
1360 elm_layout_theme_set 1362 if (!elm_layout_theme_set
1361 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)); 1363 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
1364 CRITICAL("Failed to set layout!");
1362 evas_object_size_hint_weight_set 1365 evas_object_size_hint_weight_set
1363 (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1366 (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1364 evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); 1367 evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1460,8 +1463,9 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1460 1463
1461 eo_do_super(obj, evas_obj_smart_add()); 1464 eo_do_super(obj, evas_obj_smart_add());
1462 1465
1463 elm_layout_theme_set 1466 if (!elm_layout_theme_set
1464 (obj, "colorselector", "palette", elm_object_style_get(obj)); 1467 (obj, "colorselector", "palette", elm_object_style_get(obj)))
1468 CRITICAL("Failed to set layout!");
1465 1469
1466 priv->palette_box = elm_box_add(obj); 1470 priv->palette_box = elm_box_add(obj);
1467 elm_box_layout_set 1471 elm_box_layout_set
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index d84ee20b4..e94de1b88 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -888,7 +888,9 @@ _elm_conformant_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNU
888 888
889 elm_widget_can_focus_set(obj, EINA_FALSE); 889 elm_widget_can_focus_set(obj, EINA_FALSE);
890 890
891 elm_layout_theme_set(obj, "conformant", "base", elm_widget_style_get(obj)); 891 if (!elm_layout_theme_set
892 (obj, "conformant", "base", elm_widget_style_get(obj)))
893 CRITICAL("Failed to set layout!");
892 894
893 _conformant_parts_swallow(obj); 895 _conformant_parts_swallow(obj);
894 896
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 29a5e5a6b..2672565bf 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -766,7 +766,9 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
766 766
767 eo_do_super(obj, evas_obj_smart_add()); 767 eo_do_super(obj, evas_obj_smart_add());
768 768
769 elm_layout_theme_set(obj, "datetime", "base", elm_widget_style_get(obj)); 769 if (!elm_layout_theme_set(obj, "datetime", "base",
770 elm_widget_style_get(obj)))
771 CRITICAL("Failed to set layout!");
770 772
771 // module - initialise module for datetime 773 // module - initialise module for datetime
772 if (!dt_mod) dt_mod = _dt_mod_init(); 774 if (!dt_mod) dt_mod = _dt_mod_init();
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 1338812d7..259a51295 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -424,7 +424,8 @@ _elm_dayselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
424 424
425 eo_do_super(obj, evas_obj_smart_add()); 425 eo_do_super(obj, evas_obj_smart_add());
426 426
427 elm_layout_theme_set(obj, "dayselector", "base", "dayselector"); 427 if (!elm_layout_theme_set(obj, "dayselector", "base", "dayselector"))
428 CRITICAL("Failed to set layout!");
428 429
429 priv->week_start = _elm_config->week_start; 430 priv->week_start = _elm_config->week_start;
430 priv->weekend_start = _elm_config->weekend_start; 431 priv->weekend_start = _elm_config->weekend_start;
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 237c20cbb..00c6f4a11 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2781,7 +2781,8 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2781 priv->auto_save = EINA_TRUE; 2781 priv->auto_save = EINA_TRUE;
2782 priv->editable = EINA_TRUE; 2782 priv->editable = EINA_TRUE;
2783 2783
2784 elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj)); 2784 if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj)))
2785 CRITICAL("Failed to set layout!");
2785 2786
2786 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 2787 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
2787 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); 2788 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj);
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index e6f14b353..e544dde02 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -555,8 +555,9 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
555 555
556 eo_do_super(obj, evas_obj_smart_add()); 556 eo_do_super(obj, evas_obj_smart_add());
557 557
558 elm_layout_theme_set 558 if (!elm_layout_theme_set
559 (obj, "flipselector", "base", elm_widget_style_get(obj)); 559 (obj, "flipselector", "base", elm_widget_style_get(obj)))
560 CRITICAL("Failed to set layout!");
560 561
561 elm_layout_signal_callback_add 562 elm_layout_signal_callback_add
562 (obj, "elm,action,up,start", "", _signal_val_up_start, obj); 563 (obj, "elm,action,up,start", "", _signal_val_up_start, obj);
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index eb3663473..94102790f 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -180,7 +180,8 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
180 180
181 elm_widget_can_focus_set(obj, EINA_FALSE); 181 elm_widget_can_focus_set(obj, EINA_FALSE);
182 182
183 elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj)); 183 if (!elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj)))
184 CRITICAL("Failed to set layout!");
184 185
185 elm_layout_sizing_eval(obj); 186 elm_layout_sizing_eval(obj);
186} 187}
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 5369b7704..78c095452 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2402,7 +2402,9 @@ _elm_gengrid_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2402 2402
2403 priv->generation = 1; 2403 priv->generation = 1;
2404 2404
2405 elm_layout_theme_set(obj, "gengrid", "base", elm_widget_style_get(obj)); 2405 if (!elm_layout_theme_set(obj, "gengrid", "base",
2406 elm_widget_style_get(obj)))
2407 CRITICAL("Failed to set layout!");
2406 2408
2407 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); 2409 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
2408 2410
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index db975b7b4..a4f72845b 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4722,7 +4722,9 @@ _elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4722 4722
4723 priv->generation = 1; 4723 priv->generation = 1;
4724 4724
4725 elm_layout_theme_set(obj, "genlist", "base", elm_widget_style_get(obj)); 4725 if (!elm_layout_theme_set
4726 (obj, "genlist", "base", elm_widget_style_get(obj)))
4727 CRITICAL("Failed to set layout!");
4726 4728
4727 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); 4729 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
4728 4730
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 470871cbe..89ce08def 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -537,7 +537,9 @@ _elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
537 for (i = 0; i < sizeof(priv->subs) / sizeof(priv->subs[0]); i++) 537 for (i = 0; i < sizeof(priv->subs) / sizeof(priv->subs[0]); i++)
538 priv->subs[i].swallow = _content_aliases[i].alias; 538 priv->subs[i].swallow = _content_aliases[i].alias;
539 539
540 elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj)); 540 if (!elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj)))
541 CRITICAL("Failed to set layout!");
542
541 elm_layout_signal_callback_add 543 elm_layout_signal_callback_add
542 (obj, "elm,action,dismiss", "", _hov_dismiss_cb, obj); 544 (obj, "elm,action,dismiss", "", _hov_dismiss_cb, obj);
543 545
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index c4778d27a..6b0ce03d6 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -892,8 +892,9 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
892 892
893 eo_do_super(obj, evas_obj_smart_add()); 893 eo_do_super(obj, evas_obj_smart_add());
894 894
895 elm_layout_theme_set 895 if (!elm_layout_theme_set
896 (obj, "index", "base/vertical", elm_widget_style_get(obj)); 896 (obj, "index", "base/vertical", elm_widget_style_get(obj)))
897 CRITICAL("Failed to set layout!");
897 898
898 o = evas_object_rectangle_add(evas_object_evas_get(obj)); 899 o = evas_object_rectangle_add(evas_object_evas_get(obj));
899 priv->event[0] = o; 900 priv->event[0] = o;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 9f3975895..67212c1d3 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -77,7 +77,8 @@ _elm_inwin_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
77 77
78 evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 78 evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
79 evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); 79 evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
80 elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj)); 80 if (!elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj)))
81 CRITICAL("Failed to set layout!");
81} 82}
82 83
83static void 84static void
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 36ac627f8..dabf952d3 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -405,7 +405,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
405 _elm_access_callback_set 405 _elm_access_callback_set
406 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 406 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
407 407
408 elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)); 408 if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
409 CRITICAL("Failed to set layout!");
410
409 elm_layout_text_set(obj, NULL, "<br>"); 411 elm_layout_text_set(obj, NULL, "<br>");
410 elm_layout_sizing_eval(obj); 412 elm_layout_sizing_eval(obj);
411} 413}
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 9f1e231c0..3e46dc0af 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1592,7 +1592,8 @@ _elm_list_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1592 1592
1593 priv->mode = ELM_LIST_SCROLL; 1593 priv->mode = ELM_LIST_SCROLL;
1594 1594
1595 elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj)); 1595 if (!elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj)))
1596 CRITICAL("Failed to set layout!");
1596 1597
1597 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 1598 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
1598 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); 1599 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj);
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 21b334259..610b1346c 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1518,26 +1518,31 @@ _overlay_default_layout_update(Overlay_Default *ovl)
1518 if (ovl->icon) 1518 if (ovl->icon)
1519 { 1519 {
1520 evas_object_color_set(ovl->layout, 255, 255, 255, 255); 1520 evas_object_color_set(ovl->layout, 255, 255, 255, 255);
1521 elm_layout_theme_set 1521 if (!elm_layout_theme_set
1522 (ovl->layout, "map/marker", "empty", 1522 (ovl->layout, "map/marker", "empty",
1523 elm_widget_style_get((ovl->wsd)->obj)); 1523 elm_widget_style_get((ovl->wsd)->obj)))
1524 CRITICAL("Failed to set layout!");
1525
1524 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon); 1526 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon);
1525 } 1527 }
1526 else if (!ovl->icon && ovl->clas_icon) 1528 else if (!ovl->icon && ovl->clas_icon)
1527 { 1529 {
1528 evas_object_color_set(ovl->layout, 255, 255, 255, 255); 1530 evas_object_color_set(ovl->layout, 255, 255, 255, 255);
1529 elm_layout_theme_set 1531 if (!elm_layout_theme_set
1530 (ovl->layout, "map/marker", "empty", 1532 (ovl->layout, "map/marker", "empty",
1531 elm_widget_style_get((ovl->wsd)->obj)); 1533 elm_widget_style_get((ovl->wsd)->obj)))
1534 CRITICAL("Failed to set layout!");
1535
1532 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon); 1536 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon);
1533 } 1537 }
1534 else 1538 else
1535 { 1539 {
1536 evas_object_color_set 1540 evas_object_color_set
1537 (ovl->layout, ovl->c.r, ovl->c.g, ovl->c.b, ovl->c.a); 1541 (ovl->layout, ovl->c.r, ovl->c.g, ovl->c.b, ovl->c.a);
1538 elm_layout_theme_set 1542 if (!elm_layout_theme_set
1539 (ovl->layout, "map/marker", "radio", 1543 (ovl->layout, "map/marker", "radio",
1540 elm_widget_style_get((ovl->wsd)->obj)); 1544 elm_widget_style_get((ovl->wsd)->obj)))
1545 CRITICAL("Failed to set layout!");
1541 } 1546 }
1542} 1547}
1543 1548
@@ -1619,8 +1624,10 @@ _overlay_default_new(Elm_Map_Overlay *overlay,
1619 ovl->layout = elm_layout_add((ovl->wsd)->obj); 1624 ovl->layout = elm_layout_add((ovl->wsd)->obj);
1620 evas_object_smart_member_add(ovl->layout, ovl->wsd->pan_obj); 1625 evas_object_smart_member_add(ovl->layout, ovl->wsd->pan_obj);
1621 evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays); 1626 evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays);
1622 elm_layout_theme_set(ovl->layout, "map/marker", "radio", 1627 if (!elm_layout_theme_set(ovl->layout, "map/marker", "radio",
1623 elm_widget_style_get((ovl->wsd)->obj)); 1628 elm_widget_style_get((ovl->wsd)->obj)))
1629 CRITICAL("Failed to set layout!");
1630
1624 evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN, 1631 evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN,
1625 _overlay_clicked_cb, overlay); 1632 _overlay_clicked_cb, overlay);
1626 ovl->lon = lon; 1633 ovl->lon = lon;
@@ -2310,8 +2317,10 @@ _overlay_circle_new(Elm_Map_Smart_Data *sd,
2310 ovl->obj = elm_layout_add(sd->obj); 2317 ovl->obj = elm_layout_add(sd->obj);
2311 evas_object_smart_member_add(ovl->obj, sd->pan_obj); 2318 evas_object_smart_member_add(ovl->obj, sd->pan_obj);
2312 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); 2319 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
2313 elm_layout_theme_set(ovl->obj, "map/circle", "base", 2320 if (!elm_layout_theme_set(ovl->obj, "map/circle", "base",
2314 elm_widget_style_get(sd->obj)); 2321 elm_widget_style_get(sd->obj)))
2322 CRITICAL("Failed to set layout!");
2323
2315 _overlay_circle_color_update(ovl, c); 2324 _overlay_circle_color_update(ovl, c);
2316 2325
2317 return ovl; 2326 return ovl;
@@ -2394,8 +2403,10 @@ _overlay_scale_new(Elm_Map_Smart_Data *sd,
2394 ovl->obj = elm_layout_add(sd->obj); 2403 ovl->obj = elm_layout_add(sd->obj);
2395 evas_object_smart_member_add(ovl->obj, sd->pan_obj); 2404 evas_object_smart_member_add(ovl->obj, sd->pan_obj);
2396 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); 2405 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
2397 elm_layout_theme_set(ovl->obj, "map/scale", "base", 2406 if (!elm_layout_theme_set(ovl->obj, "map/scale", "base",
2398 elm_widget_style_get(sd->obj)); 2407 elm_widget_style_get(sd->obj)))
2408 CRITICAL("Failed to set layout!");
2409
2399 s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w"); 2410 s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w");
2400 2411
2401 if (s) ovl->w = atoi(s); 2412 if (s) ovl->w = atoi(s);
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 1068efc9e..e77a407fb 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -86,7 +86,9 @@ _block_events_theme_apply(Evas_Object *obj)
86 86
87 const char *style = elm_widget_style_get(obj); 87 const char *style = elm_widget_style_get(obj);
88 88
89 elm_layout_theme_set(sd->block_events, "notify", "block_events", style); 89 if (!elm_layout_theme_set
90 (sd->block_events, "notify", "block_events", style))
91 CRITICAL("Failed to set layout!");
90} 92}
91 93
92static void 94static void
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index d66030af8..b15088e82 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -54,30 +54,45 @@ _orient_set_do(Evas_Object *obj)
54 switch (sd->orient) 54 switch (sd->orient)
55 { 55 {
56 case ELM_PANEL_ORIENT_TOP: 56 case ELM_PANEL_ORIENT_TOP:
57 elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)); 57 if (!elm_layout_theme_set
58 (obj, "panel", "top", elm_widget_style_get(obj)))
59 CRITICAL("Failed to set layout!");
58 break; 60 break;
59 61
60 case ELM_PANEL_ORIENT_BOTTOM: 62 case ELM_PANEL_ORIENT_BOTTOM:
61 elm_layout_theme_set 63 if (!elm_layout_theme_set
62 (obj, "panel", "bottom", elm_widget_style_get(obj)); 64 (obj, "panel", "bottom", elm_widget_style_get(obj)))
65 CRITICAL("Failed to set layout!");
63 break; 66 break;
64 67
65 case ELM_PANEL_ORIENT_LEFT: 68 case ELM_PANEL_ORIENT_LEFT:
66 if (!elm_widget_mirrored_get(obj)) 69 if (!elm_widget_mirrored_get(obj))
67 elm_layout_theme_set 70 {
68 (obj, "panel", "left", elm_widget_style_get(obj)); 71 if (!elm_layout_theme_set
72 (obj, "panel", "left", elm_widget_style_get(obj)))
73 CRITICAL("Failed to set layout!");
74 }
69 else 75 else
70 elm_layout_theme_set 76 {
71 (obj, "panel", "right", elm_widget_style_get(obj)); 77 if (!elm_layout_theme_set
78 (obj, "panel", "right", elm_widget_style_get(obj)))
79 CRITICAL("Failed to set layout!");
80 }
72 break; 81 break;
73 82
74 case ELM_PANEL_ORIENT_RIGHT: 83 case ELM_PANEL_ORIENT_RIGHT:
75 if (!elm_widget_mirrored_get(obj)) 84 if (!elm_widget_mirrored_get(obj))
76 elm_layout_theme_set 85 {
77 (obj, "panel", "right", elm_widget_style_get(obj)); 86 if (!elm_layout_theme_set
87 (obj, "panel", "right", elm_widget_style_get(obj)))
88 CRITICAL("Failed to set layout!");
89 }
78 else 90 else
79 elm_layout_theme_set 91 {
80 (obj, "panel", "left", elm_widget_style_get(obj)); 92 if (!elm_layout_theme_set
93 (obj, "panel", "left", elm_widget_style_get(obj)))
94 CRITICAL("Failed to set layout!");
95 }
81 break; 96 break;
82 } 97 }
83 98
@@ -86,7 +101,7 @@ _orient_set_do(Evas_Object *obj)
86 { 101 {
87 Evas_Object *ao; 102 Evas_Object *ao;
88 ao = _elm_access_edje_object_part_object_register 103 ao = _elm_access_edje_object_part_object_register
89 (obj, wd->resize_obj, "btn_icon"); 104 (obj, wd->resize_obj, "btn_icon");
90 _elm_access_text_set(_elm_access_object_get(ao), 105 _elm_access_text_set(_elm_access_object_get(ao),
91 ELM_ACCESS_TYPE, E_("panel button")); 106 ELM_ACCESS_TYPE, E_("panel button"));
92 _elm_access_callback_set 107 _elm_access_callback_set
@@ -322,7 +337,8 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
322 elm_widget_can_focus_set(obj, EINA_TRUE); 337 elm_widget_can_focus_set(obj, EINA_TRUE);
323 338
324 /* just to bootstrap and have theme hook to work */ 339 /* just to bootstrap and have theme hook to work */
325 elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)); 340 if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)))
341 CRITICAL("Failed to set layout!");
326 342
327 eo_do(obj, elm_wdg_theme(NULL)); 343 eo_do(obj, elm_wdg_theme(NULL));
328 344
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 0beba7a62..b9c53a2a2 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -187,7 +187,9 @@ _elm_panes_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
187 187
188 eo_do_super(obj, evas_obj_smart_add()); 188 eo_do_super(obj, evas_obj_smart_add());
189 189
190 elm_layout_theme_set(obj, "panes", "vertical", elm_widget_style_get(obj)); 190 if (!elm_layout_theme_set
191 (obj, "panes", "vertical", elm_widget_style_get(obj)))
192 CRITICAL("Failed to set layout!");
191 193
192 elm_panes_content_left_size_set(obj, 0.5); 194 elm_panes_content_left_size_set(obj, 0.5);
193 195
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 73490d759..03b0a229b 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -244,8 +244,9 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
244 priv->units = eina_stringshare_add("%.0f %%"); 244 priv->units = eina_stringshare_add("%.0f %%");
245 priv->val = MIN_RATIO_LVL; 245 priv->val = MIN_RATIO_LVL;
246 246
247 elm_layout_theme_set 247 if (!elm_layout_theme_set
248 (obj, "progressbar", "horizontal", elm_widget_style_get(obj)); 248 (obj, "progressbar", "horizontal", elm_widget_style_get(obj)))
249 CRITICAL("Failed to set layout!");
249 250
250 priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj)); 251 priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj));
251 evas_object_color_set(priv->spacer, 0, 0, 0, 0); 252 evas_object_color_set(priv->spacer, 0, 0, 0, 0);
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 459826676..9252ec92c 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -268,7 +268,8 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
268 268
269 eo_do_super(obj, evas_obj_smart_add()); 269 eo_do_super(obj, evas_obj_smart_add());
270 270
271 elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)); 271 if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
272 CRITICAL("Failed to set layout!");
272 273
273 elm_layout_signal_callback_add 274 elm_layout_signal_callback_add
274 (obj, "elm,action,radio,on", "", _radio_on_cb, obj); 275 (obj, "elm,action,radio,on", "", _radio_on_cb, obj);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index ffbe3d620..f78a809d4 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -708,7 +708,9 @@ _elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
708 708
709 elm_widget_can_focus_set(obj, EINA_TRUE); 709 elm_widget_can_focus_set(obj, EINA_TRUE);
710 710
711 elm_layout_theme_set(obj, "scroller", "base", elm_widget_style_get(obj)); 711 if (!elm_layout_theme_set
712 (obj, "scroller", "base", elm_widget_style_get(obj)))
713 CRITICAL("Failed to set layout!");
712 714
713 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 715 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
714 evas_object_smart_member_add(priv->hit_rect, obj); 716 evas_object_smart_member_add(priv->hit_rect, obj);
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 0d1a68872..9de331bb4 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -591,8 +591,9 @@ _elm_segment_control_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EIN
591{ 591{
592 eo_do_super(obj, evas_obj_smart_add()); 592 eo_do_super(obj, evas_obj_smart_add());
593 593
594 elm_layout_theme_set 594 if (!elm_layout_theme_set
595 (obj, "segment_control", "base", elm_widget_style_get(obj)); 595 (obj, "segment_control", "base", elm_widget_style_get(obj)))
596 CRITICAL("Failed to set layout!");
596 597
597 evas_object_event_callback_add 598 evas_object_event_callback_add
598 (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj); 599 (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj);
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 2fabf5a4f..3acd509d5 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -50,8 +50,9 @@ _elm_separator_smart_add(Eo *obj, void *_pd __UNUSED__,
50 50
51 elm_widget_can_focus_set(obj, EINA_FALSE); 51 elm_widget_can_focus_set(obj, EINA_FALSE);
52 52
53 elm_layout_theme_set 53 if (!elm_layout_theme_set
54 (obj, "separator", "vertical", elm_widget_style_get(obj)); 54 (obj, "separator", "vertical", elm_widget_style_get(obj)))
55 CRITICAL("Failed to set layout!");
55 56
56 elm_layout_sizing_eval(obj); 57 elm_layout_sizing_eval(obj);
57} 58}
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 64e2ab7e4..f4afe914f 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -757,8 +757,9 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
757 priv->indicator_show = EINA_TRUE; 757 priv->indicator_show = EINA_TRUE;
758 priv->val_max = 1.0; 758 priv->val_max = 1.0;
759 759
760 elm_layout_theme_set 760 if (!elm_layout_theme_set
761 (obj, "slider", "horizontal", elm_widget_style_get(obj)); 761 (obj, "slider", "horizontal", elm_widget_style_get(obj)))
762 CRITICAL("Failed to set layout!");
762 763
763 elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj); 764 elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj);
764 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj); 765 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj);
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 5b581fd62..81015cb08 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -315,7 +315,9 @@ _elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
315 priv->count_item_pre_before = 2; 315 priv->count_item_pre_before = 2;
316 priv->count_item_pre_after = 2; 316 priv->count_item_pre_after = 2;
317 317
318 elm_layout_theme_set(obj, "slideshow", "base", elm_widget_style_get(obj)); 318 if (!elm_layout_theme_set
319 (obj, "slideshow", "base", elm_widget_style_get(obj)))
320 CRITICAL("Failed to set layout!");
319 321
320 priv->transitions = elm_widget_stringlist_get 322 priv->transitions = elm_widget_stringlist_get
321 (edje_object_data_get(wd->resize_obj, 323 (edje_object_data_get(wd->resize_obj,
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 56ba3f5d1..57641ba58 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -630,7 +630,10 @@ _elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
630 priv->step = 1.0; 630 priv->step = 1.0;
631 priv->first_interval = 0.85; 631 priv->first_interval = 0.85;
632 632
633 elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj)); 633 if (!elm_layout_theme_set(obj, "spinner", "base",
634 elm_widget_style_get(obj)))
635 CRITICAL("Failed to set layout!");
636
634 elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj); 637 elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj);
635 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start_cb, obj); 638 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start_cb, obj);
636 elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop_cb, obj); 639 elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop_cb, obj);
@@ -700,6 +703,8 @@ _elm_spinner_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
700 elm_widget_style_get(obj)); 703 elm_widget_style_get(obj));
701 if (ret) *ret = int_ret; 704 if (ret) *ret = int_ret;
702 705
706 if (!int_ret) CRITICAL("Failed to set layout!");
707
703 if (_elm_config->access_mode) 708 if (_elm_config->access_mode)
704 _access_spinner_register(obj, EINA_TRUE); 709 _access_spinner_register(obj, EINA_TRUE);
705} 710}
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 6f7926ee5..f93c8f816 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -533,9 +533,13 @@ _elm_thumb_smart_theme(Eo *obj, void *_pd __UNUSED__, va_list *list)
533 eo_do_super(obj, elm_wdg_theme(&int_ret)); 533 eo_do_super(obj, elm_wdg_theme(&int_ret));
534 if (!int_ret) return; 534 if (!int_ret) return;
535 535
536 elm_layout_theme_set 536 if (!elm_layout_theme_set(wd->resize_obj, "thumb", "base",
537 (wd->resize_obj, "thumb", "base", 537 elm_widget_style_get(obj)))
538 elm_widget_style_get(obj)); 538 {
539 if (ret) *ret = EINA_FALSE;
540 CRITICAL("Failed to set layout!");
541 return;
542 }
539 543
540 if (ret) *ret = EINA_TRUE; 544 if (ret) *ret = EINA_TRUE;
541} 545}
@@ -567,9 +571,9 @@ _elm_thumb_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
567 571
568 elm_widget_resize_object_set(obj, elm_layout_add(obj)); 572 elm_widget_resize_object_set(obj, elm_layout_add(obj));
569 573
570 elm_layout_theme_set 574 if (!elm_layout_theme_set(wd->resize_obj, "thumb", "base",
571 (wd->resize_obj, "thumb", "base", 575 elm_widget_style_get(obj)))
572 elm_widget_style_get(obj)); 576 CRITICAL("Failed to set layout!");
573 577
574#ifdef HAVE_ELEMENTARY_ETHUMB 578#ifdef HAVE_ELEMENTARY_ETHUMB
575 evas_object_event_callback_add 579 evas_object_event_callback_add
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index f0b006040..848d54422 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1015,8 +1015,9 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list)
1015 (obj, wd->resize_obj, "toolbar", "base", 1015 (obj, wd->resize_obj, "toolbar", "base",
1016 elm_widget_style_get(obj)); 1016 elm_widget_style_get(obj));
1017 1017
1018 elm_layout_theme_set 1018 if (!elm_layout_theme_set
1019 (sd->more, "toolbar", "more", elm_widget_style_get(obj)); 1019 (sd->more, "toolbar", "more", elm_widget_style_get(obj)))
1020 CRITICAL("Failed to set layout!");
1020 1021
1021 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 1022 _mirrored_set(obj, elm_widget_mirrored_get(obj));
1022 1023
@@ -2329,7 +2330,9 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2329 evas_object_show(priv->bx); 2330 evas_object_show(priv->bx);
2330 2331
2331 priv->more = elm_layout_add(obj); 2332 priv->more = elm_layout_add(obj);
2332 elm_layout_theme_set(priv->more, "toolbar", "more", "default"); 2333 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default"))
2334 CRITICAL("Failed to set layout!");
2335
2333 elm_widget_sub_object_add(obj, priv->more); 2336 elm_widget_sub_object_add(obj, priv->more);
2334 evas_object_show(priv->more); 2337 evas_object_show(priv->more);
2335 2338
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index e71a9826f..d2ca866c2 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -244,7 +244,9 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
244 priv->emotion = emotion_object_add(evas_object_evas_get(obj)); 244 priv->emotion = emotion_object_add(evas_object_evas_get(obj));
245 emotion_object_init(priv->emotion, NULL); 245 emotion_object_init(priv->emotion, NULL);
246 246
247 elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)); 247 if (!elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)))
248 CRITICAL("Failed to set layout!");
249
248 elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); 250 elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
249 251
250 evas_object_smart_callback_add 252 evas_object_smart_callback_add