summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2011-10-26 00:46:16 +0000
committerChunEon Park <hermet@hermet.pe.kr>2011-10-26 00:46:16 +0000
commitdc180b67ce73367f6d63a6719b2369da2d5d2b37 (patch)
tree3c903a7a49f843a18e96cda0f9aa9baecee04f69 /legacy
parentd3d411f43fe69432b36ab29346e9d09e1fc3a964 (diff)
elementary/layout - deprecated elm_layout_content_set/get_unset
SVN revision: 64403
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/doc/examples.dox6
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_layout.c2
-rw-r--r--legacy/elementary/src/bin/test_colorselector.c2
-rw-r--r--legacy/elementary/src/bin/test_entry.c6
-rw-r--r--legacy/elementary/src/bin/test_flip.c6
-rw-r--r--legacy/elementary/src/bin/test_focus.c4
-rw-r--r--legacy/elementary/src/bin/test_focus2.c6
-rw-r--r--legacy/elementary/src/bin/test_gesture_layer.c2
-rw-r--r--legacy/elementary/src/bin/test_launcher.c14
-rw-r--r--legacy/elementary/src/bin/test_layout.c6
-rw-r--r--legacy/elementary/src/bin/test_pager.c6
-rw-r--r--legacy/elementary/src/bin/test_segment_control.c8
-rw-r--r--legacy/elementary/src/examples/layout_example_01.c4
-rw-r--r--legacy/elementary/src/examples/layout_example_02.c4
-rw-r--r--legacy/elementary/src/examples/layout_example_03.c2
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in34
-rw-r--r--legacy/elementary/src/lib/elm_layout.c138
-rw-r--r--legacy/elementary/src/lib/elm_map.c2
18 files changed, 137 insertions, 115 deletions
diff --git a/legacy/elementary/doc/examples.dox b/legacy/elementary/doc/examples.dox
index a861cec6bc..eff169815d 100644
--- a/legacy/elementary/doc/examples.dox
+++ b/legacy/elementary/doc/examples.dox
@@ -3133,8 +3133,8 @@
3133 * Finally, we have an area in this layout theme, in the bottom part of it, 3133 * Finally, we have an area in this layout theme, in the bottom part of it,
3134 * reserved for adding an specific widget. Differently from the 2 parts 3134 * reserved for adding an specific widget. Differently from the 2 parts
3135 * described until now, this one can only receive one widget with the call 3135 * described until now, this one can only receive one widget with the call
3136 * elm_layout_content_set(). If there was already an item on this specific part, 3136 * elm_object_content_part_set() for the layout. If there was already an item on this specific part,
3137 * it will be deleted (one can use elm_layout_content_unset() in order to remove 3137 * it will be deleted (one can use elm_object_content_part_unset() in order to remove
3138 * it without deleting). An example of removing it without deleting, but 3138 * it without deleting). An example of removing it without deleting, but
3139 * manually deleting this widget just after that, can be seen on the callback 3139 * manually deleting this widget just after that, can be seen on the callback
3140 * for this button. Actually, the callback defined for this button will clean 3140 * for this button. Actually, the callback defined for this button will clean
@@ -3146,7 +3146,7 @@
3146 * Also notice that, for this last added button, we don't have to call 3146 * Also notice that, for this last added button, we don't have to call
3147 * evas_object_show() on it. This is a particularity of the theme for layouts, 3147 * evas_object_show() on it. This is a particularity of the theme for layouts,
3148 * that will have total control over the properties like size, position, 3148 * that will have total control over the properties like size, position,
3149 * visibility and clipping of a widget added with elm_layout_content_set(). 3149 * visibility and clipping of a widget added with elm_object_content_part_set().
3150 * Again, read the Edje documentation to understand this better. 3150 * Again, read the Edje documentation to understand this better.
3151 * 3151 *
3152 * Now we just put the code for the different callbacks specified for each kind 3152 * Now we just put the code for the different callbacks specified for each kind
diff --git a/legacy/elementary/doc/widgets/widget_preview_layout.c b/legacy/elementary/doc/widgets/widget_preview_layout.c
index 8e2710f3c4..4c2d87ab9e 100644
--- a/legacy/elementary/doc/widgets/widget_preview_layout.c
+++ b/legacy/elementary/doc/widgets/widget_preview_layout.c
@@ -13,7 +13,7 @@ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
13evas_object_size_hint_min_set(icon, 200, 140); 13evas_object_size_hint_min_set(icon, 200, 140);
14evas_object_show(icon); 14evas_object_show(icon);
15 15
16elm_layout_content_set(layout, "elm.swallow.content", icon); 16elm_object_content_part_set(layout, "elm.swallow.content", icon);
17elm_object_text_part_set(layout, "elm.text.title", "Layout"); 17elm_object_text_part_set(layout, "elm.text.title", "Layout");
18 18
19#include "widget_preview_tmpl_foot.c" 19#include "widget_preview_tmpl_foot.c"
diff --git a/legacy/elementary/src/bin/test_colorselector.c b/legacy/elementary/src/bin/test_colorselector.c
index 7994e7c063..23dd072916 100644
--- a/legacy/elementary/src/bin/test_colorselector.c
+++ b/legacy/elementary/src/bin/test_colorselector.c
@@ -60,7 +60,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
60 60
61 re = evas_object_rectangle_add(evas_object_evas_get(win)); 61 re = evas_object_rectangle_add(evas_object_evas_get(win));
62 evas_object_show(re); 62 evas_object_show(re);
63 elm_layout_content_set(ly, "ColorPreview", re); 63 elm_object_content_part_set(ly, "ColorPreview", re);
64 64
65 fr = elm_frame_add(win); 65 fr = elm_frame_add(win);
66 evas_object_size_hint_weight_set(fr, 1.0, 0); 66 evas_object_size_hint_weight_set(fr, 1.0, 0);
diff --git a/legacy/elementary/src/bin/test_entry.c b/legacy/elementary/src/bin/test_entry.c
index 4322304e7d..1b29b8042a 100644
--- a/legacy/elementary/src/bin/test_entry.c
+++ b/legacy/elementary/src/bin/test_entry.c
@@ -1305,7 +1305,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1305 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 1305 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
1306 elm_entry_entry_set(en, "This is a single line"); 1306 elm_entry_entry_set(en, "This is a single line");
1307 elm_entry_single_line_set(en, 1); 1307 elm_entry_single_line_set(en, 1);
1308 elm_layout_content_set(ly, "element1", en); 1308 elm_object_content_part_set(ly, "element1", en);
1309 evas_object_show(en); 1309 evas_object_show(en);
1310 1310
1311 en = elm_entry_add(win); 1311 en = elm_entry_add(win);
@@ -1318,7 +1318,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1318 "use it more flexibly."); 1318 "use it more flexibly.");
1319 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1319 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1320 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 1320 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
1321 elm_layout_content_set(ly, "element2", en); 1321 elm_object_content_part_set(ly, "element2", en);
1322 evas_object_show(en); 1322 evas_object_show(en);
1323 1323
1324 en = elm_entry_add(win); 1324 en = elm_entry_add(win);
@@ -1339,7 +1339,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1339 "good testing to see if entry widgets work as advertised." 1339 "good testing to see if entry widgets work as advertised."
1340 ); 1340 );
1341 evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en); 1341 evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en);
1342 elm_layout_content_set(ly, "element3", en); 1342 elm_object_content_part_set(ly, "element3", en);
1343 evas_object_show(en); 1343 evas_object_show(en);
1344 1344
1345 evas_object_show(win); 1345 evas_object_show(win);
diff --git a/legacy/elementary/src/bin/test_flip.c b/legacy/elementary/src/bin/test_flip.c
index 98fa2aa9c7..1ab9cfe0af 100644
--- a/legacy/elementary/src/bin/test_flip.c
+++ b/legacy/elementary/src/bin/test_flip.c
@@ -104,17 +104,17 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
104 104
105 bt = elm_button_add(win); 105 bt = elm_button_add(win);
106 elm_object_text_set(bt, "Button 1"); 106 elm_object_text_set(bt, "Button 1");
107 elm_layout_content_set(ly, "element1", bt); 107 elm_object_content_part_set(ly, "element1", bt);
108 evas_object_show(bt); 108 evas_object_show(bt);
109 109
110 bt = elm_button_add(win); 110 bt = elm_button_add(win);
111 elm_object_text_set(bt, "Button 2"); 111 elm_object_text_set(bt, "Button 2");
112 elm_layout_content_set(ly, "element2", bt); 112 elm_object_content_part_set(ly, "element2", bt);
113 evas_object_show(bt); 113 evas_object_show(bt);
114 114
115 bt = elm_button_add(win); 115 bt = elm_button_add(win);
116 elm_object_text_set(bt, "Button 3"); 116 elm_object_text_set(bt, "Button 3");
117 elm_layout_content_set(ly, "element3", bt); 117 elm_object_content_part_set(ly, "element3", bt);
118 evas_object_show(bt); 118 evas_object_show(bt);
119 119
120 evas_object_show(fl); 120 evas_object_show(fl);
diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c
index a8a14b957b..871d8bd5c1 100644
--- a/legacy/elementary/src/bin/test_focus.c
+++ b/legacy/elementary/src/bin/test_focus.c
@@ -262,7 +262,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
262 evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 262 evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
263 EVAS_HINT_FILL); 263 EVAS_HINT_FILL);
264 evas_object_size_hint_weight_set(bx2, 0.0, 0.0); 264 evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
265 elm_layout_content_set(ly, "element1", bx2); 265 elm_object_content_part_set(ly, "element1", bx2);
266 my_show(bx2); 266 my_show(bx2);
267 267
268 for (i = 3; i; i--) 268 for (i = 3; i; i--)
@@ -284,7 +284,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
284 evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 284 evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
285 EVAS_HINT_FILL); 285 EVAS_HINT_FILL);
286 evas_object_size_hint_weight_set(bx2, 0.0, 0.0); 286 evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
287 elm_layout_content_set(ly, "element2", bx2); 287 elm_object_content_part_set(ly, "element2", bx2);
288 my_show(bx2); 288 my_show(bx2);
289 289
290 { 290 {
diff --git a/legacy/elementary/src/bin/test_focus2.c b/legacy/elementary/src/bin/test_focus2.c
index 16ed390ecd..3b087cfe05 100644
--- a/legacy/elementary/src/bin/test_focus2.c
+++ b/legacy/elementary/src/bin/test_focus2.c
@@ -102,7 +102,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
102 102
103 bt1 = bt = elm_button_add(ly); 103 bt1 = bt = elm_button_add(ly);
104 elm_object_text_set(bt, "Button 1"); 104 elm_object_text_set(bt, "Button 1");
105 elm_layout_content_set(ly, "element1", bt); 105 elm_object_content_part_set(ly, "element1", bt);
106 106
107 en = elm_entry_add(ly); 107 en = elm_entry_add(ly);
108 elm_entry_scrollable_set(en, EINA_TRUE); 108 elm_entry_scrollable_set(en, EINA_TRUE);
@@ -111,11 +111,11 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
111 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 111 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
112 elm_entry_entry_set(en, "Scrolled Entry that should get focus"); 112 elm_entry_entry_set(en, "Scrolled Entry that should get focus");
113 elm_entry_single_line_set(en, 1); 113 elm_entry_single_line_set(en, 1);
114 elm_layout_content_set(ly, "element2", en); 114 elm_object_content_part_set(ly, "element2", en);
115 115
116 bt = elm_button_add(ly); 116 bt = elm_button_add(ly);
117 elm_object_text_set(bt, "Button 2"); 117 elm_object_text_set(bt, "Button 2");
118 elm_layout_content_set(ly, "element3", bt); 118 elm_object_content_part_set(ly, "element3", bt);
119 119
120 bt = elm_button_add(PARENT); 120 bt = elm_button_add(PARENT);
121 elm_object_text_set(bt, "Give focus to layout"); 121 elm_object_text_set(bt, "Give focus to layout");
diff --git a/legacy/elementary/src/bin/test_gesture_layer.c b/legacy/elementary/src/bin/test_gesture_layer.c
index ecc1324f55..140fbebde2 100644
--- a/legacy/elementary/src/bin/test_gesture_layer.c
+++ b/legacy/elementary/src/bin/test_gesture_layer.c
@@ -353,7 +353,7 @@ test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
353 Evas_Object *postit = elm_layout_add(win); 353 Evas_Object *postit = elm_layout_add(win);
354 snprintf(buf, sizeof(buf), "%s/objects/postit_ent.edj", elm_app_data_dir_get()); 354 snprintf(buf, sizeof(buf), "%s/objects/postit_ent.edj", elm_app_data_dir_get());
355 elm_layout_file_set(postit, buf, "main"); 355 elm_layout_file_set(postit, buf, "main");
356 elm_layout_content_set(postit, "ent", en); 356 elm_object_content_part_set(postit, "ent", en);
357 357
358 photo_array[ind++] = photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355); 358 photo_array[ind++] = photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355);
359 359
diff --git a/legacy/elementary/src/bin/test_launcher.c b/legacy/elementary/src/bin/test_launcher.c
index e9eac1b419..4c7e767694 100644
--- a/legacy/elementary/src/bin/test_launcher.c
+++ b/legacy/elementary/src/bin/test_launcher.c
@@ -408,17 +408,17 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
408 408
409 bt = elm_button_add(win); 409 bt = elm_button_add(win);
410 elm_object_text_set(bt, "Button 1"); 410 elm_object_text_set(bt, "Button 1");
411 elm_layout_content_set(ly, "element1", bt); 411 elm_object_content_part_set(ly, "element1", bt);
412 evas_object_show(bt); 412 evas_object_show(bt);
413 413
414 bt = elm_button_add(win); 414 bt = elm_button_add(win);
415 elm_object_text_set(bt, "Button 2"); 415 elm_object_text_set(bt, "Button 2");
416 elm_layout_content_set(ly, "element2", bt); 416 elm_object_content_part_set(ly, "element2", bt);
417 evas_object_show(bt); 417 evas_object_show(bt);
418 418
419 bt = elm_button_add(win); 419 bt = elm_button_add(win);
420 elm_object_text_set(bt, "Button 3"); 420 elm_object_text_set(bt, "Button 3");
421 elm_layout_content_set(ly, "element3", bt); 421 elm_object_content_part_set(ly, "element3", bt);
422 evas_object_show(bt); 422 evas_object_show(bt);
423 423
424 mb = elm_mapbuf_add(win); 424 mb = elm_mapbuf_add(win);
@@ -595,7 +595,7 @@ l3_tim_cb(void *data)
595 slx = (int)(long)evas_object_data_get(data, "slx"); 595 slx = (int)(long)evas_object_data_get(data, "slx");
596 sly = (int)(long)evas_object_data_get(data, "sly"); 596 sly = (int)(long)evas_object_data_get(data, "sly");
597 snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); 597 snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
598 elm_layout_content_unset(ly, buf); 598 elm_object_content_part_unset(ly, buf);
599 edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app"); 599 edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app");
600 return EINA_FALSE; 600 return EINA_FALSE;
601} 601}
@@ -671,7 +671,7 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e
671 slx = (int)(long)evas_object_data_get(obj, "slx"); 671 slx = (int)(long)evas_object_data_get(obj, "slx");
672 sly = (int)(long)evas_object_data_get(obj, "sly"); 672 sly = (int)(long)evas_object_data_get(obj, "sly");
673 snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); 673 snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
674 elm_layout_content_set(ly, buf, ly2); 674 elm_object_content_part_set(ly, buf, ly2);
675 list = (Eina_List *)evas_object_data_get 675 list = (Eina_List *)evas_object_data_get
676 (elm_object_top_widget_get(obj), "mbs"); 676 (elm_object_top_widget_get(obj), "mbs");
677 EINA_LIST_FOREACH(list, l, mb) 677 EINA_LIST_FOREACH(list, l, mb)
@@ -812,7 +812,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
812 elm_icon_scale_set(ic, 0, 0); 812 elm_icon_scale_set(ic, 0, 0);
813 evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 813 evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
814 evas_object_size_hint_align_set(ic, 0.5, 0.5); 814 evas_object_size_hint_align_set(ic, 0.5, 0.5);
815 elm_layout_content_set(ly2, "slot", ic); 815 elm_object_content_part_set(ly2, "slot", ic);
816 evas_object_show(ic); 816 evas_object_show(ic);
817 817
818 evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, l3_ic_del_cb, ic); 818 evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, l3_ic_del_cb, ic);
@@ -830,7 +830,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
830 evas_object_data_set(ic, "sly", (void *)(long)(j)); 830 evas_object_data_set(ic, "sly", (void *)(long)(j));
831 831
832 snprintf(buf, sizeof(buf), "slot.%i.%i", i, j); 832 snprintf(buf, sizeof(buf), "slot.%i.%i", i, j);
833 elm_layout_content_set(ly, buf, ly2); 833 elm_object_content_part_set(ly, buf, ly2);
834 evas_object_show(ly2); 834 evas_object_show(ly2);
835 835
836 n++; if (n > 23) n = 0; 836 n++; if (n > 23) n = 0;
diff --git a/legacy/elementary/src/bin/test_layout.c b/legacy/elementary/src/bin/test_layout.c
index 9f47f3b649..823f86e19a 100644
--- a/legacy/elementary/src/bin/test_layout.c
+++ b/legacy/elementary/src/bin/test_layout.c
@@ -60,19 +60,19 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
60 60
61 bt = elm_button_add(win); 61 bt = elm_button_add(win);
62 elm_object_text_set(bt, "Button 1"); 62 elm_object_text_set(bt, "Button 1");
63 elm_layout_content_set(ly, "element1", bt); 63 elm_object_content_part_set(ly, "element1", bt);
64 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); 64 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
65 evas_object_show(bt); 65 evas_object_show(bt);
66 66
67 bt = elm_button_add(win); 67 bt = elm_button_add(win);
68 elm_object_text_set(bt, "Button 2"); 68 elm_object_text_set(bt, "Button 2");
69 elm_layout_content_set(ly, "element2", bt); 69 elm_object_content_part_set(ly, "element2", bt);
70 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); 70 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
71 evas_object_show(bt); 71 evas_object_show(bt);
72 72
73 bt = elm_button_add(win); 73 bt = elm_button_add(win);
74 elm_object_text_set(bt, "Button 3"); 74 elm_object_text_set(bt, "Button 3");
75 elm_layout_content_set(ly, "element3", bt); 75 elm_object_content_part_set(ly, "element3", bt);
76 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); 76 evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
77 evas_object_show(bt); 77 evas_object_show(bt);
78 78
diff --git a/legacy/elementary/src/bin/test_pager.c b/legacy/elementary/src/bin/test_pager.c
index 5676dd2371..afd85e8031 100644
--- a/legacy/elementary/src/bin/test_pager.c
+++ b/legacy/elementary/src/bin/test_pager.c
@@ -221,16 +221,16 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
221 bt = elm_button_add(win); 221 bt = elm_button_add(win);
222 elm_object_text_set(bt, "Flip to 1"); 222 elm_object_text_set(bt, "Flip to 1");
223 evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info); 223 evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info);
224 elm_layout_content_set(ly2, "element1", bt); 224 elm_object_content_part_set(ly2, "element1", bt);
225 evas_object_show(bt); 225 evas_object_show(bt);
226 226
227 bt = elm_button_add(win); 227 bt = elm_button_add(win);
228 elm_object_text_set(bt, "Popme"); 228 elm_object_text_set(bt, "Popme");
229 evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info); 229 evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
230 evas_object_show(bt); 230 evas_object_show(bt);
231 elm_layout_content_set(ly2, "element2", bt); 231 elm_object_content_part_set(ly2, "element2", bt);
232 232
233 elm_layout_content_set(ly, "swallow", ly2); 233 elm_object_content_part_set(ly, "swallow", ly2);
234 evas_object_show(ly); 234 evas_object_show(ly);
235 235
236 elm_pager_content_push(pg, ly); 236 elm_pager_content_push(pg, ly);
diff --git a/legacy/elementary/src/bin/test_segment_control.c b/legacy/elementary/src/bin/test_segment_control.c
index 60d3a49dc4..fa55a4a30a 100644
--- a/legacy/elementary/src/bin/test_segment_control.c
+++ b/legacy/elementary/src/bin/test_segment_control.c
@@ -93,10 +93,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
93 elm_segment_control_item_add(segment4, NULL, "Disabled"); 93 elm_segment_control_item_add(segment4, NULL, "Disabled");
94 elm_object_disabled_set(segment4, EINA_TRUE); 94 elm_object_disabled_set(segment4, EINA_TRUE);
95 95
96 elm_layout_content_set(in_layout, "segment1", segment1); 96 elm_object_content_part_set(in_layout, "segment1", segment1);
97 elm_layout_content_set(in_layout, "segment2", segment2); 97 elm_object_content_part_set(in_layout, "segment2", segment2);
98 elm_layout_content_set(in_layout, "segment3", segment3); 98 elm_object_content_part_set(in_layout, "segment3", segment3);
99 elm_layout_content_set(in_layout, "segment4", segment4); 99 elm_object_content_part_set(in_layout, "segment4", segment4);
100 100
101 evas_object_show(in_layout); 101 evas_object_show(in_layout);
102 102
diff --git a/legacy/elementary/src/examples/layout_example_01.c b/legacy/elementary/src/examples/layout_example_01.c
index 1e5e3bbbe7..ec8a971fa7 100644
--- a/legacy/elementary/src/examples/layout_example_01.c
+++ b/legacy/elementary/src/examples/layout_example_01.c
@@ -52,7 +52,7 @@ _swallow_btn_cb(void *data, Evas_Object *btn __UNUSED__, void *event_info __UNUS
52 52
53 elm_layout_table_clear(layout, TABLE, EINA_TRUE); 53 elm_layout_table_clear(layout, TABLE, EINA_TRUE);
54 elm_layout_box_remove_all(layout, BOX, EINA_TRUE); 54 elm_layout_box_remove_all(layout, BOX, EINA_TRUE);
55 item = elm_layout_content_unset(layout, SWALLOW); 55 item = elm_object_content_part_unset(layout, SWALLOW);
56 evas_object_del(item); 56 evas_object_del(item);
57} 57}
58 58
@@ -139,7 +139,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
139 139
140 bt2 = elm_button_add(win); 140 bt2 = elm_button_add(win);
141 elm_object_text_set(bt2, "Delete All"); 141 elm_object_text_set(bt2, "Delete All");
142 elm_layout_content_set(layout, SWALLOW, bt2); 142 elm_object_content_part_set(layout, SWALLOW, bt2);
143 evas_object_smart_callback_add(bt2, "clicked", _swallow_btn_cb, layout); 143 evas_object_smart_callback_add(bt2, "clicked", _swallow_btn_cb, layout);
144 144
145 evas_object_size_hint_min_set(bg, 160, 160); 145 evas_object_size_hint_min_set(bg, 160, 160);
diff --git a/legacy/elementary/src/examples/layout_example_02.c b/legacy/elementary/src/examples/layout_example_02.c
index 57debb9c31..81e24f00af 100644
--- a/legacy/elementary/src/examples/layout_example_02.c
+++ b/legacy/elementary/src/examples/layout_example_02.c
@@ -23,7 +23,7 @@ static void
23_signal_cb(void *data, Evas_Object *o, const char *emission, const char *source __UNUSED__) 23_signal_cb(void *data, Evas_Object *o, const char *emission, const char *source __UNUSED__)
24{ 24{
25 struct _App *app = data; 25 struct _App *app = data;
26 Evas_Object *icon = elm_layout_content_get(o, "elm.swallow.content"); 26 Evas_Object *icon = elm_object_content_part_get(o, "elm.swallow.content");
27 27
28 printf("signal received\n"); 28 printf("signal received\n");
29 29
@@ -70,7 +70,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
70 icon = elm_icon_add(win); 70 icon = elm_icon_add(win);
71 elm_icon_standard_set(icon, images[app.current]); 71 elm_icon_standard_set(icon, images[app.current]);
72 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 72 evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
73 elm_layout_content_set(layout, "elm.swallow.content", icon); 73 elm_object_content_part_set(layout, "elm.swallow.content", icon);
74 74
75 elm_object_signal_callback_add(layout, "elm,action,back", "", _signal_cb, &app); 75 elm_object_signal_callback_add(layout, "elm,action,back", "", _signal_cb, &app);
76 elm_object_signal_callback_add(layout, "elm,action,next", "", _signal_cb, &app); 76 elm_object_signal_callback_add(layout, "elm,action,next", "", _signal_cb, &app);
diff --git a/legacy/elementary/src/examples/layout_example_03.c b/legacy/elementary/src/examples/layout_example_03.c
index 6ecc492584..4bb52b5795 100644
--- a/legacy/elementary/src/examples/layout_example_03.c
+++ b/legacy/elementary/src/examples/layout_example_03.c
@@ -83,7 +83,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
83 elm_object_text_set(btn, "Enlarge me!"); 83 elm_object_text_set(btn, "Enlarge me!");
84 evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 84 evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
85 evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); 85 evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
86 elm_layout_content_set(layout, SWALLOW, btn); 86 elm_object_content_part_set(layout, SWALLOW, btn);
87 evas_object_smart_callback_add(btn, "clicked", _swallow_btn_cb, layout); 87 evas_object_smart_callback_add(btn, "clicked", _swallow_btn_cb, layout);
88 88
89 evas_object_size_hint_min_set(bg, 160, 160); 89 evas_object_size_hint_min_set(bg, 160, 160);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 339b2f1e52..806ef107f2 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -9783,7 +9783,7 @@ extern "C" {
9783 * column or row span if necessary. 9783 * column or row span if necessary.
9784 * 9784 *
9785 * Again, we could have this design by adding a @ref Table widget to the @c 9785 * Again, we could have this design by adding a @ref Table widget to the @c
9786 * SWALLOW part using elm_layout_content_set(). The same difference happens 9786 * SWALLOW part using elm_object_content_part_set(). The same difference happens
9787 * here when choosing to use the Layout Table (a @c TABLE part) instead of 9787 * here when choosing to use the Layout Table (a @c TABLE part) instead of
9788 * the @ref Table plus @c SWALLOW part. It's just a matter of convenience. 9788 * the @ref Table plus @c SWALLOW part. It's just a matter of convenience.
9789 * 9789 *
@@ -9879,7 +9879,7 @@ extern "C" {
9879 * 9879 *
9880 * Once the content object is set, a previously set one will be deleted. 9880 * Once the content object is set, a previously set one will be deleted.
9881 * If you want to keep that old content object, use the 9881 * If you want to keep that old content object, use the
9882 * elm_layout_content_unset() function. 9882 * elm_object_content_part_unset() function.
9883 * 9883 *
9884 * @note In an Edje theme, the part used as a content container is called @c 9884 * @note In an Edje theme, the part used as a content container is called @c
9885 * SWALLOW. This is why the parameter name is called @p swallow, but it is 9885 * SWALLOW. This is why the parameter name is called @p swallow, but it is
@@ -9887,13 +9887,13 @@ extern "C" {
9887 * elm_layout_box_append(). 9887 * elm_layout_box_append().
9888 * 9888 *
9889 * @see elm_layout_box_append() 9889 * @see elm_layout_box_append()
9890 * @see elm_layout_content_get() 9890 * @see elm_object_content_part_get()
9891 * @see elm_layout_content_unset() 9891 * @see elm_object_content_part_unset()
9892 * @see @ref secBox 9892 * @see @ref secBox
9893 * 9893 *
9894 * @ingroup Layout 9894 * @ingroup Layout
9895 */ 9895 */
9896 EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) EINA_ARG_NONNULL(1); 9896 EINA_DEPRECATED EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) EINA_ARG_NONNULL(1);
9897 /** 9897 /**
9898 * Get the child object in the given content part. 9898 * Get the child object in the given content part.
9899 * 9899 *
@@ -9902,11 +9902,11 @@ extern "C" {
9902 * 9902 *
9903 * @return The swallowed object or NULL if none or an error occurred 9903 * @return The swallowed object or NULL if none or an error occurred
9904 * 9904 *
9905 * @see elm_layout_content_set() 9905 * @see elm_object_content_part_set()
9906 * 9906 *
9907 * @ingroup Layout 9907 * @ingroup Layout
9908 */ 9908 */
9909 EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); 9909 EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1);
9910 /** 9910 /**
9911 * Unset the layout content. 9911 * Unset the layout content.
9912 * 9912 *
@@ -9916,11 +9916,11 @@ extern "C" {
9916 * 9916 *
9917 * Unparent and return the content object which was set for this part. 9917 * Unparent and return the content object which was set for this part.
9918 * 9918 *
9919 * @see elm_layout_content_set() 9919 * @see elm_object_content_part_set()
9920 * 9920 *
9921 * @ingroup Layout 9921 * @ingroup Layout
9922 */ 9922 */
9923 EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); 9923 EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1);
9924 /** 9924 /**
9925 * Set the text of the given part 9925 * Set the text of the given part
9926 * 9926 *
@@ -10036,7 +10036,7 @@ extern "C" {
10036 * 10036 *
10037 * The object will be removed from the box part and its lifetime will 10037 * The object will be removed from the box part and its lifetime will
10038 * not be handled by the layout anymore. This is equivalent to 10038 * not be handled by the layout anymore. This is equivalent to
10039 * elm_layout_content_unset() for box. 10039 * elm_object_content_part_unset() for box.
10040 * 10040 *
10041 * @see elm_layout_box_append() 10041 * @see elm_layout_box_append()
10042 * @see elm_layout_box_remove_all() 10042 * @see elm_layout_box_remove_all()
@@ -10107,7 +10107,7 @@ extern "C" {
10107 * 10107 *
10108 * The object will be unpacked from the table part and its lifetime 10108 * The object will be unpacked from the table part and its lifetime
10109 * will not be handled by the layout anymore. This is equivalent to 10109 * will not be handled by the layout anymore. This is equivalent to
10110 * elm_layout_content_unset() for table. 10110 * elm_object_content_part_unset() for table.
10111 * 10111 *
10112 * @see elm_layout_table_pack() 10112 * @see elm_layout_table_pack()
10113 * @see elm_layout_table_clear() 10113 * @see elm_layout_table_clear()
@@ -10144,7 +10144,7 @@ extern "C" {
10144 * 10144 *
10145 * This returns the edje object. It is not expected to be used to then 10145 * This returns the edje object. It is not expected to be used to then
10146 * swallow objects via edje_object_part_swallow() for example. Use 10146 * swallow objects via edje_object_part_swallow() for example. Use
10147 * elm_layout_content_set() instead so child object handling and sizing is 10147 * elm_object_content_part_set() instead so child object handling and sizing is
10148 * done properly. 10148 * done properly.
10149 * 10149 *
10150 * @note This function should only be used if you really need to call some 10150 * @note This function should only be used if you really need to call some
@@ -10155,7 +10155,7 @@ extern "C" {
10155 * @see elm_object_signal_callback_add() 10155 * @see elm_object_signal_callback_add()
10156 * @see elm_object_signal_emit() 10156 * @see elm_object_signal_emit()
10157 * @see elm_object_text_part_set() 10157 * @see elm_object_text_part_set()
10158 * @see elm_layout_content_set() 10158 * @see elm_object_content_part_set()
10159 * @see elm_layout_box_append() 10159 * @see elm_layout_box_append()
10160 * @see elm_layout_table_pack() 10160 * @see elm_layout_table_pack()
10161 * @see elm_layout_data_get() 10161 * @see elm_layout_data_get()
@@ -10320,7 +10320,7 @@ extern "C" {
10320#define elm_layout_icon_set(_ly, _obj) \ 10320#define elm_layout_icon_set(_ly, _obj) \
10321 do { \ 10321 do { \
10322 const char *sig; \ 10322 const char *sig; \
10323 elm_layout_content_set((_ly), "elm.swallow.icon", (_obj)); \ 10323 elm_object_content_part_set((_ly), "elm.swallow.icon", (_obj)); \
10324 if ((_obj)) sig = "elm,state,icon,visible"; \ 10324 if ((_obj)) sig = "elm,state,icon,visible"; \
10325 else sig = "elm,state,icon,hidden"; \ 10325 else sig = "elm,state,icon,hidden"; \
10326 elm_object_signal_emit((_ly), sig, "elm"); \ 10326 elm_object_signal_emit((_ly), sig, "elm"); \
@@ -10334,7 +10334,7 @@ extern "C" {
10334 * @ingroup Layout 10334 * @ingroup Layout
10335 */ 10335 */
10336#define elm_layout_icon_get(_ly) \ 10336#define elm_layout_icon_get(_ly) \
10337 elm_layout_content_get((_ly), "elm.swallow.icon") 10337 elm_object_content_part_get((_ly), "elm.swallow.icon")
10338 10338
10339/** 10339/**
10340 * @def elm_layout_end_set 10340 * @def elm_layout_end_set
@@ -10346,7 +10346,7 @@ extern "C" {
10346#define elm_layout_end_set(_ly, _obj) \ 10346#define elm_layout_end_set(_ly, _obj) \
10347 do { \ 10347 do { \
10348 const char *sig; \ 10348 const char *sig; \
10349 elm_layout_content_set((_ly), "elm.swallow.end", (_obj)); \ 10349 elm_object_content_part_set((_ly), "elm.swallow.end", (_obj)); \
10350 if ((_obj)) sig = "elm,state,end,visible"; \ 10350 if ((_obj)) sig = "elm,state,end,visible"; \
10351 else sig = "elm,state,end,hidden"; \ 10351 else sig = "elm,state,end,hidden"; \
10352 elm_object_signal_emit((_ly), sig, "elm"); \ 10352 elm_object_signal_emit((_ly), sig, "elm"); \
@@ -10360,7 +10360,7 @@ extern "C" {
10360 * @ingroup Layout 10360 * @ingroup Layout
10361 */ 10361 */
10362#define elm_layout_end_get(_ly) \ 10362#define elm_layout_end_get(_ly) \
10363 elm_layout_content_get((_ly), "elm.swallow.end") 10363 elm_object_content_part_get((_ly), "elm.swallow.end")
10364 10364
10365/** 10365/**
10366 * @def elm_layout_label_set 10366 * @def elm_layout_label_set
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index 2b7e2b6ff5..461f9764d9 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -358,6 +358,79 @@ _elm_layout_label_get(const Evas_Object *obj, const char *part)
358 return edje_object_part_text_get(wd->lay, part); 358 return edje_object_part_text_get(wd->lay, part);
359} 359}
360 360
361static void
362_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
363{
364 ELM_CHECK_WIDTYPE(obj, widtype);
365 Widget_Data *wd = elm_widget_data_get(obj);
366 Subinfo *si;
367 const Eina_List *l;
368 if (!wd) return;
369 EINA_LIST_FOREACH(wd->subs, l, si)
370 {
371 if ((si->type == SWALLOW) && (!strcmp(part, si->part)))
372 {
373 if (content == si->obj) return;
374 evas_object_del(si->obj);
375 break;
376 }
377 }
378 if (content)
379 {
380 elm_widget_sub_object_add(obj, content);
381 evas_object_event_callback_add(content,
382 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
383 _changed_size_hints, wd);
384 if (!edje_object_part_swallow(wd->lay, part, content))
385 WRN("could not swallow %p into part '%s'", content, part);
386 si = ELM_NEW(Subinfo);
387 si->type = SWALLOW;
388 si->part = eina_stringshare_add(part);
389 si->obj = content;
390 wd->subs = eina_list_append(wd->subs, si);
391 }
392 _request_sizing_eval(wd);
393}
394
395static Evas_Object *
396_content_get_hook(const Evas_Object *obj, const char *part)
397{
398 Widget_Data *wd = elm_widget_data_get(obj);
399 const Eina_List *l;
400 Subinfo *si;
401 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
402
403 EINA_LIST_FOREACH(wd->subs, l, si)
404 {
405 if ((si->type == SWALLOW) && !strcmp(part, si->part))
406 return si->obj;
407 }
408 return NULL;
409}
410
411static Evas_Object *
412_content_unset_hook(Evas_Object *obj, const char *part)
413{
414 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
415 Widget_Data *wd = elm_widget_data_get(obj);
416 Subinfo *si;
417 const Eina_List *l;
418 if (!wd) return NULL;
419 EINA_LIST_FOREACH(wd->subs, l, si)
420 {
421 if ((si->type == SWALLOW) && (!strcmp(part, si->part)))
422 {
423 Evas_Object *content;
424 if (!si->obj) return NULL;
425 content = si->obj; /* si will die in _sub_del due elm_widget_sub_object_del() */
426 elm_widget_sub_object_del(obj, content);
427 edje_object_part_unswallow(wd->lay, content);
428 return content;
429 }
430 }
431 return NULL;
432}
433
361EAPI Evas_Object * 434EAPI Evas_Object *
362elm_layout_add(Evas_Object *parent) 435elm_layout_add(Evas_Object *parent)
363{ 436{
@@ -381,6 +454,9 @@ elm_layout_add(Evas_Object *parent)
381 elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); 454 elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
382 elm_widget_text_set_hook_set(obj, _elm_layout_label_set); 455 elm_widget_text_set_hook_set(obj, _elm_layout_label_set);
383 elm_widget_text_get_hook_set(obj, _elm_layout_label_get); 456 elm_widget_text_get_hook_set(obj, _elm_layout_label_get);
457 elm_widget_content_set_hook_set(obj, _content_set_hook);
458 elm_widget_content_get_hook_set(obj, _content_get_hook);
459 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
384 460
385 wd->obj = obj; 461 wd->obj = obj;
386 wd->lay = edje_object_add(e); 462 wd->lay = edje_object_add(e);
@@ -437,74 +513,20 @@ elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, cons
437EAPI void 513EAPI void
438elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) 514elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content)
439{ 515{
440 ELM_CHECK_WIDTYPE(obj, widtype); 516 _content_set_hook(obj, swallow, content);
441 Widget_Data *wd = elm_widget_data_get(obj);
442 Subinfo *si;
443 const Eina_List *l;
444 if (!wd) return;
445 EINA_LIST_FOREACH(wd->subs, l, si)
446 {
447 if ((si->type == SWALLOW) && (!strcmp(swallow, si->part)))
448 {
449 if (content == si->obj) return;
450 evas_object_del(si->obj);
451 break;
452 }
453 }
454 if (content)
455 {
456 elm_widget_sub_object_add(obj, content);
457 evas_object_event_callback_add(content,
458 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
459 _changed_size_hints, wd);
460 if (!edje_object_part_swallow(wd->lay, swallow, content))
461 WRN("could not swallow %p into part '%s'", content, swallow);
462 si = ELM_NEW(Subinfo);
463 si->type = SWALLOW;
464 si->part = eina_stringshare_add(swallow);
465 si->obj = content;
466 wd->subs = eina_list_append(wd->subs, si);
467 }
468 _request_sizing_eval(wd);
469} 517}
470 518
519
471EAPI Evas_Object * 520EAPI Evas_Object *
472elm_layout_content_get(const Evas_Object *obj, const char *swallow) 521elm_layout_content_get(const Evas_Object *obj, const char *swallow)
473{ 522{
474 Widget_Data *wd = elm_widget_data_get(obj); 523 return _content_get_hook(obj, swallow);
475 const Eina_List *l;
476 Subinfo *si;
477 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
478
479 EINA_LIST_FOREACH(wd->subs, l, si)
480 {
481 if ((si->type == SWALLOW) && !strcmp(swallow, si->part))
482 return si->obj;
483 }
484 return NULL;
485} 524}
486 525
487EAPI Evas_Object * 526EAPI Evas_Object *
488elm_layout_content_unset(Evas_Object *obj, const char *swallow) 527elm_layout_content_unset(Evas_Object *obj, const char *swallow)
489{ 528{
490 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 529 return _content_unset_hook(obj, swallow);
491 Widget_Data *wd = elm_widget_data_get(obj);
492 Subinfo *si;
493 const Eina_List *l;
494 if (!wd) return NULL;
495 EINA_LIST_FOREACH(wd->subs, l, si)
496 {
497 if ((si->type == SWALLOW) && (!strcmp(swallow, si->part)))
498 {
499 Evas_Object *content;
500 if (!si->obj) return NULL;
501 content = si->obj; /* si will die in _sub_del due elm_widget_sub_object_del() */
502 elm_widget_sub_object_del(obj, content);
503 edje_object_part_unswallow(wd->lay, content);
504 return content;
505 }
506 }
507 return NULL;
508} 530}
509 531
510EAPI void 532EAPI void
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index 56934505e0..0d2d40c53d 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -2429,7 +2429,7 @@ _group_object_create(Marker_Group *group)
2429 group->obj = elm_layout_add(group->wd->obj); 2429 group->obj = elm_layout_add(group->wd->obj);
2430 elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj)); 2430 elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj));
2431 2431
2432 if (icon) elm_layout_content_set(group->obj, "elm.icon", icon); 2432 if (icon) elm_object_content_part_set(group->obj, "elm.icon", icon);
2433 2433
2434 evas_object_smart_member_add(group->obj, group->wd->pan_smart); 2434 evas_object_smart_member_add(group->obj, group->wd->pan_smart);
2435 elm_widget_sub_object_add(group->wd->obj, group->obj); 2435 elm_widget_sub_object_add(group->wd->obj, group->obj);