summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2011-10-29 04:32:24 +0000
committerChunEon Park <hermet@hermet.pe.kr>2011-10-29 04:32:24 +0000
commitf3066c815ffae529a15a5872c3c430735b53e41e (patch)
tree75f4ad0f4c011cfe02243034dfc022cd74b5a644 /legacy
parent86dc87bb2c5c89758ae90c3b0b3683e3343872fe (diff)
elemetary - notify, factory, frame, panel, mapbuf
applied content_set/get/unset. do it later for the remainder. SVN revision: 64502
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_frame.c2
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_mapbuf.c2
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_notify.c2
-rw-r--r--legacy/elementary/doc/widgets/widget_preview_panel.c2
-rw-r--r--legacy/elementary/src/bin/config.c36
-rw-r--r--legacy/elementary/src/bin/test.c2
-rw-r--r--legacy/elementary/src/bin/test_colorselector.c4
-rw-r--r--legacy/elementary/src/bin/test_factory.c10
-rw-r--r--legacy/elementary/src/bin/test_flip.c4
-rw-r--r--legacy/elementary/src/bin/test_focus.c2
-rw-r--r--legacy/elementary/src/bin/test_genlist.c4
-rw-r--r--legacy/elementary/src/bin/test_launcher.c6
-rw-r--r--legacy/elementary/src/bin/test_notify.c18
-rw-r--r--legacy/elementary/src/bin/test_panel.c8
-rw-r--r--legacy/elementary/src/bin/test_scaling.c6
-rw-r--r--legacy/elementary/src/bin/test_slideshow.c2
-rw-r--r--legacy/elementary/src/bin/test_web.c4
-rw-r--r--legacy/elementary/src/edje_externals/elm_notify.c4
-rw-r--r--legacy/elementary/src/examples/anchorblock_example_01.c4
-rw-r--r--legacy/elementary/src/examples/entry_example.c6
-rw-r--r--legacy/elementary/src/examples/frame_example_01.c8
-rw-r--r--legacy/elementary/src/examples/general_funcs_example.c2
-rw-r--r--legacy/elementary/src/examples/mapbuf_example.c2
-rw-r--r--legacy/elementary/src/examples/notify_example_01.c8
-rw-r--r--legacy/elementary/src/examples/panel_example_01.c6
-rw-r--r--legacy/elementary/src/examples/slideshow_example.c2
-rw-r--r--legacy/elementary/src/examples/win_example.c2
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in62
-rw-r--r--legacy/elementary/src/lib/elm_factory.c80
-rw-r--r--legacy/elementary/src/lib/elm_frame.c77
-rw-r--r--legacy/elementary/src/lib/elm_mapbuf.c97
-rw-r--r--legacy/elementary/src/lib/elm_notify.c87
-rw-r--r--legacy/elementary/src/lib/elm_panel.c73
-rw-r--r--legacy/elementary/src/lib/elm_web.c2
34 files changed, 377 insertions, 259 deletions
diff --git a/legacy/elementary/doc/widgets/widget_preview_frame.c b/legacy/elementary/doc/widgets/widget_preview_frame.c
index d41f13c825..0ef7e6a9c9 100644
--- a/legacy/elementary/doc/widgets/widget_preview_frame.c
+++ b/legacy/elementary/doc/widgets/widget_preview_frame.c
@@ -12,6 +12,6 @@ evas_object_size_hint_weight_set(o2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
12evas_object_show(o2); 12evas_object_show(o2);
13elm_object_text_set(o2, "Frame content"); 13elm_object_text_set(o2, "Frame content");
14 14
15elm_frame_content_set(o, o2); 15elm_object_content_set(o, o2);
16 16
17#include "widget_preview_tmpl_foot.c" 17#include "widget_preview_tmpl_foot.c"
diff --git a/legacy/elementary/doc/widgets/widget_preview_mapbuf.c b/legacy/elementary/doc/widgets/widget_preview_mapbuf.c
index 812c76c173..c43977c358 100644
--- a/legacy/elementary/doc/widgets/widget_preview_mapbuf.c
+++ b/legacy/elementary/doc/widgets/widget_preview_mapbuf.c
@@ -23,7 +23,7 @@ for (i = 0; i < 8; i++)
23 } 23 }
24 } 24 }
25 25
26elm_mapbuf_content_set(o, tb); 26elm_object_content_set(o, tb);
27elm_mapbuf_enabled_set(o, EINA_TRUE); 27elm_mapbuf_enabled_set(o, EINA_TRUE);
28 28
29#include "widget_preview_tmpl_foot.c" 29#include "widget_preview_tmpl_foot.c"
diff --git a/legacy/elementary/doc/widgets/widget_preview_notify.c b/legacy/elementary/doc/widgets/widget_preview_notify.c
index ae0d4c2eef..ab8176be5b 100644
--- a/legacy/elementary/doc/widgets/widget_preview_notify.c
+++ b/legacy/elementary/doc/widgets/widget_preview_notify.c
@@ -9,7 +9,7 @@ Evas_Object *o2 = elm_label_add(win);
9elm_object_text_set(o2, "content"); 9elm_object_text_set(o2, "content");
10evas_object_show(o2); 10evas_object_show(o2);
11 11
12elm_notify_content_set(o, o2); 12elm_object_content_set(o, o2);
13 13
14 14
15#include "widget_preview_tmpl_foot.c" 15#include "widget_preview_tmpl_foot.c"
diff --git a/legacy/elementary/doc/widgets/widget_preview_panel.c b/legacy/elementary/doc/widgets/widget_preview_panel.c
index 8ae9e24d6a..f1cc4c25af 100644
--- a/legacy/elementary/doc/widgets/widget_preview_panel.c
+++ b/legacy/elementary/doc/widgets/widget_preview_panel.c
@@ -9,7 +9,7 @@ Evas_Object *o2 = elm_label_add(win);
9elm_object_text_set(o2, "content"); 9elm_object_text_set(o2, "content");
10evas_object_show(o2); 10evas_object_show(o2);
11 11
12elm_panel_content_set(o, o2); 12elm_object_content_set(o, o2);
13 13
14 14
15#include "widget_preview_tmpl_foot.c" 15#include "widget_preview_tmpl_foot.c"
diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c
index a74a97f346..4e662eae4c 100644
--- a/legacy/elementary/src/bin/config.c
+++ b/legacy/elementary/src/bin/config.c
@@ -81,7 +81,7 @@ struct _Fonts_Data
81 evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); \ 81 evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); \
82 evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); \ 82 evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); \
83 elm_object_text_set(lb, label); \ 83 elm_object_text_set(lb, label); \
84 elm_frame_content_set(pd, lb); \ 84 elm_object_content_set(pd, lb); \
85 evas_object_show(lb); \ 85 evas_object_show(lb); \
86 } \ 86 } \
87 while (0) 87 while (0)
@@ -584,7 +584,7 @@ _status_basic(Evas_Object *win,
584 elm_object_text_set(lb, 584 elm_object_text_set(lb,
585 "Applying configuration change" 585 "Applying configuration change"
586 ); 586 );
587 elm_frame_content_set(fr, lb); 587 elm_object_content_set(fr, lb);
588 evas_object_show(lb); 588 evas_object_show(lb);
589} 589}
590 590
@@ -647,7 +647,7 @@ _status_config(Evas_Object *win,
647 // FIXME: add theme selector (basic mode and advanced for fallbacks) 647 // FIXME: add theme selector (basic mode and advanced for fallbacks)
648 // FIXME: save config 648 // FIXME: save config
649 // FIXME: profile selector / creator etc. 649 // FIXME: profile selector / creator etc.
650 elm_frame_content_set(fr, bx); 650 elm_object_content_set(fr, bx);
651 evas_object_show(bx); 651 evas_object_show(bx);
652} 652}
653 653
@@ -1288,7 +1288,7 @@ _sample_theme_new(Evas_Object *win)
1288 li = elm_list_add(win); 1288 li = elm_list_add(win);
1289 evas_object_size_hint_weight_set(li, 1.0, 1.0); 1289 evas_object_size_hint_weight_set(li, 1.0, 1.0);
1290 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 1290 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
1291 elm_frame_content_set(fr, li); 1291 elm_object_content_set(fr, li);
1292 evas_object_show(li); 1292 evas_object_show(li);
1293 1293
1294 elm_list_item_append(li, "List Item 1", NULL, NULL, NULL, NULL); 1294 elm_list_item_append(li, "List Item 1", NULL, NULL, NULL, NULL);
@@ -1343,7 +1343,7 @@ _status_config_themes(Evas_Object *win,
1343 elm_list_multi_select_set(li, EINA_TRUE); 1343 elm_list_multi_select_set(li, EINA_TRUE);
1344 evas_object_size_hint_weight_set(li, 1.0, 1.0); 1344 evas_object_size_hint_weight_set(li, 1.0, 1.0);
1345 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 1345 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
1346 elm_frame_content_set(pd, li); 1346 elm_object_content_set(pd, li);
1347 evas_object_show(li); 1347 evas_object_show(li);
1348 1348
1349 list = elm_theme_name_available_list_new(); 1349 list = elm_theme_name_available_list_new();
@@ -1428,7 +1428,7 @@ _status_config_themes(Evas_Object *win,
1428 elm_object_text_set(bt, "Browse..."); 1428 elm_object_text_set(bt, "Browse...");
1429 evas_object_size_hint_weight_set(bt, 1.0, 1.0); 1429 evas_object_size_hint_weight_set(bt, 1.0, 1.0);
1430 evas_object_size_hint_align_set(bt, 0.9, 0.9); 1430 evas_object_size_hint_align_set(bt, 0.9, 0.9);
1431 elm_frame_content_set(pd, bt); 1431 elm_object_content_set(pd, bt);
1432 evas_object_show(bt); 1432 evas_object_show(bt);
1433 */ 1433 */
1434 pd = elm_frame_add(win); 1434 pd = elm_frame_add(win);
@@ -1442,14 +1442,14 @@ _status_config_themes(Evas_Object *win,
1442 elm_object_text_set(fr, "Preview"); 1442 elm_object_text_set(fr, "Preview");
1443 evas_object_size_hint_weight_set(fr, 1.0, 1.0); 1443 evas_object_size_hint_weight_set(fr, 1.0, 1.0);
1444 evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); 1444 evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
1445 elm_frame_content_set(pd, fr); 1445 elm_object_content_set(pd, fr);
1446 evas_object_show(fr); 1446 evas_object_show(fr);
1447 1447
1448 sc = elm_scroller_add(win); 1448 sc = elm_scroller_add(win);
1449 elm_scroller_bounce_set(sc, 0, 0); 1449 elm_scroller_bounce_set(sc, 0, 0);
1450 evas_object_size_hint_weight_set(sc, 1.0, 1.0); 1450 evas_object_size_hint_weight_set(sc, 1.0, 1.0);
1451 evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); 1451 evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
1452 elm_frame_content_set(fr, sc); 1452 elm_object_content_set(fr, sc);
1453 evas_object_show(sc); 1453 evas_object_show(sc);
1454 1454
1455 sample = _sample_theme_new(win); 1455 sample = _sample_theme_new(win);
@@ -1477,7 +1477,7 @@ _status_config_themes(Evas_Object *win,
1477 elm_object_text_set(bt, "Use Theme"); 1477 elm_object_text_set(bt, "Use Theme");
1478 evas_object_size_hint_weight_set(bt, 1.0, 0.0); 1478 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
1479 evas_object_size_hint_align_set(bt, 0.5, 0.5); 1479 evas_object_size_hint_align_set(bt, 0.5, 0.5);
1480 elm_frame_content_set(pd, bt); 1480 elm_object_content_set(pd, bt);
1481 evas_object_show(bt); 1481 evas_object_show(bt);
1482 1482
1483 evas_object_data_set(win, "themes", tb); 1483 evas_object_data_set(win, "themes", tb);
@@ -1964,7 +1964,7 @@ _status_config_fonts(Evas_Object *win,
1964 li = elm_list_add(win); 1964 li = elm_list_add(win);
1965 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1965 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1966 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 1966 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
1967 elm_frame_content_set(fr, li); 1967 elm_object_content_set(fr, li);
1968 evas_object_show(li); 1968 evas_object_show(li);
1969 1969
1970 evas_object_data_set(win, "font_classes_list", li); 1970 evas_object_data_set(win, "font_classes_list", li);
@@ -1980,7 +1980,7 @@ _status_config_fonts(Evas_Object *win,
1980 li = elm_list_add(win); 1980 li = elm_list_add(win);
1981 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1981 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1982 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 1982 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
1983 elm_frame_content_set(fr, li); 1983 elm_object_content_set(fr, li);
1984 evas_object_show(li); 1984 evas_object_show(li);
1985 1985
1986 evas_object_data_set(win, "font_names_list", li); 1986 evas_object_data_set(win, "font_names_list", li);
@@ -2004,7 +2004,7 @@ _status_config_fonts(Evas_Object *win,
2004 li = elm_list_add(win); 2004 li = elm_list_add(win);
2005 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2005 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2006 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 2006 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
2007 elm_frame_content_set(fr, li); 2007 elm_object_content_set(fr, li);
2008 evas_object_show(li); 2008 evas_object_show(li);
2009 2009
2010 evas_object_data_set(win, "font_styles_list", li); 2010 evas_object_data_set(win, "font_styles_list", li);
@@ -2021,7 +2021,7 @@ _status_config_fonts(Evas_Object *win,
2021 li = elm_list_add(win); 2021 li = elm_list_add(win);
2022 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2022 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2023 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 2023 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
2024 elm_frame_content_set(fr, li); 2024 elm_object_content_set(fr, li);
2025 evas_object_show(li); 2025 evas_object_show(li);
2026 2026
2027 evas_object_data_set(win, "font_sizes_list", li); 2027 evas_object_data_set(win, "font_sizes_list", li);
@@ -2099,7 +2099,7 @@ _status_config_fonts(Evas_Object *win,
2099 elm_box_pack_end(bx, bt); 2099 elm_box_pack_end(bx, bt);
2100 evas_object_show(bt); 2100 evas_object_show(bt);
2101 2101
2102 elm_frame_content_set(pd, bx); 2102 elm_object_content_set(pd, bx);
2103 2103
2104 evas_object_data_set(win, "fonts", base); 2104 evas_object_data_set(win, "fonts", base);
2105 2105
@@ -2316,7 +2316,7 @@ _status_config_profiles(Evas_Object *win,
2316 elm_object_text_set(fr, "Available Profiles"); 2316 elm_object_text_set(fr, "Available Profiles");
2317 evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2317 evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2318 evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); 2318 evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
2319 elm_frame_content_set(fr, fr_bx1); 2319 elm_object_content_set(fr, fr_bx1);
2320 elm_box_pack_end(bx, fr); 2320 elm_box_pack_end(bx, fr);
2321 evas_object_show(fr); 2321 evas_object_show(fr);
2322 2322
@@ -2411,7 +2411,7 @@ _status_config_profiles(Evas_Object *win,
2411 elm_box_pack_end(btn_bx, bt); 2411 elm_box_pack_end(btn_bx, bt);
2412 evas_object_show(bt); 2412 evas_object_show(bt);
2413 2413
2414 elm_frame_content_set(pd, btn_bx); 2414 elm_object_content_set(pd, btn_bx);
2415 2415
2416 evas = evas_object_evas_get(li); 2416 evas = evas_object_evas_get(li);
2417 evas_event_freeze(evas); 2417 evas_event_freeze(evas);
@@ -2781,7 +2781,7 @@ _status_config_rendering(Evas_Object *win,
2781 evas_object_show(fr); 2781 evas_object_show(fr);
2782 2782
2783 li = elm_list_add(win); 2783 li = elm_list_add(win);
2784 elm_frame_content_set(fr, li); 2784 elm_object_content_set(fr, li);
2785 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2785 evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2786 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); 2786 evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
2787 2787
@@ -2812,7 +2812,7 @@ _status_config_rendering(Evas_Object *win,
2812 elm_object_text_set(bt, "Use Engine"); 2812 elm_object_text_set(bt, "Use Engine");
2813 evas_object_size_hint_weight_set(bt, 0.0, 0.0); 2813 evas_object_size_hint_weight_set(bt, 0.0, 0.0);
2814 evas_object_size_hint_align_set(bt, 0.5, 0.5); 2814 evas_object_size_hint_align_set(bt, 0.5, 0.5);
2815 elm_frame_content_set(pd, bt); 2815 elm_object_content_set(pd, bt);
2816 evas_object_show(bt); 2816 evas_object_show(bt);
2817 2817
2818 evas_object_data_set(win, "rendering", bx); 2818 evas_object_data_set(win, "rendering", bx);
diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c
index 48f714403e..95fe971958 100644
--- a/legacy/elementary/src/bin/test.c
+++ b/legacy/elementary/src/bin/test.c
@@ -264,7 +264,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only)
264 "Please select a test from the list below<br>" 264 "Please select a test from the list below<br>"
265 "by clicking the test button to show the<br>" 265 "by clicking the test button to show the<br>"
266 "test window."); 266 "test window.");
267 elm_frame_content_set(fr, lb); 267 elm_object_content_set(fr, lb);
268 evas_object_show(lb); 268 evas_object_show(lb);
269 269
270 tg = elm_check_add(win); 270 tg = elm_check_add(win);
diff --git a/legacy/elementary/src/bin/test_colorselector.c b/legacy/elementary/src/bin/test_colorselector.c
index 23dd072916..1498bd50a3 100644
--- a/legacy/elementary/src/bin/test_colorselector.c
+++ b/legacy/elementary/src/bin/test_colorselector.c
@@ -55,7 +55,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
55 elm_layout_file_set(ly, buf, "main"); 55 elm_layout_file_set(ly, buf, "main");
56 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); 56 evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
57 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 57 evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
58 elm_frame_content_set(fr, ly); 58 elm_object_content_set(fr, ly);
59 evas_object_show(ly); 59 evas_object_show(ly);
60 60
61 re = evas_object_rectangle_add(evas_object_evas_get(win)); 61 re = evas_object_rectangle_add(evas_object_evas_get(win));
@@ -79,7 +79,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
79 elm_colorselector_color_set(cp, r, g, b, a); 79 elm_colorselector_color_set(cp, r, g, b, a);
80 evas_object_size_hint_weight_set(cp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 80 evas_object_size_hint_weight_set(cp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
81 evas_object_size_hint_align_set(cp, EVAS_HINT_FILL, EVAS_HINT_FILL); 81 evas_object_size_hint_align_set(cp, EVAS_HINT_FILL, EVAS_HINT_FILL);
82 elm_frame_content_set(fr, cp); 82 elm_object_content_set(fr, cp);
83 evas_object_show(cp); 83 evas_object_show(cp);
84 evas_object_smart_callback_add(cp, "changed", _colorselector_clicked_cb, re); 84 evas_object_smart_callback_add(cp, "changed", _colorselector_clicked_cb, re);
85 85
diff --git a/legacy/elementary/src/bin/test_factory.c b/legacy/elementary/src/bin/test_factory.c
index 9675e29d2d..bd6621987f 100644
--- a/legacy/elementary/src/bin/test_factory.c
+++ b/legacy/elementary/src/bin/test_factory.c
@@ -16,8 +16,8 @@ static void
16fac_unrealize(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) 16fac_unrealize(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
17{ 17{
18 // setting factory content to null deletes it 18 // setting factory content to null deletes it
19 printf("--------DELETE for factory %p [f: %p]\n", elm_factory_content_get(obj), obj); 19 printf("--------DELETE for factory %p [f: %p]\n", elm_object_content_get(obj), obj);
20 elm_factory_content_set(obj, NULL); 20 elm_object_content_set(obj, NULL);
21} 21}
22 22
23static void 23static void
@@ -51,7 +51,7 @@ fac_realize_end(void *data, Evas_Object *obj, void *event_info __UNUSED__)
51 evas_object_show(bt); 51 evas_object_show(bt);
52 } 52 }
53 53
54 elm_factory_content_set(obj, bx); 54 elm_object_content_set(obj, bx);
55 evas_object_show(bx); 55 evas_object_show(bx);
56} 56}
57 57
@@ -89,7 +89,7 @@ fac_realize2(void *data, Evas_Object *obj, void *event_info __UNUSED__)
89 evas_object_show(fc); 89 evas_object_show(fc);
90 } 90 }
91 91
92 elm_factory_content_set(obj, bx); 92 elm_object_content_set(obj, bx);
93 evas_object_show(bx); 93 evas_object_show(bx);
94} 94}
95 95
@@ -127,7 +127,7 @@ fac_realize1(void *data, Evas_Object *obj, void *event_info __UNUSED__)
127 evas_object_show(fc); 127 evas_object_show(fc);
128 } 128 }
129 129
130 elm_factory_content_set(obj, bx); 130 elm_object_content_set(obj, bx);
131 evas_object_show(bx); 131 evas_object_show(bx);
132} 132}
133 133
diff --git a/legacy/elementary/src/bin/test_flip.c b/legacy/elementary/src/bin/test_flip.c
index 1ab9cfe0af..4b8a0a263f 100644
--- a/legacy/elementary/src/bin/test_flip.c
+++ b/legacy/elementary/src/bin/test_flip.c
@@ -409,7 +409,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
409 fl_f = elm_flip_add(win); 409 fl_f = elm_flip_add(win);
410 evas_object_size_hint_align_set(fl_f, EVAS_HINT_FILL, EVAS_HINT_FILL); 410 evas_object_size_hint_align_set(fl_f, EVAS_HINT_FILL, EVAS_HINT_FILL);
411 evas_object_size_hint_weight_set(fl_f, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 411 evas_object_size_hint_weight_set(fl_f, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
412 elm_frame_content_set(fr, fl_f); 412 elm_object_content_set(fr, fl_f);
413 evas_object_show(fl_f); 413 evas_object_show(fl_f);
414 414
415 o = elm_bg_add(win); 415 o = elm_bg_add(win);
@@ -438,7 +438,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
438 fl_b = elm_flip_add(win); 438 fl_b = elm_flip_add(win);
439 evas_object_size_hint_align_set(fl_b, EVAS_HINT_FILL, EVAS_HINT_FILL); 439 evas_object_size_hint_align_set(fl_b, EVAS_HINT_FILL, EVAS_HINT_FILL);
440 evas_object_size_hint_weight_set(fl_b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 440 evas_object_size_hint_weight_set(fl_b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
441 elm_frame_content_set(fr, fl_b); 441 elm_object_content_set(fr, fl_b);
442 evas_object_show(fl_b); 442 evas_object_show(fl_b);
443 443
444 o = elm_bg_add(win); 444 o = elm_bg_add(win);
diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c
index 871d8bd5c1..08f371321b 100644
--- a/legacy/elementary/src/bin/test_focus.c
+++ b/legacy/elementary/src/bin/test_focus.c
@@ -330,7 +330,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
330 { 330 {
331 Evas_Object *tb = elm_table_add(win); 331 Evas_Object *tb = elm_table_add(win);
332 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 332 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
333 elm_frame_content_set(fr, tb); 333 elm_object_content_set(fr, tb);
334 my_show(tb); 334 my_show(tb);
335 for (j = 0; j < 1; j++) 335 for (j = 0; j < 1; j++)
336 for (i = 0; i < 2; i++) 336 for (i = 0; i < 2; i++)
diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c
index 23f2d166e3..f97bc08910 100644
--- a/legacy/elementary/src/bin/test_genlist.c
+++ b/legacy/elementary/src/bin/test_genlist.c
@@ -1721,7 +1721,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
1721 evas_object_show(fr); 1721 evas_object_show(fr);
1722 1722
1723 bx2 = elm_box_add(win); 1723 bx2 = elm_box_add(win);
1724 elm_frame_content_set(fr, bx2); 1724 elm_object_content_set(fr, bx2);
1725 evas_object_show(bx2); 1725 evas_object_show(bx2);
1726 1726
1727 lb = elm_label_add(win); 1727 lb = elm_label_add(win);
@@ -1840,7 +1840,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
1840 elm_object_text_set(lb, 1840 elm_object_text_set(lb,
1841 "Enable reorder mode if you want to move item.<br>" 1841 "Enable reorder mode if you want to move item.<br>"
1842 "Then long press and drag item."); 1842 "Then long press and drag item.");
1843 elm_frame_content_set(fr, lb); 1843 elm_object_content_set(fr, lb);
1844 evas_object_show(lb); 1844 evas_object_show(lb);
1845 1845
1846 gl = elm_genlist_add(win); 1846 gl = elm_genlist_add(win);
diff --git a/legacy/elementary/src/bin/test_launcher.c b/legacy/elementary/src/bin/test_launcher.c
index 4c7e767694..250481cdfc 100644
--- a/legacy/elementary/src/bin/test_launcher.c
+++ b/legacy/elementary/src/bin/test_launcher.c
@@ -254,7 +254,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
254 elm_table_pack(tb, pad, 6, 1, 1, 10); 254 elm_table_pack(tb, pad, 6, 1, 1, 10);
255 255
256 mb = elm_mapbuf_add(win); 256 mb = elm_mapbuf_add(win);
257 elm_mapbuf_content_set(mb, tb); 257 elm_object_content_set(mb, tb);
258 evas_object_show(tb); 258 evas_object_show(tb);
259 259
260 for (j = 0; j < 5; j++) 260 for (j = 0; j < 5; j++)
@@ -422,7 +422,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
422 evas_object_show(bt); 422 evas_object_show(bt);
423 423
424 mb = elm_mapbuf_add(win); 424 mb = elm_mapbuf_add(win);
425 elm_mapbuf_content_set(mb, ly); 425 elm_object_content_set(mb, ly);
426 evas_object_show(ly); 426 evas_object_show(ly);
427 427
428 elm_box_pack_end(bx, mb); 428 elm_box_pack_end(bx, mb);
@@ -781,7 +781,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
781 mb = elm_mapbuf_add(win); 781 mb = elm_mapbuf_add(win);
782 mbs = eina_list_append(mbs, mb); 782 mbs = eina_list_append(mbs, mb);
783 783
784 elm_mapbuf_content_set(mb, tb); 784 elm_object_content_set(mb, tb);
785 evas_object_show(tb); 785 evas_object_show(tb);
786 elm_box_pack_end(bx, mb); 786 elm_box_pack_end(bx, mb);
787 evas_object_show(mb); 787 evas_object_show(mb);
diff --git a/legacy/elementary/src/bin/test_notify.c b/legacy/elementary/src/bin/test_notify.c
index 1491a37ecf..37fffe398f 100644
--- a/legacy/elementary/src/bin/test_notify.c
+++ b/legacy/elementary/src/bin/test_notify.c
@@ -60,7 +60,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
60 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 60 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
61 61
62 bx = elm_box_add(win); 62 bx = elm_box_add(win);
63 elm_notify_content_set(notify, bx); 63 elm_object_content_set(notify, bx);
64 elm_box_horizontal_set(bx, EINA_TRUE); 64 elm_box_horizontal_set(bx, EINA_TRUE);
65 evas_object_show(bx); 65 evas_object_show(bx);
66 66
@@ -90,7 +90,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
90 evas_object_smart_callback_add(notify, "block,clicked", _notify_block, NULL); 90 evas_object_smart_callback_add(notify, "block,clicked", _notify_block, NULL);
91 91
92 bx = elm_box_add(win); 92 bx = elm_box_add(win);
93 elm_notify_content_set(notify, bx); 93 elm_object_content_set(notify, bx);
94 elm_box_horizontal_set(bx, EINA_TRUE); 94 elm_box_horizontal_set(bx, EINA_TRUE);
95 evas_object_show(bx); 95 evas_object_show(bx);
96 96
@@ -119,7 +119,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
119 evas_object_smart_callback_add(notify, "timeout", _notify_timeout, NULL); 119 evas_object_smart_callback_add(notify, "timeout", _notify_timeout, NULL);
120 120
121 bx = elm_box_add(win); 121 bx = elm_box_add(win);
122 elm_notify_content_set(notify, bx); 122 elm_object_content_set(notify, bx);
123 elm_box_horizontal_set(bx, EINA_TRUE); 123 elm_box_horizontal_set(bx, EINA_TRUE);
124 evas_object_show(bx); 124 evas_object_show(bx);
125 125
@@ -147,7 +147,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
147 evas_object_smart_callback_add(notify, "timeout", _notify_timeout, NULL); 147 evas_object_smart_callback_add(notify, "timeout", _notify_timeout, NULL);
148 148
149 bx = elm_box_add(win); 149 bx = elm_box_add(win);
150 elm_notify_content_set(notify, bx); 150 elm_object_content_set(notify, bx);
151 elm_box_horizontal_set(bx, EINA_TRUE); 151 elm_box_horizontal_set(bx, EINA_TRUE);
152 evas_object_show(bx); 152 evas_object_show(bx);
153 153
@@ -173,7 +173,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
173 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_RIGHT); 173 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_RIGHT);
174 174
175 bx = elm_box_add(win); 175 bx = elm_box_add(win);
176 elm_notify_content_set(notify, bx); 176 elm_object_content_set(notify, bx);
177 elm_box_horizontal_set(bx, EINA_TRUE); 177 elm_box_horizontal_set(bx, EINA_TRUE);
178 evas_object_show(bx); 178 evas_object_show(bx);
179 179
@@ -199,7 +199,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
199 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_LEFT); 199 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_LEFT);
200 200
201 bx = elm_box_add(win); 201 bx = elm_box_add(win);
202 elm_notify_content_set(notify, bx); 202 elm_object_content_set(notify, bx);
203 elm_box_horizontal_set(bx, EINA_TRUE); 203 elm_box_horizontal_set(bx, EINA_TRUE);
204 evas_object_show(bx); 204 evas_object_show(bx);
205 205
@@ -225,7 +225,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
225 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_RIGHT); 225 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_TOP_RIGHT);
226 226
227 bx = elm_box_add(win); 227 bx = elm_box_add(win);
228 elm_notify_content_set(notify, bx); 228 elm_object_content_set(notify, bx);
229 elm_box_horizontal_set(bx, EINA_TRUE); 229 elm_box_horizontal_set(bx, EINA_TRUE);
230 evas_object_show(bx); 230 evas_object_show(bx);
231 231
@@ -251,7 +251,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
251 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_LEFT); 251 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_LEFT);
252 252
253 bx = elm_box_add(win); 253 bx = elm_box_add(win);
254 elm_notify_content_set(notify, bx); 254 elm_object_content_set(notify, bx);
255 elm_box_horizontal_set(bx, EINA_TRUE); 255 elm_box_horizontal_set(bx, EINA_TRUE);
256 evas_object_show(bx); 256 evas_object_show(bx);
257 257
@@ -277,7 +277,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
277 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_RIGHT); 277 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM_RIGHT);
278 278
279 bx = elm_box_add(win); 279 bx = elm_box_add(win);
280 elm_notify_content_set(notify, bx); 280 elm_object_content_set(notify, bx);
281 elm_box_horizontal_set(bx, EINA_TRUE); 281 elm_box_horizontal_set(bx, EINA_TRUE);
282 evas_object_show(bx); 282 evas_object_show(bx);
283 283
diff --git a/legacy/elementary/src/bin/test_panel.c b/legacy/elementary/src/bin/test_panel.c
index adfaa2b1e2..ffe2a58ecb 100644
--- a/legacy/elementary/src/bin/test_panel.c
+++ b/legacy/elementary/src/bin/test_panel.c
@@ -188,7 +188,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
188 188
189 elm_toolbar_item_append(toolbar, "home", "Hello", _tstatus, panel); 189 elm_toolbar_item_append(toolbar, "home", "Hello", _tstatus, panel);
190 190
191 elm_panel_content_set(panel, toolbar); 191 elm_object_content_set(panel, toolbar);
192 elm_box_pack_end(vbx, panel); 192 elm_box_pack_end(vbx, panel);
193 evas_object_show(panel); 193 evas_object_show(panel);
194 194
@@ -209,7 +209,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
209 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); 209 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
210 evas_object_show(list); 210 evas_object_show(list);
211 211
212 elm_panel_content_set(panel, list); 212 elm_object_content_set(panel, list);
213 213
214 elm_box_pack_end(bx, panel); 214 elm_box_pack_end(bx, panel);
215 evas_object_show(panel); 215 evas_object_show(panel);
@@ -228,7 +228,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
228 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); 228 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
229 evas_object_show(list); 229 evas_object_show(list);
230 230
231 elm_panel_content_set(panel, list); 231 elm_object_content_set(panel, list);
232 232
233 elm_box_pack_end(bx, panel); 233 elm_box_pack_end(bx, panel);
234 evas_object_show(panel); 234 evas_object_show(panel);
@@ -252,7 +252,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
252 252
253 elm_toolbar_item_append(toolbar, "home", "Hello", _bstatus, panel); 253 elm_toolbar_item_append(toolbar, "home", "Hello", _bstatus, panel);
254 254
255 elm_panel_content_set(panel, toolbar); 255 elm_object_content_set(panel, toolbar);
256 elm_box_pack_end(vbx, panel); 256 elm_box_pack_end(vbx, panel);
257 evas_object_show(panel); 257 evas_object_show(panel);
258 258
diff --git a/legacy/elementary/src/bin/test_scaling.c b/legacy/elementary/src/bin/test_scaling.c
index e25f733a5f..6a33c83722 100644
--- a/legacy/elementary/src/bin/test_scaling.c
+++ b/legacy/elementary/src/bin/test_scaling.c
@@ -89,7 +89,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
89 "Parent frame scale<br>" 89 "Parent frame scale<br>"
90 "is 0.5. Child should<br>" 90 "is 0.5. Child should<br>"
91 "inherit it."); 91 "inherit it.");
92 elm_frame_content_set(fr, lb); 92 elm_object_content_set(fr, lb);
93 evas_object_show(lb); 93 evas_object_show(lb);
94 elm_box_pack_end(bx, fr); 94 elm_box_pack_end(bx, fr);
95 evas_object_show(fr); 95 evas_object_show(fr);
@@ -101,7 +101,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
101 "Parent frame scale<br>" 101 "Parent frame scale<br>"
102 "is 1.0. Child should<br>" 102 "is 1.0. Child should<br>"
103 "inherit it."); 103 "inherit it.");
104 elm_frame_content_set(fr, lb); 104 elm_object_content_set(fr, lb);
105 evas_object_show(lb); 105 evas_object_show(lb);
106 elm_object_scale_set(fr, 1.0); 106 elm_object_scale_set(fr, 1.0);
107 elm_box_pack_end(bx, fr); 107 elm_box_pack_end(bx, fr);
@@ -114,7 +114,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
114 "Parent frame scale<br>" 114 "Parent frame scale<br>"
115 "is 2.0. Child should<br>" 115 "is 2.0. Child should<br>"
116 "inherit it."); 116 "inherit it.");
117 elm_frame_content_set(fr, lb); 117 elm_object_content_set(fr, lb);
118 evas_object_show(lb); 118 evas_object_show(lb);
119 elm_object_scale_set(fr, 2.0); 119 elm_object_scale_set(fr, 2.0);
120 elm_box_pack_end(bx, fr); 120 elm_box_pack_end(bx, fr);
diff --git a/legacy/elementary/src/bin/test_slideshow.c b/legacy/elementary/src/bin/test_slideshow.c
index 14d3a977ab..b351dc1655 100644
--- a/legacy/elementary/src/bin/test_slideshow.c
+++ b/legacy/elementary/src/bin/test_slideshow.c
@@ -143,7 +143,7 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
143 143
144 bx = elm_box_add(win); 144 bx = elm_box_add(win);
145 elm_box_horizontal_set(bx, EINA_TRUE); 145 elm_box_horizontal_set(bx, EINA_TRUE);
146 elm_notify_content_set(notify, bx); 146 elm_object_content_set(notify, bx);
147 evas_object_show(bx); 147 evas_object_show(bx);
148 148
149 evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in, 149 evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in,
diff --git a/legacy/elementary/src/bin/test_web.c b/legacy/elementary/src/bin/test_web.c
index 2c0941bacf..7dbf45d705 100644
--- a/legacy/elementary/src/bin/test_web.c
+++ b/legacy/elementary/src/bin/test_web.c
@@ -138,7 +138,7 @@ _alert_hook(void *data __UNUSED__, Evas_Object *obj, const char *message)
138 138
139 label = elm_label_add(obj); 139 label = elm_label_add(obj);
140 elm_object_text_set(label, message); 140 elm_object_text_set(label, message);
141 elm_notify_content_set(popup, label); 141 elm_object_content_set(popup, label);
142 evas_object_show(label); 142 evas_object_show(label);
143 143
144 return popup; 144 return popup;
@@ -175,7 +175,7 @@ _confirm_hook(void *data __UNUSED__, Evas_Object *obj, const char *message, Eina
175 evas_object_show(popup); 175 evas_object_show(popup);
176 176
177 box = elm_box_add(obj); 177 box = elm_box_add(obj);
178 elm_notify_content_set(popup, box); 178 elm_object_content_set(popup, box);
179 evas_object_show(box); 179 evas_object_show(box);
180 180
181 label = elm_label_add(obj); 181 label = elm_label_add(obj);
diff --git a/legacy/elementary/src/edje_externals/elm_notify.c b/legacy/elementary/src/edje_externals/elm_notify.c
index a1a1a6749a..ef9ff70238 100644
--- a/legacy/elementary/src/edje_externals/elm_notify.c
+++ b/legacy/elementary/src/edje_externals/elm_notify.c
@@ -53,7 +53,7 @@ static void external_notify_state_set(void *data __UNUSED__,
53 else return; 53 else return;
54 54
55 if (p->content) { 55 if (p->content) {
56 elm_notify_content_set(obj, p->content); 56 elm_object_content_set(obj, p->content);
57 } 57 }
58 if (p->repeat_events_exists) 58 if (p->repeat_events_exists)
59 elm_notify_repeat_events_set(obj, p->repeat_events); 59 elm_notify_repeat_events_set(obj, p->repeat_events);
@@ -76,7 +76,7 @@ static Eina_Bool external_notify_param_set(void *data __UNUSED__,
76 Evas_Object *content = external_common_param_edje_object_get(obj, param); 76 Evas_Object *content = external_common_param_edje_object_get(obj, param);
77 if ((strcmp(param->s, "")) && (!content)) 77 if ((strcmp(param->s, "")) && (!content))
78 return EINA_FALSE; 78 return EINA_FALSE;
79 elm_notify_content_set(obj, content); 79 elm_object_content_set(obj, content);
80 return EINA_TRUE; 80 return EINA_TRUE;
81 } 81 }
82 else if ((!strcmp(param->name, "repeat_events")) 82 else if ((!strcmp(param->name, "repeat_events"))
diff --git a/legacy/elementary/src/examples/anchorblock_example_01.c b/legacy/elementary/src/examples/anchorblock_example_01.c
index a4fb5e92e8..628319ed2e 100644
--- a/legacy/elementary/src/examples/anchorblock_example_01.c
+++ b/legacy/elementary/src/examples/anchorblock_example_01.c
@@ -61,7 +61,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
61 evas_object_smart_callback_add(o, "anchor,clicked", _anchorblock_clicked_cb, 61 evas_object_smart_callback_add(o, "anchor,clicked", _anchorblock_clicked_cb,
62 NULL); 62 NULL);
63 evas_object_show(o); 63 evas_object_show(o);
64 elm_frame_content_set(frame, o); 64 elm_object_content_set(frame, o);
65 65
66 frame = elm_frame_add(win); 66 frame = elm_frame_add(win);
67 elm_object_text_set(frame, "Anchorview"); 67 elm_object_text_set(frame, "Anchorview");
@@ -77,7 +77,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
77 evas_object_smart_callback_add(o, "anchor,clicked", _anchorview_clicked_cb, 77 evas_object_smart_callback_add(o, "anchor,clicked", _anchorview_clicked_cb,
78 NULL); 78 NULL);
79 evas_object_show(o); 79 evas_object_show(o);
80 elm_frame_content_set(frame, o); 80 elm_object_content_set(frame, o);
81 81
82 elm_run(); 82 elm_run();
83 83
diff --git a/legacy/elementary/src/examples/entry_example.c b/legacy/elementary/src/examples/entry_example.c
index 7870affbb2..e677c95bcf 100644
--- a/legacy/elementary/src/examples/entry_example.c
+++ b/legacy/elementary/src/examples/entry_example.c
@@ -183,7 +183,7 @@ _page_settings_add(Evas_Object *parent, App_Inwin_Data *aid)
183 box2 = elm_box_add(parent); 183 box2 = elm_box_add(parent);
184 evas_object_size_hint_weight_set(box2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 184 evas_object_size_hint_weight_set(box2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
185 evas_object_size_hint_align_set(box2, EVAS_HINT_FILL, EVAS_HINT_FILL); 185 evas_object_size_hint_align_set(box2, EVAS_HINT_FILL, EVAS_HINT_FILL);
186 elm_frame_content_set(sizeopts, box2); 186 elm_object_content_set(sizeopts, box2);
187 evas_object_show(box2); 187 evas_object_show(box2);
188 188
189 sizebox = elm_box_add(parent); 189 sizebox = elm_box_add(parent);
@@ -257,7 +257,7 @@ _page_settings_add(Evas_Object *parent, App_Inwin_Data *aid)
257 elm_object_text_set(ewidth, buf); 257 elm_object_text_set(ewidth, buf);
258 evas_object_size_hint_weight_set(ewidth, EVAS_HINT_EXPAND, 0.0); 258 evas_object_size_hint_weight_set(ewidth, EVAS_HINT_EXPAND, 0.0);
259 evas_object_size_hint_align_set(ewidth, EVAS_HINT_FILL, EVAS_HINT_FILL); 259 evas_object_size_hint_align_set(ewidth, EVAS_HINT_FILL, EVAS_HINT_FILL);
260 elm_frame_content_set(fwidth, ewidth); 260 elm_object_content_set(fwidth, ewidth);
261 evas_object_show(ewidth); 261 evas_object_show(ewidth);
262 262
263 evas_object_smart_callback_add(ewidth, "changed", _width_changed_cb, aid); 263 evas_object_smart_callback_add(ewidth, "changed", _width_changed_cb, aid);
@@ -279,7 +279,7 @@ _page_settings_add(Evas_Object *parent, App_Inwin_Data *aid)
279 elm_object_text_set(eheight, buf); 279 elm_object_text_set(eheight, buf);
280 evas_object_size_hint_weight_set(eheight, EVAS_HINT_EXPAND, 0.0); 280 evas_object_size_hint_weight_set(eheight, EVAS_HINT_EXPAND, 0.0);
281 evas_object_size_hint_align_set(eheight, EVAS_HINT_FILL, EVAS_HINT_FILL); 281 evas_object_size_hint_align_set(eheight, EVAS_HINT_FILL, EVAS_HINT_FILL);
282 elm_frame_content_set(fheight, eheight); 282 elm_object_content_set(fheight, eheight);
283 evas_object_show(eheight); 283 evas_object_show(eheight);
284 284
285 evas_object_smart_callback_add(eheight, "changed", _height_changed_cb, aid); 285 evas_object_smart_callback_add(eheight, "changed", _height_changed_cb, aid);
diff --git a/legacy/elementary/src/examples/frame_example_01.c b/legacy/elementary/src/examples/frame_example_01.c
index 32577ac198..d3e4b351ee 100644
--- a/legacy/elementary/src/examples/frame_example_01.c
+++ b/legacy/elementary/src/examples/frame_example_01.c
@@ -27,7 +27,7 @@ elm_main(int argc, char **argv)
27 evas_object_show(r1); 27 evas_object_show(r1);
28 28
29 f1= elm_frame_add(win); 29 f1= elm_frame_add(win);
30 elm_frame_content_set(f1, r1); 30 elm_object_content_set(f1, r1);
31 elm_object_text_set(f1, "Default frame"); 31 elm_object_text_set(f1, "Default frame");
32 evas_object_resize(f1, 100, 100); 32 evas_object_resize(f1, 100, 100);
33 evas_object_move(f1, 25, 25); 33 evas_object_move(f1, 25, 25);
@@ -38,7 +38,7 @@ elm_main(int argc, char **argv)
38 evas_object_show(r2); 38 evas_object_show(r2);
39 39
40 f2 = elm_frame_add(win); 40 f2 = elm_frame_add(win);
41 elm_frame_content_set(f2, r2); 41 elm_object_content_set(f2, r2);
42 elm_object_text_set(f2, "Padding frame"); 42 elm_object_text_set(f2, "Padding frame");
43 evas_object_resize(f2, 100, 100); 43 evas_object_resize(f2, 100, 100);
44 evas_object_move(f2, 150, 25); 44 evas_object_move(f2, 150, 25);
@@ -50,7 +50,7 @@ elm_main(int argc, char **argv)
50 evas_object_show(r3); 50 evas_object_show(r3);
51 51
52 f3 = elm_frame_add(win); 52 f3 = elm_frame_add(win);
53 elm_frame_content_set(f3, r3); 53 elm_object_content_set(f3, r3);
54 elm_object_text_set(f3, "Top outdent frame"); 54 elm_object_text_set(f3, "Top outdent frame");
55 evas_object_resize(f3, 100, 100); 55 evas_object_resize(f3, 100, 100);
56 evas_object_move(f3, 25, 150); 56 evas_object_move(f3, 25, 150);
@@ -62,7 +62,7 @@ elm_main(int argc, char **argv)
62 evas_object_show(r4); 62 evas_object_show(r4);
63 63
64 f4 = elm_frame_add(win); 64 f4 = elm_frame_add(win);
65 elm_frame_content_set(f4, r4); 65 elm_object_content_set(f4, r4);
66 elm_object_text_set(f4, "Bottom outdent frame"); 66 elm_object_text_set(f4, "Bottom outdent frame");
67 evas_object_resize(f4, 100, 100); 67 evas_object_resize(f4, 100, 100);
68 evas_object_move(f4, 150, 150); 68 evas_object_move(f4, 150, 150);
diff --git a/legacy/elementary/src/examples/general_funcs_example.c b/legacy/elementary/src/examples/general_funcs_example.c
index 283e0636b2..c4c89e4c26 100644
--- a/legacy/elementary/src/examples/general_funcs_example.c
+++ b/legacy/elementary/src/examples/general_funcs_example.c
@@ -117,7 +117,7 @@ elm_main(int argc __UNUSED__,
117 117
118 d.btn = elm_button_add(win); 118 d.btn = elm_button_add(win);
119 elm_object_text_set(d.btn, "Click me"); 119 elm_object_text_set(d.btn, "Click me");
120 elm_frame_content_set(frame, d.btn); 120 elm_object_content_set(frame, d.btn);
121 121
122 fprintf(stdout, "Elementary's finger size is set to %d pixels\n.", 122 fprintf(stdout, "Elementary's finger size is set to %d pixels\n.",
123 elm_finger_size_get()); 123 elm_finger_size_get());
diff --git a/legacy/elementary/src/examples/mapbuf_example.c b/legacy/elementary/src/examples/mapbuf_example.c
index a7cd78f52d..2684284c58 100644
--- a/legacy/elementary/src/examples/mapbuf_example.c
+++ b/legacy/elementary/src/examples/mapbuf_example.c
@@ -87,7 +87,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
87 } 87 }
88 } 88 }
89 89
90 elm_mapbuf_content_set(mb, tb); 90 elm_object_content_set(mb, tb);
91 evas_object_show(mb); 91 evas_object_show(mb);
92 92
93 hbx = elm_box_add(win); 93 hbx = elm_box_add(win);
diff --git a/legacy/elementary/src/examples/notify_example_01.c b/legacy/elementary/src/examples/notify_example_01.c
index c071964666..c19119da2d 100644
--- a/legacy/elementary/src/examples/notify_example_01.c
+++ b/legacy/elementary/src/examples/notify_example_01.c
@@ -36,7 +36,7 @@ elm_main(int argc, char **argv)
36 notify = elm_notify_add(win); 36 notify = elm_notify_add(win);
37 elm_notify_repeat_events_set(notify, EINA_FALSE); 37 elm_notify_repeat_events_set(notify, EINA_FALSE);
38 elm_notify_timeout_set(notify, 5); 38 elm_notify_timeout_set(notify, 5);
39 elm_notify_content_set(notify, content); 39 elm_object_content_set(notify, content);
40 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 40 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
41 evas_object_show(notify); 41 evas_object_show(notify);
42 elm_box_pack_end(bx, notify); 42 elm_box_pack_end(bx, notify);
@@ -48,7 +48,7 @@ elm_main(int argc, char **argv)
48 48
49 notify = elm_notify_add(win); 49 notify = elm_notify_add(win);
50 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM); 50 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM);
51 elm_notify_content_set(notify, content); 51 elm_object_content_set(notify, content);
52 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 52 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
53 evas_object_show(notify); 53 evas_object_show(notify);
54 elm_box_pack_end(bx, notify); 54 elm_box_pack_end(bx, notify);
@@ -59,7 +59,7 @@ elm_main(int argc, char **argv)
59 59
60 notify = elm_notify_add(win); 60 notify = elm_notify_add(win);
61 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_CENTER); 61 elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_CENTER);
62 elm_notify_content_set(notify, content); 62 elm_object_content_set(notify, content);
63 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 63 evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
64 evas_object_show(notify); 64 evas_object_show(notify);
65 elm_box_pack_end(bx, notify); 65 elm_box_pack_end(bx, notify);
@@ -77,4 +77,4 @@ static void
77_hide(void *data, Evas_Object *obj, void *event_info) 77_hide(void *data, Evas_Object *obj, void *event_info)
78{ 78{
79 evas_object_hide(obj); 79 evas_object_hide(obj);
80} \ No newline at end of file 80}
diff --git a/legacy/elementary/src/examples/panel_example_01.c b/legacy/elementary/src/examples/panel_example_01.c
index d5b49dce4b..8e848bfb52 100644
--- a/legacy/elementary/src/examples/panel_example_01.c
+++ b/legacy/elementary/src/examples/panel_example_01.c
@@ -39,7 +39,7 @@ elm_main(int argc, char **argv)
39 elm_object_text_set(content, "content"); 39 elm_object_text_set(content, "content");
40 evas_object_show(content); 40 evas_object_show(content);
41 evas_object_size_hint_min_set(content, 100, 30); 41 evas_object_size_hint_min_set(content, 100, 30);
42 elm_panel_content_set(panel, content); 42 elm_object_content_set(panel, content);
43 43
44 panel = elm_panel_add(win); 44 panel = elm_panel_add(win);
45 elm_panel_orient_set(panel, ELM_PANEL_ORIENT_RIGHT); 45 elm_panel_orient_set(panel, ELM_PANEL_ORIENT_RIGHT);
@@ -53,7 +53,7 @@ elm_main(int argc, char **argv)
53 elm_object_text_set(content, "content2"); 53 elm_object_text_set(content, "content2");
54 evas_object_show(content); 54 evas_object_show(content);
55 evas_object_size_hint_min_set(content, 100, 30); 55 evas_object_size_hint_min_set(content, 100, 30);
56 elm_panel_content_set(panel, content); 56 elm_object_content_set(panel, content);
57 57
58 panel = elm_panel_add(win); 58 panel = elm_panel_add(win);
59 evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 59 evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -65,7 +65,7 @@ elm_main(int argc, char **argv)
65 elm_object_text_set(content, "content2"); 65 elm_object_text_set(content, "content2");
66 evas_object_show(content); 66 evas_object_show(content);
67 evas_object_size_hint_min_set(content, 100, 30); 67 evas_object_size_hint_min_set(content, 100, 30);
68 elm_panel_content_set(panel, content); 68 elm_object_content_set(panel, content);
69 69
70 70
71 evas_object_show(win); 71 evas_object_show(win);
diff --git a/legacy/elementary/src/examples/slideshow_example.c b/legacy/elementary/src/examples/slideshow_example.c
index 534efa503d..d6f133f5e9 100644
--- a/legacy/elementary/src/examples/slideshow_example.c
+++ b/legacy/elementary/src/examples/slideshow_example.c
@@ -230,7 +230,7 @@ elm_main(int argc __UNUSED__,
230 230
231 bx = elm_box_add(win); 231 bx = elm_box_add(win);
232 elm_box_horizontal_set(bx, EINA_TRUE); 232 elm_box_horizontal_set(bx, EINA_TRUE);
233 elm_notify_content_set(notify, bx); 233 elm_object_content_set(notify, bx);
234 evas_object_show(bx); 234 evas_object_show(bx);
235 235
236 evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in, 236 evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in,
diff --git a/legacy/elementary/src/examples/win_example.c b/legacy/elementary/src/examples/win_example.c
index c369cdda88..8746b84291 100644
--- a/legacy/elementary/src/examples/win_example.c
+++ b/legacy/elementary/src/examples/win_example.c
@@ -118,7 +118,7 @@ _main_win_del_cb(void *data __UNUSED__, Evas_Object *obj, void *event __UNUSED__
118 box = elm_box_add(obj); 118 box = elm_box_add(obj);
119 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 119 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
120 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); 120 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
121 elm_notify_content_set(msg, box); 121 elm_object_content_set(msg, box);
122 evas_object_show(box); 122 evas_object_show(box);
123 123
124 lbl = elm_label_add(obj); 124 lbl = elm_label_add(obj);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 7e61eb0eda..a500e949e7 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -4516,7 +4516,6 @@ extern "C" {
4516 * centered, scaled or stretched. 4516 * centered, scaled or stretched.
4517 * 4517 *
4518 * Default contents parts of the bg widget that you can use for are: 4518 * Default contents parts of the bg widget that you can use for are:
4519 *
4520 * @li "elm.swallow.content" - overlay of the bg 4519 * @li "elm.swallow.content" - overlay of the bg
4521 * 4520 *
4522 * Here is some sample code using it: 4521 * Here is some sample code using it:
@@ -6165,11 +6164,9 @@ extern "C" {
6165 * @li hoversel_vertical_entry: Another internal for @ref Hoversel. 6164 * @li hoversel_vertical_entry: Another internal for @ref Hoversel.
6166 * 6165 *
6167 * Default contents parts of the button widget that you can use for are: 6166 * Default contents parts of the button widget that you can use for are:
6168 *
6169 * @li "elm.swallow.content" - A icon of the button 6167 * @li "elm.swallow.content" - A icon of the button
6170 * 6168 *
6171 * Default text parts of the button widget that you can use for are: 6169 * Default text parts of the button widget that you can use for are:
6172 *
6173 * @li "elm.text" - Label of the button 6170 * @li "elm.text" - Label of the button
6174 * 6171 *
6175 * Follow through a complete example @ref button_example_01 "here". 6172 * Follow through a complete example @ref button_example_01 "here".
@@ -7761,6 +7758,12 @@ extern "C" {
7761 * 7758 *
7762 * Of all this styles only default shows the title. Frame emits no signals. 7759 * Of all this styles only default shows the title. Frame emits no signals.
7763 * 7760 *
7761 * Default contents parts of the frame widget that you can use for are:
7762 * @li "elm.swallow.content" - A content of the frame
7763 *
7764 * Default text parts of the frame widget that you can use for are:
7765 * @li "elm.text" - Label of the frame
7766 *
7764 * For a detailed example see the @ref tutorial_frame. 7767 * For a detailed example see the @ref tutorial_frame.
7765 * 7768 *
7766 * @{ 7769 * @{
@@ -7801,7 +7804,7 @@ extern "C" {
7801 * @param obj The frame object 7804 * @param obj The frame object
7802 * @param content The content will be filled in this frame object 7805 * @param content The content will be filled in this frame object
7803 */ 7806 */
7804 EAPI void elm_frame_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); 7807 EINA_DEPRECATED EAPI void elm_frame_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1);
7805 /** 7808 /**
7806 * @brief Get the content of the frame widget 7809 * @brief Get the content of the frame widget
7807 * 7810 *
@@ -7810,7 +7813,7 @@ extern "C" {
7810 * @param obj The frame object 7813 * @param obj The frame object
7811 * @return The content that is being used 7814 * @return The content that is being used
7812 */ 7815 */
7813 EAPI Evas_Object *elm_frame_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 7816 EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
7814 /** 7817 /**
7815 * @brief Unset the content of the frame widget 7818 * @brief Unset the content of the frame widget
7816 * 7819 *
@@ -7819,7 +7822,7 @@ extern "C" {
7819 * @param obj The frame object 7822 * @param obj The frame object
7820 * @return The content that was being used 7823 * @return The content that was being used
7821 */ 7824 */
7822 EAPI Evas_Object *elm_frame_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); 7825 EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
7823 /** 7826 /**
7824 * @} 7827 * @}
7825 */ 7828 */
@@ -10417,6 +10420,9 @@ extern "C" {
10417 * @li "timeout" - when timeout happens on notify and it's hidden 10420 * @li "timeout" - when timeout happens on notify and it's hidden
10418 * @li "block,clicked" - when a click outside of the notify happens 10421 * @li "block,clicked" - when a click outside of the notify happens
10419 * 10422 *
10423 * Default contents parts of the notify widget that you can use for are:
10424 * @li "elm.swallow.content" - A content of the notify
10425 *
10420 * @ref tutorial_notify show usage of the API. 10426 * @ref tutorial_notify show usage of the API.
10421 * 10427 *
10422 * @{ 10428 * @{
@@ -10459,7 +10465,7 @@ extern "C" {
10459 * you want to keep that old content object, use the 10465 * you want to keep that old content object, use the
10460 * elm_notify_content_unset() function. 10466 * elm_notify_content_unset() function.
10461 */ 10467 */
10462 EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); 10468 EINA_DEPRECATED EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1);
10463 /** 10469 /**
10464 * @brief Unset the content of the notify widget 10470 * @brief Unset the content of the notify widget
10465 * 10471 *
@@ -10470,7 +10476,7 @@ extern "C" {
10470 * 10476 *
10471 * @see elm_notify_content_set() 10477 * @see elm_notify_content_set()
10472 */ 10478 */
10473 EAPI Evas_Object *elm_notify_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); 10479 EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
10474 /** 10480 /**
10475 * @brief Return the content of the notify widget 10481 * @brief Return the content of the notify widget
10476 * 10482 *
@@ -10479,7 +10485,7 @@ extern "C" {
10479 * 10485 *
10480 * @see elm_notify_content_set() 10486 * @see elm_notify_content_set()
10481 */ 10487 */
10482 EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 10488 EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
10483 /** 10489 /**
10484 * @brief Set the notify parent 10490 * @brief Set the notify parent
10485 * 10491 *
@@ -19669,11 +19675,9 @@ extern "C" {
19669 * the check object(event_info is NULL). 19675 * the check object(event_info is NULL).
19670 * 19676 *
19671 * Default contents parts of the check widget that you can use for are: 19677 * Default contents parts of the check widget that you can use for are:
19672 *
19673 * @li "elm.swallow.content" - A icon of the check 19678 * @li "elm.swallow.content" - A icon of the check
19674 * 19679 *
19675 * Default text parts of the check widget that you can use for are: 19680 * Default text parts of the check widget that you can use for are:
19676 *
19677 * @li "elm.text" - Label of the check 19681 * @li "elm.text" - Label of the check
19678 * 19682 *
19679 * @ref tutorial_check should give you a firm grasp of how to use this widget 19683 * @ref tutorial_check should give you a firm grasp of how to use this widget
@@ -23676,6 +23680,12 @@ extern "C" {
23676 * @li ELM_PANEL_ORIENT_LEFT 23680 * @li ELM_PANEL_ORIENT_LEFT
23677 * @li ELM_PANEL_ORIENT_RIGHT 23681 * @li ELM_PANEL_ORIENT_RIGHT
23678 * 23682 *
23683 * To set/get/unset the contetn of the panel, you can use
23684 * elm_object_content_set/get/unset APIs.
23685 * Once the content object is set, a previously set one will be deleted.
23686 * If you want to keep that old content object, use the
23687 * elm_object_content_unset() function
23688 *
23679 * @ref tutorial_panel shows one way to use this widget. 23689 * @ref tutorial_panel shows one way to use this widget.
23680 * @{ 23690 * @{
23681 */ 23691 */
@@ -23723,7 +23733,7 @@ extern "C" {
23723 * If you want to keep that old content object, use the 23733 * If you want to keep that old content object, use the
23724 * elm_panel_content_unset() function. 23734 * elm_panel_content_unset() function.
23725 */ 23735 */
23726 EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); 23736 EINA_DEPRECATED EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1);
23727 /** 23737 /**
23728 * @brief Get the content of the panel. 23738 * @brief Get the content of the panel.
23729 * 23739 *
@@ -23734,7 +23744,7 @@ extern "C" {
23734 * 23744 *
23735 * @see elm_panel_content_set() 23745 * @see elm_panel_content_set()
23736 */ 23746 */
23737 EAPI Evas_Object *elm_panel_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 23747 EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
23738 /** 23748 /**
23739 * @brief Unset the content of the panel. 23749 * @brief Unset the content of the panel.
23740 * 23750 *
@@ -23745,7 +23755,7 @@ extern "C" {
23745 * 23755 *
23746 * @see elm_panel_content_set() 23756 * @see elm_panel_content_set()
23747 */ 23757 */
23748 EAPI Evas_Object *elm_panel_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); 23758 EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
23749 /** 23759 /**
23750 * @brief Set the state of the panel. 23760 * @brief Set the state of the panel.
23751 * 23761 *
@@ -24456,6 +24466,14 @@ extern "C" {
24456 * need to resize or move it frequently (the content object and its 24466 * need to resize or move it frequently (the content object and its
24457 * children). 24467 * children).
24458 * 24468 *
24469 * To set/get/unset the content of the mapbuf, you can use
24470 * elm_object_content_set/get/unset APIs.
24471 * Once the content object is set, a previously set one will be deleted.
24472 * If you want to keep that old content object, use the
24473 * elm_object_content_unset() function.
24474 *
24475 * To enable map, elm_mapbuf_enabled_set() should be used.
24476 *
24459 * See how to use this widget in this example: 24477 * See how to use this widget in this example:
24460 * @ref mapbuf_example 24478 * @ref mapbuf_example
24461 */ 24479 */
@@ -24492,7 +24510,7 @@ extern "C" {
24492 * 24510 *
24493 * @ingroup Mapbuf 24511 * @ingroup Mapbuf
24494 */ 24512 */
24495 EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); 24513 EINA_DEPRECATED EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1);
24496 24514
24497 /** 24515 /**
24498 * Get the content of the mapbuf. 24516 * Get the content of the mapbuf.
@@ -24506,7 +24524,7 @@ extern "C" {
24506 * 24524 *
24507 * @ingroup Mapbuf 24525 * @ingroup Mapbuf
24508 */ 24526 */
24509 EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 24527 EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
24510 24528
24511 /** 24529 /**
24512 * Unset the content of the mapbuf. 24530 * Unset the content of the mapbuf.
@@ -24520,7 +24538,7 @@ extern "C" {
24520 * 24538 *
24521 * @ingroup Mapbuf 24539 * @ingroup Mapbuf
24522 */ 24540 */
24523 EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); 24541 EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
24524 24542
24525 /** 24543 /**
24526 * Enable or disable the map. 24544 * Enable or disable the map.
@@ -26297,6 +26315,9 @@ extern "C" {
26297 * Signals that you can add callbacks for are: 26315 * Signals that you can add callbacks for are:
26298 * "dismissed" - the ctxpopup was dismissed 26316 * "dismissed" - the ctxpopup was dismissed
26299 * 26317 *
26318 * Default contents parts of the ctxpopup widget that you can use for are:
26319 * @li "elm.swallow.content" - A content of the ctxpopup
26320 *
26300 * @ref tutorial_ctxpopup shows the usage of a good deal of the API. 26321 * @ref tutorial_ctxpopup shows the usage of a good deal of the API.
26301 * @{ 26322 * @{
26302 */ 26323 */
@@ -27903,8 +27924,8 @@ extern "C" {
27903 */ 27924 */
27904 27925
27905 EAPI Evas_Object *elm_factory_add(Evas_Object *parent); 27926 EAPI Evas_Object *elm_factory_add(Evas_Object *parent);
27906 EAPI void elm_factory_content_set(Evas_Object *obj, Evas_Object *content); 27927 EINA_DEPRECATED EAPI void elm_factory_content_set(Evas_Object *obj, Evas_Object *content);
27907 EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj); 27928 EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj);
27908 EAPI void elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled); 27929 EAPI void elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled);
27909 EAPI Eina_Bool elm_factory_maxmin_mode_get(const Evas_Object *obj); 27930 EAPI Eina_Bool elm_factory_maxmin_mode_get(const Evas_Object *obj);
27910 EAPI void elm_factory_maxmin_reset_set(Evas_Object *obj); 27931 EAPI void elm_factory_maxmin_reset_set(Evas_Object *obj);
@@ -28155,19 +28176,16 @@ extern "C" {
28155 * application. 28176 * application.
28156 * 28177 *
28157 * Signals that you can add callback for are: 28178 * Signals that you can add callback for are:
28158 *
28159 * @li "transition,finished" - When the transition is finished in changing 28179 * @li "transition,finished" - When the transition is finished in changing
28160 * the item 28180 * the item
28161 * @li "title,clicked" - User clicked title area 28181 * @li "title,clicked" - User clicked title area
28162 * 28182 *
28163 * Default contents parts of the naviframe items that you can use for are: 28183 * Default contents parts of the naviframe items that you can use for are:
28164 *
28165 * @li "elm.swallow.content" - A main content of the page 28184 * @li "elm.swallow.content" - A main content of the page
28166 * @li "elm.swallow.prev_btn" - A button to go to the previous page 28185 * @li "elm.swallow.prev_btn" - A button to go to the previous page
28167 * @li "elm.swallow.next_btn" - A button to go to the next page 28186 * @li "elm.swallow.next_btn" - A button to go to the next page
28168 * 28187 *
28169 * Default text parts of the naviframe items that you can use for are: 28188 * Default text parts of the naviframe items that you can use for are:
28170 *
28171 * @li "elm.text.title" - Title label in the title area 28189 * @li "elm.text.title" - Title label in the title area
28172 * 28190 *
28173 * @ref tutorial_naviframe gives a good overview of the usage of the API. 28191 * @ref tutorial_naviframe gives a good overview of the usage of the API.
diff --git a/legacy/elementary/src/lib/elm_factory.c b/legacy/elementary/src/lib/elm_factory.c
index 3fa5787f41..ecb5b5cefb 100644
--- a/legacy/elementary/src/lib/elm_factory.c
+++ b/legacy/elementary/src/lib/elm_factory.c
@@ -26,6 +26,8 @@ static void _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, v
26static void _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); 26static void _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
27static void _child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); 27static void _child_change(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
28static void _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); 28static void _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__);
29static void _content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content);
30static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__);
29 31
30static const char SIG_REALIZE[] = "realize"; 32static const char SIG_REALIZE[] = "realize";
31static const char SIG_UNREALIZE[] = "unrealize"; 33static const char SIG_UNREALIZE[] = "unrealize";
@@ -209,36 +211,8 @@ _child_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __
209// printf("FAC-- = %i\n", fac); 211// printf("FAC-- = %i\n", fac);
210} 212}
211 213
212EAPI Evas_Object * 214static void
213elm_factory_add(Evas_Object *parent) 215_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
214{
215 Evas_Object *obj;
216 Evas *e;
217 Widget_Data *wd;
218
219 ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
220
221 ELM_SET_WIDTYPE(widtype, "factory");
222 elm_widget_type_set(obj, "factory");
223 elm_widget_sub_object_add(parent, obj);
224 elm_widget_data_set(obj, wd);
225 elm_widget_del_hook_set(obj, _del_hook);
226 elm_widget_focus_next_hook_set(obj, _focus_next_hook);
227 elm_widget_can_focus_set(obj, EINA_FALSE);
228 elm_widget_changed_hook_set(obj, _changed);
229
230 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
231 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
232
233 evas_object_smart_callbacks_descriptions_set(obj, _signals);
234
235 wd->obj = obj;
236 wd->last_calc_count = -1;
237 return obj;
238}
239
240EAPI void
241elm_factory_content_set(Evas_Object *obj, Evas_Object *content)
242{ 216{
243 ELM_CHECK_WIDTYPE(obj, widtype); 217 ELM_CHECK_WIDTYPE(obj, widtype);
244 Widget_Data *wd = elm_widget_data_get(obj); 218 Widget_Data *wd = elm_widget_data_get(obj);
@@ -275,8 +249,8 @@ elm_factory_content_set(Evas_Object *obj, Evas_Object *content)
275 } 249 }
276} 250}
277 251
278EAPI Evas_Object * 252static Evas_Object *
279elm_factory_content_get(const Evas_Object *obj) 253_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
280{ 254{
281 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 255 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
282 Widget_Data *wd = elm_widget_data_get(obj); 256 Widget_Data *wd = elm_widget_data_get(obj);
@@ -284,6 +258,48 @@ elm_factory_content_get(const Evas_Object *obj)
284 return wd->content; 258 return wd->content;
285} 259}
286 260
261EAPI Evas_Object *
262elm_factory_add(Evas_Object *parent)
263{
264 Evas_Object *obj;
265 Evas *e;
266 Widget_Data *wd;
267
268 ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
269
270 ELM_SET_WIDTYPE(widtype, "factory");
271 elm_widget_type_set(obj, "factory");
272 elm_widget_sub_object_add(parent, obj);
273 elm_widget_data_set(obj, wd);
274 elm_widget_del_hook_set(obj, _del_hook);
275 elm_widget_focus_next_hook_set(obj, _focus_next_hook);
276 elm_widget_content_set_hook_set(obj, _content_set_hook);
277 elm_widget_content_get_hook_set(obj, _content_get_hook);
278 elm_widget_can_focus_set(obj, EINA_FALSE);
279 elm_widget_changed_hook_set(obj, _changed);
280
281 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
282 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
283
284 evas_object_smart_callbacks_descriptions_set(obj, _signals);
285
286 wd->obj = obj;
287 wd->last_calc_count = -1;
288 return obj;
289}
290
291EAPI void
292elm_factory_content_set(Evas_Object *obj, Evas_Object *content)
293{
294 _content_set_hook(obj, NULL, content);
295}
296
297EAPI Evas_Object *
298elm_factory_content_get(const Evas_Object *obj)
299{
300 return _content_get_hook(obj, NULL);
301}
302
287EAPI void 303EAPI void
288elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled) 304elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled)
289{ 305{
diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c
index ee33efcc25..fb1019c354 100644
--- a/legacy/elementary/src/lib/elm_frame.c
+++ b/legacy/elementary/src/lib/elm_frame.c
@@ -124,6 +124,49 @@ _elm_frame_label_get(const Evas_Object *obj, const char *item)
124 return wd->label; 124 return wd->label;
125} 125}
126 126
127static void
128_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
129{
130 ELM_CHECK_WIDTYPE(obj, widtype);
131 Widget_Data *wd = elm_widget_data_get(obj);
132 if (!wd) return;
133 if (wd->content == content) return;
134 if (wd->content) evas_object_del(wd->content);
135 wd->content = content;
136 if (content)
137 {
138 elm_widget_sub_object_add(obj, content);
139 evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
140 _changed_size_hints, obj);
141 edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
142 }
143 _sizing_eval(obj);
144}
145
146static Evas_Object *
147_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
148{
149 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
150 Widget_Data *wd = elm_widget_data_get(obj);
151 if (!wd) return NULL;
152 return wd->content;
153}
154
155static Evas_Object *
156_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
157{
158 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
159 Widget_Data *wd = elm_widget_data_get(obj);
160 Evas_Object *content;
161 if (!wd) return NULL;
162 if (!wd->content) return NULL;
163 content = wd->content;
164 elm_widget_sub_object_del(obj, wd->content);
165 edje_object_part_unswallow(wd->frm, wd->content);
166 wd->content = NULL;
167 return content;
168}
169
127EAPI Evas_Object * 170EAPI Evas_Object *
128elm_frame_add(Evas_Object *parent) 171elm_frame_add(Evas_Object *parent)
129{ 172{
@@ -143,6 +186,9 @@ elm_frame_add(Evas_Object *parent)
143 elm_widget_can_focus_set(obj, EINA_FALSE); 186 elm_widget_can_focus_set(obj, EINA_FALSE);
144 elm_widget_text_set_hook_set(obj, _elm_frame_label_set); 187 elm_widget_text_set_hook_set(obj, _elm_frame_label_set);
145 elm_widget_text_get_hook_set(obj, _elm_frame_label_get); 188 elm_widget_text_get_hook_set(obj, _elm_frame_label_get);
189 elm_widget_content_set_hook_set(obj, _content_set_hook);
190 elm_widget_content_get_hook_set(obj, _content_get_hook);
191 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
146 192
147 wd->frm = edje_object_add(e); 193 wd->frm = edje_object_add(e);
148 _elm_theme_object_set(obj, wd->frm, "frame", "base", "default"); 194 _elm_theme_object_set(obj, wd->frm, "frame", "base", "default");
@@ -170,42 +216,17 @@ elm_frame_label_get(const Evas_Object *obj)
170EAPI void 216EAPI void
171elm_frame_content_set(Evas_Object *obj, Evas_Object *content) 217elm_frame_content_set(Evas_Object *obj, Evas_Object *content)
172{ 218{
173 ELM_CHECK_WIDTYPE(obj, widtype); 219 _content_set_hook(obj, NULL, content);
174 Widget_Data *wd = elm_widget_data_get(obj);
175 if (!wd) return;
176 if (wd->content == content) return;
177 if (wd->content) evas_object_del(wd->content);
178 wd->content = content;
179 if (content)
180 {
181 elm_widget_sub_object_add(obj, content);
182 evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
183 _changed_size_hints, obj);
184 edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
185 }
186 _sizing_eval(obj);
187} 220}
188 221
189EAPI Evas_Object * 222EAPI Evas_Object *
190elm_frame_content_get(const Evas_Object *obj) 223elm_frame_content_get(const Evas_Object *obj)
191{ 224{
192 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 225 return _content_get_hook(obj, NULL);
193 Widget_Data *wd = elm_widget_data_get(obj);
194 if (!wd) return NULL;
195 return wd->content;
196} 226}
197 227
198EAPI Evas_Object * 228EAPI Evas_Object *
199elm_frame_content_unset(Evas_Object *obj) 229elm_frame_content_unset(Evas_Object *obj)
200{ 230{
201 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 231 return _content_unset_hook(obj, NULL);
202 Widget_Data *wd = elm_widget_data_get(obj);
203 Evas_Object *content;
204 if (!wd) return NULL;
205 if (!wd->content) return NULL;
206 content = wd->content;
207 elm_widget_sub_object_del(obj, wd->content);
208 edje_object_part_unswallow(wd->frm, wd->content);
209 wd->content = NULL;
210 return content;
211} 232}
diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c
index c87ecff51d..ab6f152cfd 100644
--- a/legacy/elementary/src/lib/elm_mapbuf.c
+++ b/legacy/elementary/src/lib/elm_mapbuf.c
@@ -146,6 +146,59 @@ _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
146 _configure(data); 146 _configure(data);
147} 147}
148 148
149static void
150_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
151{
152 ELM_CHECK_WIDTYPE(obj, widtype);
153 Widget_Data *wd = elm_widget_data_get(obj);
154 if (!wd) return;
155 if (wd->content == content) return;
156 if (wd->content) evas_object_del(wd->content);
157 wd->content = content;
158 if (content)
159 {
160 evas_object_data_set(content, "_elm_leaveme", (void *)1);
161 elm_widget_sub_object_add(content, obj);
162 evas_object_smart_member_add(content, obj);
163 evas_object_clip_set(content, wd->clip);
164 evas_object_color_set(wd->clip, 255, 255, 255, 255);
165 evas_object_event_callback_add(content,
166 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
167 _changed_size_hints, obj);
168 }
169 else
170 evas_object_color_set(wd->clip, 0, 0, 0, 0);
171 _sizing_eval(obj);
172 _configure(obj);
173}
174
175static Evas_Object *
176_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
177{
178 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
179 Widget_Data *wd = elm_widget_data_get(obj);
180 if (!wd) return NULL;
181 return wd->content;
182}
183
184static Evas_Object *
185_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
186{
187 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
188 Widget_Data *wd = elm_widget_data_get(obj);
189 Evas_Object *content;
190 if (!wd) return NULL;
191 if (!wd->content) return NULL;
192 content = wd->content;
193 elm_widget_sub_object_del(obj, content);
194 evas_object_smart_member_del(content);
195 evas_object_color_set(wd->clip, 0, 0, 0, 0);
196 evas_object_clip_unset(content);
197 evas_object_data_del(content, "_elm_leaveme");
198 wd->content = NULL;
199 return content;
200}
201
149EAPI Evas_Object * 202EAPI Evas_Object *
150elm_mapbuf_add(Evas_Object *parent) 203elm_mapbuf_add(Evas_Object *parent)
151{ 204{
@@ -161,6 +214,9 @@ elm_mapbuf_add(Evas_Object *parent)
161 elm_widget_data_set(obj, wd); 214 elm_widget_data_set(obj, wd);
162 elm_widget_del_hook_set(obj, _del_hook); 215 elm_widget_del_hook_set(obj, _del_hook);
163 elm_widget_theme_hook_set(obj, _theme_hook); 216 elm_widget_theme_hook_set(obj, _theme_hook);
217 elm_widget_content_set_hook_set(obj, _content_set_hook);
218 elm_widget_content_get_hook_set(obj, _content_get_hook);
219 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
164 elm_widget_can_focus_set(obj, EINA_FALSE); 220 elm_widget_can_focus_set(obj, EINA_FALSE);
165 221
166 wd->clip = evas_object_rectangle_add(e); 222 wd->clip = evas_object_rectangle_add(e);
@@ -185,54 +241,19 @@ elm_mapbuf_add(Evas_Object *parent)
185EAPI void 241EAPI void
186elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content) 242elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content)
187{ 243{
188 ELM_CHECK_WIDTYPE(obj, widtype); 244 _content_set_hook(obj, NULL, content);
189 Widget_Data *wd = elm_widget_data_get(obj);
190 if (!wd) return;
191 if (wd->content == content) return;
192 if (wd->content) evas_object_del(wd->content);
193 wd->content = content;
194 if (content)
195 {
196 evas_object_data_set(content, "_elm_leaveme", (void *)1);
197 elm_widget_sub_object_add(content, obj);
198 evas_object_smart_member_add(content, obj);
199 evas_object_clip_set(content, wd->clip);
200 evas_object_color_set(wd->clip, 255, 255, 255, 255);
201 evas_object_event_callback_add(content,
202 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
203 _changed_size_hints, obj);
204 }
205 else
206 evas_object_color_set(wd->clip, 0, 0, 0, 0);
207 _sizing_eval(obj);
208 _configure(obj);
209} 245}
210 246
211EAPI Evas_Object * 247EAPI Evas_Object *
212elm_mapbuf_content_get(const Evas_Object *obj) 248elm_mapbuf_content_get(const Evas_Object *obj)
213{ 249{
214 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 250 return _content_get_hook(obj, NULL);
215 Widget_Data *wd = elm_widget_data_get(obj);
216 if (!wd) return NULL;
217 return wd->content;
218} 251}
219 252
220EAPI Evas_Object * 253EAPI Evas_Object *
221elm_mapbuf_content_unset(Evas_Object *obj) 254elm_mapbuf_content_unset(Evas_Object *obj)
222{ 255{
223 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 256 return _content_unset_hook(obj, NULL);
224 Widget_Data *wd = elm_widget_data_get(obj);
225 Evas_Object *content;
226 if (!wd) return NULL;
227 if (!wd->content) return NULL;
228 content = wd->content;
229 elm_widget_sub_object_del(obj, content);
230 evas_object_smart_member_del(content);
231 evas_object_color_set(wd->clip, 0, 0, 0, 0);
232 evas_object_clip_unset(content);
233 evas_object_data_del(content, "_elm_leaveme");
234 wd->content = NULL;
235 return content;
236} 257}
237 258
238EAPI void 259EAPI void
diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c
index e9f1d9818c..116d475a21 100644
--- a/legacy/elementary/src/lib/elm_notify.c
+++ b/legacy/elementary/src/lib/elm_notify.c
@@ -413,6 +413,54 @@ _elm_notify_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Eva
413 return elm_widget_focus_next_get(cur, dir, next); 413 return elm_widget_focus_next_get(cur, dir, next);
414} 414}
415 415
416static void
417_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
418{
419 ELM_CHECK_WIDTYPE(obj, widtype);
420 Widget_Data *wd = elm_widget_data_get(obj);
421 if (!wd) return;
422 if (wd->content == content) return;
423 if (wd->content) evas_object_del(wd->content);
424 wd->content = content;
425
426 if (content)
427 {
428 elm_widget_sub_object_add(obj, content);
429 evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
430 _changed_size_hints, obj);
431 evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
432 _content_resize, obj);
433 edje_object_part_swallow(wd->notify, "elm.swallow.content", content);
434 }
435 _sizing_eval(obj);
436 _calc(obj);
437}
438
439static Evas_Object *
440_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
441{
442 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
443 Widget_Data *wd = elm_widget_data_get(obj);
444
445 if (!wd) return NULL;
446 return wd->content;
447}
448
449static Evas_Object *
450_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
451{
452 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
453 Widget_Data *wd = elm_widget_data_get(obj);
454 Evas_Object *content;
455 if (!wd) return NULL;
456 if (!wd->content) return NULL;
457 content = wd->content;
458 elm_widget_sub_object_del(obj, wd->content);
459 edje_object_part_unswallow(wd->notify, wd->content);
460 wd->content = NULL;
461 return content;
462}
463
416EAPI Evas_Object * 464EAPI Evas_Object *
417elm_notify_add(Evas_Object *parent) 465elm_notify_add(Evas_Object *parent)
418{ 466{
@@ -431,6 +479,9 @@ elm_notify_add(Evas_Object *parent)
431 elm_widget_theme_hook_set(obj, _theme_hook); 479 elm_widget_theme_hook_set(obj, _theme_hook);
432 elm_widget_can_focus_set(obj, EINA_FALSE); 480 elm_widget_can_focus_set(obj, EINA_FALSE);
433 elm_widget_focus_next_hook_set(obj, _elm_notify_focus_next_hook); 481 elm_widget_focus_next_hook_set(obj, _elm_notify_focus_next_hook);
482 elm_widget_content_set_hook_set(obj, _content_set_hook);
483 elm_widget_content_get_hook_set(obj, _content_get_hook);
484 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
434 485
435 wd->repeat_events = EINA_TRUE; 486 wd->repeat_events = EINA_TRUE;
436 487
@@ -456,49 +507,19 @@ elm_notify_add(Evas_Object *parent)
456EAPI void 507EAPI void
457elm_notify_content_set(Evas_Object *obj, Evas_Object *content) 508elm_notify_content_set(Evas_Object *obj, Evas_Object *content)
458{ 509{
459 ELM_CHECK_WIDTYPE(obj, widtype); 510 _content_set_hook(obj, NULL, content);
460 Widget_Data *wd = elm_widget_data_get(obj);
461 if (!wd) return;
462 if (wd->content == content) return;
463 if (wd->content) evas_object_del(wd->content);
464 wd->content = content;
465
466 if (content)
467 {
468 elm_widget_sub_object_add(obj, content);
469 evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
470 _changed_size_hints, obj);
471 evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
472 _content_resize, obj);
473 edje_object_part_swallow(wd->notify, "elm.swallow.content", content);
474 }
475 _sizing_eval(obj);
476 _calc(obj);
477} 511}
478 512
479EAPI Evas_Object * 513EAPI Evas_Object *
480elm_notify_content_unset(Evas_Object *obj) 514elm_notify_content_unset(Evas_Object *obj)
481{ 515{
482 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 516 return _content_unset_hook(obj, NULL);
483 Widget_Data *wd = elm_widget_data_get(obj);
484 Evas_Object *content;
485 if (!wd) return NULL;
486 if (!wd->content) return NULL;
487 content = wd->content;
488 elm_widget_sub_object_del(obj, wd->content);
489 edje_object_part_unswallow(wd->notify, wd->content);
490 wd->content = NULL;
491 return content;
492} 517}
493 518
494EAPI Evas_Object * 519EAPI Evas_Object *
495elm_notify_content_get(const Evas_Object *obj) 520elm_notify_content_get(const Evas_Object *obj)
496{ 521{
497 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 522 return _content_get_hook(obj, NULL);
498 Widget_Data *wd = elm_widget_data_get(obj);
499
500 if (!wd) return NULL;
501 return wd->content;
502} 523}
503 524
504EAPI void 525EAPI void
diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c
index 30c9089674..3da5b9e5c3 100644
--- a/legacy/elementary/src/lib/elm_panel.c
+++ b/legacy/elementary/src/lib/elm_panel.c
@@ -225,6 +225,47 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
225 return EINA_TRUE; 225 return EINA_TRUE;
226} 226}
227 227
228static void
229_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content)
230{
231 ELM_CHECK_WIDTYPE(obj, widtype);
232 Widget_Data *wd = elm_widget_data_get(obj);
233 if (!wd) return;
234 if (wd->content == content) return;
235 if (wd->content)
236 evas_object_box_remove_all(wd->bx, EINA_TRUE);
237 wd->content = content;
238 if (content)
239 {
240 evas_object_box_append(wd->bx, wd->content);
241 evas_object_show(wd->content);
242 }
243 _sizing_eval(obj);
244}
245
246static Evas_Object *
247_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__)
248{
249 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
250 Widget_Data *wd = elm_widget_data_get(obj);
251 if (!wd) return NULL;
252 return wd->content;
253}
254
255static Evas_Object *
256_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
257{
258 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
259 Widget_Data *wd = elm_widget_data_get(obj);
260 Evas_Object *content;
261 if (!wd) return NULL;
262 if (!wd->content) return NULL;
263 content = wd->content;
264 evas_object_box_remove_all(wd->bx, EINA_FALSE);
265 wd->content = NULL;
266 return content;
267}
268
228EAPI Evas_Object * 269EAPI Evas_Object *
229elm_panel_add(Evas_Object *parent) 270elm_panel_add(Evas_Object *parent)
230{ 271{
@@ -247,6 +288,9 @@ elm_panel_add(Evas_Object *parent)
247 elm_widget_focus_next_hook_set(obj, _elm_panel_focus_next_hook); 288 elm_widget_focus_next_hook_set(obj, _elm_panel_focus_next_hook);
248 elm_widget_can_focus_set(obj, EINA_TRUE); 289 elm_widget_can_focus_set(obj, EINA_TRUE);
249 elm_widget_event_hook_set(obj, _event_hook); 290 elm_widget_event_hook_set(obj, _event_hook);
291 elm_widget_content_set_hook_set(obj, _content_set_hook);
292 elm_widget_content_get_hook_set(obj, _content_get_hook);
293 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
250 294
251 wd->scr = elm_smart_scroller_add(e); 295 wd->scr = elm_smart_scroller_add(e);
252 elm_smart_scroller_widget_set(wd->scr, obj); 296 elm_smart_scroller_widget_set(wd->scr, obj);
@@ -321,42 +365,19 @@ elm_panel_orient_get(const Evas_Object *obj)
321EAPI void 365EAPI void
322elm_panel_content_set(Evas_Object *obj, Evas_Object *content) 366elm_panel_content_set(Evas_Object *obj, Evas_Object *content)
323{ 367{
324 ELM_CHECK_WIDTYPE(obj, widtype); 368 _content_set_hook(obj, NULL, content);
325 Widget_Data *wd = elm_widget_data_get(obj);
326 if (!wd) return;
327 if (wd->content == content) return;
328 if (wd->content)
329 evas_object_box_remove_all(wd->bx, EINA_TRUE);
330 wd->content = content;
331 if (content)
332 {
333 evas_object_box_append(wd->bx, wd->content);
334 evas_object_show(wd->content);
335 }
336 _sizing_eval(obj);
337} 369}
338 370
339EAPI Evas_Object * 371EAPI Evas_Object *
340elm_panel_content_get(const Evas_Object *obj) 372elm_panel_content_get(const Evas_Object *obj)
341{ 373{
342 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 374 return _content_get_hook(obj, NULL);
343 Widget_Data *wd = elm_widget_data_get(obj);
344 if (!wd) return NULL;
345 return wd->content;
346} 375}
347 376
348EAPI Evas_Object * 377EAPI Evas_Object *
349elm_panel_content_unset(Evas_Object *obj) 378elm_panel_content_unset(Evas_Object *obj)
350{ 379{
351 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 380 return _content_unset_hook(obj, NULL);
352 Widget_Data *wd = elm_widget_data_get(obj);
353 Evas_Object *content;
354 if (!wd) return NULL;
355 if (!wd->content) return NULL;
356 content = wd->content;
357 evas_object_box_remove_all(wd->bx, EINA_FALSE);
358 wd->content = NULL;
359 return content;
360} 381}
361 382
362EAPI void 383EAPI void
diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c
index 46169df561..b230f2e375 100644
--- a/legacy/elementary/src/lib/elm_web.c
+++ b/legacy/elementary/src/lib/elm_web.c
@@ -909,7 +909,7 @@ _ewk_view_popup_create_cb(void *data, Evas_Object *obj, void *event_info)
909 elm_list_mode_set(list, ELM_LIST_EXPAND); 909 elm_list_mode_set(list, ELM_LIST_EXPAND);
910 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 910 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
911 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); 911 evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
912 elm_notify_content_set(notify, list); 912 elm_object_content_set(notify, list);
913 evas_object_show(list); 913 evas_object_show(list);
914 914
915 EINA_LIST_FOREACH(m->items, itr, it) 915 EINA_LIST_FOREACH(m->items, itr, it)