From f5f82ee13942b5e3f4aa6fe8934433d7df911676 Mon Sep 17 00:00:00 2001 From: billiob Date: Thu, 17 Nov 2011 21:02:31 +0000 Subject: [PATCH] elm: change elm_object_content_part_set/get/unset to elm_object_part_content_set/get/unset git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@65349 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- doc/examples.dox | 6 +- doc/widgets/widget_preview_bubble2.c | 2 +- doc/widgets/widget_preview_bubble3.c | 2 +- doc/widgets/widget_preview_button2.c | 2 +- doc/widgets/widget_preview_button3.c | 2 +- doc/widgets/widget_preview_check2.c | 2 +- doc/widgets/widget_preview_check3.c | 2 +- doc/widgets/widget_preview_layout.c | 2 +- doc/widgets/widget_preview_panes.c | 4 +- doc/widgets/widget_preview_progressbar.c | 2 +- src/bin/test.c | 2 +- src/bin/test_anchorblock.c | 12 +-- src/bin/test_bg.c | 4 +- src/bin/test_bubble.c | 4 +- src/bin/test_button.c | 14 ++-- src/bin/test_check.c | 8 +- src/bin/test_colorselector.c | 2 +- src/bin/test_cursor.c | 4 +- src/bin/test_entry.c | 6 +- src/bin/test_flip.c | 6 +- src/bin/test_focus.c | 4 +- src/bin/test_focus2.c | 6 +- src/bin/test_gesture_layer.c | 2 +- src/bin/test_launcher.c | 14 ++-- src/bin/test_layout.c | 6 +- src/bin/test_map.c | 2 +- src/bin/test_naviframe.c | 4 +- src/bin/test_pager.c | 6 +- src/bin/test_panes.c | 8 +- src/bin/test_progressbar.c | 4 +- src/bin/test_radio.c | 8 +- src/bin/test_segment_control.c | 8 +- src/bin/test_slider.c | 12 +-- src/bin/test_toggle.c | 8 +- src/bin/test_transit.c | 10 +-- src/bin/test_win_inline.c | 12 +-- src/edje_externals/elm_bubble.c | 8 +- src/edje_externals/elm_button.c | 4 +- src/edje_externals/elm_check.c | 4 +- src/edje_externals/elm_panes.c | 12 +-- src/edje_externals/elm_progressbar.c | 4 +- src/edje_externals/elm_radio.c | 4 +- src/edje_externals/elm_slider.c | 4 +- src/edje_externals/elm_toggle.c | 4 +- src/examples/bg_example_03.c | 4 +- src/examples/bubble_example_01.c | 2 +- src/examples/button_example_01.c | 14 ++-- src/examples/check_example_01.c | 2 +- src/examples/entry_example.c | 2 +- src/examples/layout_example_01.c | 4 +- src/examples/layout_example_02.c | 4 +- src/examples/layout_example_03.c | 2 +- src/examples/panes_example.c | 8 +- src/examples/progressbar_example.c | 4 +- src/examples/radio_example_01.c | 4 +- src/examples/slider_example.c | 4 +- src/examples/transit_example_03.c | 2 +- src/examples/transit_example_04.c | 4 +- src/examples/web_example.c | 16 ++-- src/lib/Elementary.h.in | 125 ++++++++++++++++++++++--------- src/lib/elc_fileselector.c | 4 +- src/lib/elc_fileselector_button.c | 6 +- src/lib/elc_hoversel.c | 8 +- src/lib/elc_player.c | 2 +- src/lib/elm_main.c | 23 ++++++ src/lib/elm_map.c | 2 +- src/lib/elm_toggle.c | 6 +- 67 files changed, 286 insertions(+), 212 deletions(-) diff --git a/doc/examples.dox b/doc/examples.dox index ca77366..627aca9 100644 --- a/doc/examples.dox +++ b/doc/examples.dox @@ -3133,8 +3133,8 @@ * Finally, we have an area in this layout theme, in the bottom part of it, * reserved for adding an specific widget. Differently from the 2 parts * described until now, this one can only receive one widget with the call - * elm_object_content_part_set() for the layout. If there was already an item on this specific part, - * it will be deleted (one can use elm_object_content_part_unset() in order to remove + * elm_object_part_content_set() for the layout. If there was already an item on this specific part, + * it will be deleted (one can use elm_object_part_content_unset() in order to remove * it without deleting). An example of removing it without deleting, but * manually deleting this widget just after that, can be seen on the callback * for this button. Actually, the callback defined for this button will clean @@ -3146,7 +3146,7 @@ * Also notice that, for this last added button, we don't have to call * evas_object_show() on it. This is a particularity of the theme for layouts, * that will have total control over the properties like size, position, - * visibility and clipping of a widget added with elm_object_content_part_set(). + * visibility and clipping of a widget added with elm_object_part_content_set(). * Again, read the Edje documentation to understand this better. * * Now we just put the code for the different callbacks specified for each kind diff --git a/doc/widgets/widget_preview_bubble2.c b/doc/widgets/widget_preview_bubble2.c index d032a71..c2272ea 100644 --- a/doc/widgets/widget_preview_bubble2.c +++ b/doc/widgets/widget_preview_bubble2.c @@ -9,7 +9,7 @@ elm_object_text_set(o, "Bubble"); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_bubble3.c b/doc/widgets/widget_preview_bubble3.c index ddf99b7..ff474f1 100644 --- a/doc/widgets/widget_preview_bubble3.c +++ b/doc/widgets/widget_preview_bubble3.c @@ -7,7 +7,7 @@ evas_object_show(o); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_button2.c b/doc/widgets/widget_preview_button2.c index 87b40b0..f5b9d11 100644 --- a/doc/widgets/widget_preview_button2.c +++ b/doc/widgets/widget_preview_button2.c @@ -9,7 +9,7 @@ elm_object_text_set(o, "Button"); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_button3.c b/doc/widgets/widget_preview_button3.c index 764bdca..6739b58 100644 --- a/doc/widgets/widget_preview_button3.c +++ b/doc/widgets/widget_preview_button3.c @@ -7,7 +7,7 @@ evas_object_show(o); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_check2.c b/doc/widgets/widget_preview_check2.c index ff9143d..f71080c 100644 --- a/doc/widgets/widget_preview_check2.c +++ b/doc/widgets/widget_preview_check2.c @@ -9,7 +9,7 @@ elm_object_text_set(o, "Check"); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_check3.c b/doc/widgets/widget_preview_check3.c index 05b4298..5e69dbc 100644 --- a/doc/widgets/widget_preview_check3.c +++ b/doc/widgets/widget_preview_check3.c @@ -7,7 +7,7 @@ evas_object_show(o); Evas_Object *o2 = elm_icon_add(win); elm_icon_standard_set(o2, "home"); -elm_object_content_part_set(o, "icon", o2); +elm_object_part_content_set(o, "icon", o2); evas_object_show(o2); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_layout.c b/doc/widgets/widget_preview_layout.c index 570c655..6ad2873 100644 --- a/doc/widgets/widget_preview_layout.c +++ b/doc/widgets/widget_preview_layout.c @@ -13,7 +13,7 @@ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_min_set(icon, 200, 140); evas_object_show(icon); -elm_object_content_part_set(layout, "elm.swallow.content", icon); +elm_object_part_content_set(layout, "elm.swallow.content", icon); elm_object_part_text_set(layout, "elm.text.title", "Layout"); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_panes.c b/doc/widgets/widget_preview_panes.c index 1759c87..114725c 100644 --- a/doc/widgets/widget_preview_panes.c +++ b/doc/widgets/widget_preview_panes.c @@ -10,13 +10,13 @@ elm_object_text_set(bt, "Left"); evas_object_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_show(bt); -elm_object_content_part_set(panes, "left", bt); +elm_object_part_content_set(panes, "left", bt); bt = elm_button_add(win); elm_object_text_set(bt, "Right"); evas_object_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_show(bt); -elm_object_content_part_set(panes, "right", bt); +elm_object_part_content_set(panes, "right", bt); #include "widget_preview_tmpl_foot.c" diff --git a/doc/widgets/widget_preview_progressbar.c b/doc/widgets/widget_preview_progressbar.c index b508423..46c2444 100644 --- a/doc/widgets/widget_preview_progressbar.c +++ b/doc/widgets/widget_preview_progressbar.c @@ -15,7 +15,7 @@ evas_object_show(ic); pb = elm_progressbar_add(win); elm_object_text_set(pb, "Label"); elm_progressbar_span_size_set(pb, 100); -elm_object_content_part_set(pb, "icon", ic); +elm_object_part_content_set(pb, "icon", ic); elm_progressbar_unit_format_set(pb, "%1.1f units"); evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test.c b/src/bin/test.c index 649d180..6d06def 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -546,7 +546,7 @@ add_tests: ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), t->icon); elm_icon_file_set(ic, buf, NULL); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_show(ic); } elm_box_pack_end(tbx2, bt); diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c index aa27371..c3aa682 100644 --- a/src/bin/test_anchorblock.c +++ b/src/bin/test_anchorblock.c @@ -148,8 +148,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 3"); - elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -175,8 +175,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 2"); - elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -212,8 +212,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); diff --git a/src/bin/test_bg.c b/src/bin/test_bg.c index 2f0c1be..0b4905d 100644 --- a/src/bin/test_bg.c +++ b/src/bin/test_bg.c @@ -26,10 +26,10 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__) parent = elm_object_parent_widget_get(o_bg); over = edje_object_add(evas_object_evas_get(parent)); edje_object_file_set(over, buff, "bg_overlay"); - elm_object_content_part_set(o_bg, "overlay", over); + elm_object_part_content_set(o_bg, "overlay", over); } else - elm_object_content_part_set(o_bg, "overlay", NULL); + elm_object_part_content_set(o_bg, "overlay", NULL); } static void diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c index 0d83cd4..1ee845f 100644 --- a/src/bin/test_bubble.c +++ b/src/bin/test_bubble.c @@ -38,8 +38,8 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_text_part_set(bb, "info", "Corner: bottom_right"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "Corner: bottom_right"); + elm_object_part_content_set(bb, "icon", ic); elm_bubble_corner_set(bb, "bottom_right"); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); diff --git a/src/bin/test_button.c b/src/bin/test_button.c index 0408ceb..4250af3 100644 --- a/src/bin/test_button.c +++ b/src/bin/test_button.c @@ -64,7 +64,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); elm_object_text_set(bt, "Icon sized to button"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)1); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)1); elm_box_pack_end(bx, bt); @@ -77,7 +77,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_scale_set(ic, 0, 0); bt = elm_button_add(win); elm_object_text_set(bt, "Icon no scale"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)2); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)2); elm_box_pack_end(bx, bt); @@ -90,7 +90,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); elm_object_text_set(bt, "Disabled Button"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_disabled_set(bt, 1); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)3); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)3); @@ -103,7 +103,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_disabled_set(bt, 1); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)4); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)4); @@ -127,7 +127,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); bt = elm_button_add(win); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)6); elm_box_pack_end(bx, bt); @@ -148,7 +148,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); elm_object_style_set(bt, "anchor"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)8); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)8); elm_box_pack_end(bx, bt); @@ -161,7 +161,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); elm_object_style_set(bt, "anchor"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_disabled_set(bt, 1); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)9); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)9); diff --git a/src/bin/test_check.c b/src/bin/test_check.c index 51afc6a..79bbfba 100644 --- a/src/bin/test_check.c +++ b/src/bin/test_check.c @@ -31,7 +31,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); elm_object_text_set(ck, "Icon sized to check"); - elm_object_content_part_set(ck, "icon", ic); + elm_object_part_content_set(ck, "icon", ic); elm_check_state_set(ck, 1); elm_box_pack_end(bx, ck); evas_object_show(ck); @@ -43,7 +43,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_scale_set(ic, 0, 0); ck = elm_check_add(win); elm_object_text_set(ck, "Icon no scale"); - elm_object_content_part_set(ck, "icon", ic); + elm_object_part_content_set(ck, "icon", ic); elm_box_pack_end(bx, ck); evas_object_show(ck); evas_object_show(ic); @@ -61,7 +61,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); elm_object_text_set(ck, "Disabled check"); - elm_object_content_part_set(ck, "icon", ic); + elm_object_part_content_set(ck, "icon", ic); elm_check_state_set(ck, 1); elm_box_pack_end(bx, ck); elm_object_disabled_set(ck, 1); @@ -73,7 +73,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); ck = elm_check_add(win); - elm_object_content_part_set(ck, "icon", ic); + elm_object_part_content_set(ck, "icon", ic); elm_box_pack_end(bx, ck); evas_object_show(ck); evas_object_show(ic); diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c index 1498bd5..c7ada62 100644 --- a/src/bin/test_colorselector.c +++ b/src/bin/test_colorselector.c @@ -60,7 +60,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve re = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_show(re); - elm_object_content_part_set(ly, "ColorPreview", re); + elm_object_part_content_set(ly, "ColorPreview", re); fr = elm_frame_add(win); evas_object_size_hint_weight_set(fr, 1.0, 0); diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c index a045abd..d3513c6 100644 --- a/src/bin/test_cursor.c +++ b/src/bin/test_cursor.c @@ -451,11 +451,11 @@ test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_layout_file_set(ly, buf, "test/layout/swallow"); bt = elm_button_add(win); elm_object_text_set(bt, "Cursor over obj"); - elm_object_content_part_set(ly, "swallow1", bt); + elm_object_part_content_set(ly, "swallow1", bt); elm_object_cursor_set(bt, ELM_CURSOR_PIRATE); bt = elm_button_add(win); elm_object_text_set(bt, "Cursor over part"); - elm_object_content_part_set(ly, "swallow2", bt); + elm_object_part_content_set(ly, "swallow2", bt); elm_layout_part_cursor_set(ly, "swallow2", ELM_CURSOR_PIRATE); elm_box_pack_end(bx, ly); evas_object_show(ly); diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index 1b29b80..7a49ef9 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -1305,7 +1305,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_entry_entry_set(en, "This is a single line"); elm_entry_single_line_set(en, 1); - elm_object_content_part_set(ly, "element1", en); + elm_object_part_content_set(ly, "element1", en); evas_object_show(en); en = elm_entry_add(win); @@ -1318,7 +1318,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info "use it more flexibly."); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_content_part_set(ly, "element2", en); + elm_object_part_content_set(ly, "element2", en); evas_object_show(en); en = elm_entry_add(win); @@ -1339,7 +1339,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info "good testing to see if entry widgets work as advertised." ); evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en); - elm_object_content_part_set(ly, "element3", en); + elm_object_part_content_set(ly, "element3", en); evas_object_show(en); evas_object_show(win); diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c index cebdf44..514fb8e 100644 --- a/src/bin/test_flip.c +++ b/src/bin/test_flip.c @@ -104,15 +104,15 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ bt = elm_button_add(ly); elm_object_text_set(bt, "Button 1"); - elm_object_content_part_set(ly, "element1", bt); + elm_object_part_content_set(ly, "element1", bt); bt = elm_button_add(ly); elm_object_text_set(bt, "Button 2"); - elm_object_content_part_set(ly, "element2", bt); + elm_object_part_content_set(ly, "element2", bt); bt = elm_button_add(ly); elm_object_text_set(bt, "Button 3"); - elm_object_content_part_set(ly, "element3", bt); + elm_object_part_content_set(ly, "element3", bt); evas_object_show(fl); diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index d964f48..11d47a5 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -261,7 +261,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bx2, 0.0, 0.0); - elm_object_content_part_set(ly, "element1", bx2); + elm_object_part_content_set(ly, "element1", bx2); my_show(bx2); for (i = 3; i; i--) @@ -283,7 +283,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bx2, 0.0, 0.0); - elm_object_content_part_set(ly, "element2", bx2); + elm_object_part_content_set(ly, "element2", bx2); my_show(bx2); { diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c index 3b087cf..401067d 100644 --- a/src/bin/test_focus2.c +++ b/src/bin/test_focus2.c @@ -102,7 +102,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bt1 = bt = elm_button_add(ly); elm_object_text_set(bt, "Button 1"); - elm_object_content_part_set(ly, "element1", bt); + elm_object_part_content_set(ly, "element1", bt); en = elm_entry_add(ly); elm_entry_scrollable_set(en, EINA_TRUE); @@ -111,11 +111,11 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_entry_entry_set(en, "Scrolled Entry that should get focus"); elm_entry_single_line_set(en, 1); - elm_object_content_part_set(ly, "element2", en); + elm_object_part_content_set(ly, "element2", en); bt = elm_button_add(ly); elm_object_text_set(bt, "Button 2"); - elm_object_content_part_set(ly, "element3", bt); + elm_object_part_content_set(ly, "element3", bt); bt = elm_button_add(PARENT); elm_object_text_set(bt, "Give focus to layout"); diff --git a/src/bin/test_gesture_layer.c b/src/bin/test_gesture_layer.c index a4dea4c..e59167c 100644 --- a/src/bin/test_gesture_layer.c +++ b/src/bin/test_gesture_layer.c @@ -332,7 +332,7 @@ test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *postit = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/postit_ent.edj", elm_app_data_dir_get()); elm_layout_file_set(postit, buf, "main"); - elm_object_content_part_set(postit, "ent", en); + elm_object_part_content_set(postit, "ent", en); photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355); diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c index 1a96a4c..690507c 100644 --- a/src/bin/test_launcher.c +++ b/src/bin/test_launcher.c @@ -408,17 +408,17 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i bt = elm_button_add(win); elm_object_text_set(bt, "Button 1"); - elm_object_content_part_set(ly, "element1", bt); + elm_object_part_content_set(ly, "element1", bt); evas_object_show(bt); bt = elm_button_add(win); elm_object_text_set(bt, "Button 2"); - elm_object_content_part_set(ly, "element2", bt); + elm_object_part_content_set(ly, "element2", bt); evas_object_show(bt); bt = elm_button_add(win); elm_object_text_set(bt, "Button 3"); - elm_object_content_part_set(ly, "element3", bt); + elm_object_part_content_set(ly, "element3", bt); evas_object_show(bt); mb = elm_mapbuf_add(win); @@ -595,7 +595,7 @@ l3_tim_cb(void *data) slx = (int)(long)evas_object_data_get(data, "slx"); sly = (int)(long)evas_object_data_get(data, "sly"); snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); - elm_object_content_part_unset(ly, buf); + elm_object_part_content_unset(ly, buf); edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app"); return EINA_FALSE; } @@ -671,7 +671,7 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e slx = (int)(long)evas_object_data_get(obj, "slx"); sly = (int)(long)evas_object_data_get(obj, "sly"); snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); - elm_object_content_part_set(ly, buf, ly2); + elm_object_part_content_set(ly, buf, ly2); list = (Eina_List *)evas_object_data_get (elm_object_top_widget_get(obj), "mbs"); EINA_LIST_FOREACH(list, l, mb) @@ -812,7 +812,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_icon_scale_set(ic, 0, 0); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ic, 0.5, 0.5); - elm_object_content_part_set(ly2, "slot", ic); + elm_object_part_content_set(ly2, "slot", ic); evas_object_show(ic); 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 evas_object_data_set(ic, "sly", (void *)(long)(j)); snprintf(buf, sizeof(buf), "slot.%i.%i", i, j); - elm_object_content_part_set(ly, buf, ly2); + elm_object_part_content_set(ly, buf, ly2); evas_object_show(ly2); n++; if (n > 23) n = 0; diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c index e63839b..b4720eb 100644 --- a/src/bin/test_layout.c +++ b/src/bin/test_layout.c @@ -60,19 +60,19 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bt = elm_button_add(win); elm_object_text_set(bt, "Button 1"); - elm_object_content_part_set(ly, "element1", bt); + elm_object_part_content_set(ly, "element1", bt); evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); evas_object_show(bt); bt = elm_button_add(win); elm_object_text_set(bt, "Button 2"); - elm_object_content_part_set(ly, "element2", bt); + elm_object_part_content_set(ly, "element2", bt); evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); evas_object_show(bt); bt = elm_button_add(win); elm_object_text_set(bt, "Button 3"); - elm_object_content_part_set(ly, "element3", bt); + elm_object_part_content_set(ly, "element3", bt); evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly); evas_object_show(bt); diff --git a/src/bin/test_map.c b/src/bin/test_map.c index 4bb21f8..7725dfc 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -549,7 +549,7 @@ _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data) evas_object_show(icon); Evas_Object *o = elm_button_add(obj); - elm_object_content_part_set(o, "icon", icon); + elm_object_part_content_set(o, "icon", icon); evas_object_show(o); elm_box_pack_end(bx, o); } diff --git a/src/bin/test_naviframe.c b/src/bin/test_naviframe.c index 59432c6..1ebd538 100644 --- a/src/bin/test_naviframe.c +++ b/src/bin/test_naviframe.c @@ -83,7 +83,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) bt = elm_button_add(nf); evas_object_smart_callback_add(bt, "clicked", _page5, nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); content = _content_new(nf, img4); @@ -152,7 +152,7 @@ _page2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); content = _content_new(nf, img2); diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c index afd85e8..4421e89 100644 --- a/src/bin/test_pager.c +++ b/src/bin/test_pager.c @@ -221,16 +221,16 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bt = elm_button_add(win); elm_object_text_set(bt, "Flip to 1"); evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info); - elm_object_content_part_set(ly2, "element1", bt); + elm_object_part_content_set(ly2, "element1", bt); evas_object_show(bt); bt = elm_button_add(win); elm_object_text_set(bt, "Popme"); evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info); evas_object_show(bt); - elm_object_content_part_set(ly2, "element2", bt); + elm_object_part_content_set(ly2, "element2", bt); - elm_object_content_part_set(ly, "swallow", ly2); + elm_object_part_content_set(ly, "swallow", ly2); evas_object_show(ly); elm_pager_content_push(pg, ly); diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c index 6e27afb..d78d654 100644 --- a/src/bin/test_panes.c +++ b/src/bin/test_panes.c @@ -73,7 +73,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, 1.0, 1.0); evas_object_size_hint_align_set(bt, -1.0, -1.0); evas_object_show(bt); - elm_object_content_part_set(panes, "left", bt); + elm_object_part_content_set(panes, "left", bt); // // @@ -88,7 +88,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(panes_h, "press", _press, panes_h); evas_object_smart_callback_add(panes_h, "unpress", _unpress, panes_h); - elm_object_content_part_set(panes, "right", panes_h); + elm_object_part_content_set(panes, "right", panes_h); // // @@ -97,7 +97,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bt); - elm_object_content_part_set(panes_h, "left", bt); + elm_object_part_content_set(panes_h, "left", bt); // // @@ -106,7 +106,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bt); - elm_object_content_part_set(panes_h, "right", bt); + elm_object_part_content_set(panes_h, "right", bt); // diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c index 73e5232..ba5e782 100644 --- a/src/bin/test_progressbar.c +++ b/src/bin/test_progressbar.c @@ -115,7 +115,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event pb = elm_progressbar_add(win); elm_object_text_set(pb, "Label"); - elm_object_content_part_set(pb, "icon", ic1); + elm_object_part_content_set(pb, "icon", ic1); elm_progressbar_inverted_set(pb, 1); elm_progressbar_unit_format_set(pb, "%1.1f units"); elm_progressbar_span_size_set(pb, 200); @@ -162,7 +162,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event pb = elm_progressbar_add(win); elm_progressbar_horizontal_set(pb, EINA_FALSE); elm_object_text_set(pb, "Label"); - elm_object_content_part_set(pb, "icon", ic2); + elm_object_part_content_set(pb, "icon", ic2); elm_progressbar_inverted_set(pb, 1); elm_progressbar_unit_format_set(pb, "%1.2f%%"); elm_progressbar_span_size_set(pb, 200); diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c index e222623..8302cea 100644 --- a/src/bin/test_radio.c +++ b/src/bin/test_radio.c @@ -33,7 +33,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5); elm_object_text_set(rd, "Icon sized to radio"); - elm_object_content_part_set(rd, "icon", ic); + elm_object_part_content_set(rd, "icon", ic); elm_box_pack_end(bx, rd); evas_object_show(rd); evas_object_show(ic); @@ -48,7 +48,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_radio_state_value_set(rd, 1); elm_radio_group_add(rd, rdg); elm_object_text_set(rd, "Icon no scale"); - elm_object_content_part_set(rd, "icon", ic); + elm_object_part_content_set(rd, "icon", ic); elm_box_pack_end(bx, rd); evas_object_show(rd); evas_object_show(ic); @@ -76,7 +76,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info rd = elm_radio_add(win); elm_radio_state_value_set(rd, 4); elm_radio_group_add(rd, rdg); - elm_object_content_part_set(rd, "icon", ic); + elm_object_part_content_set(rd, "icon", ic); elm_box_pack_end(bx, rd); evas_object_show(rd); evas_object_show(ic); @@ -89,7 +89,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info rd = elm_radio_add(win); elm_radio_state_value_set(rd, 5); elm_radio_group_add(rd, rdg); - elm_object_content_part_set(rd, "icon", ic); + elm_object_part_content_set(rd, "icon", ic); elm_object_disabled_set(rd, 1); elm_box_pack_end(bx, rd); evas_object_show(rd); diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c index e56f555..32dfd47 100644 --- a/src/bin/test_segment_control.c +++ b/src/bin/test_segment_control.c @@ -93,10 +93,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e it3 = elm_segment_control_item_add(segment4, NULL, "Disabled"); elm_object_disabled_set(segment4, EINA_TRUE); - elm_object_content_part_set(in_layout, "segment1", segment1); - elm_object_content_part_set(in_layout, "segment2", segment2); - elm_object_content_part_set(in_layout, "segment3", segment3); - elm_object_content_part_set(in_layout, "segment4", segment4); + elm_object_part_content_set(in_layout, "segment1", segment1); + elm_object_part_content_set(in_layout, "segment2", segment2); + elm_object_part_content_set(in_layout, "segment3", segment3); + elm_object_part_content_set(in_layout, "segment4", segment4); evas_object_show(in_layout); diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c index 29abcf6..1657a8e 100644 --- a/src/bin/test_slider.c +++ b/src/bin/test_slider.c @@ -39,7 +39,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); sl1 = sl; elm_object_text_set(sl, "Horizontal"); - elm_object_content_part_set(sl, "icon", ic); + elm_object_part_content_set(sl, "icon", ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -56,7 +56,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_object_text_set(sl, "Disabled"); - elm_object_content_part_set(sl, "icon", ic); + elm_object_part_content_set(sl, "icon", ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); elm_slider_min_max_set(sl, 50, 150); @@ -75,7 +75,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_object_text_set(sl, "Horizontal inverted"); - elm_object_content_part_set(sl, "end", ic); + elm_object_part_content_set(sl, "end", ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -97,7 +97,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_object_text_set(sl, "Disabled inverted"); - elm_object_content_part_set(sl, "end", ic); + elm_object_part_content_set(sl, "end", ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -140,7 +140,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); sl = elm_slider_add(win); - elm_object_content_part_set(sl, "icon", ic); + elm_object_part_content_set(sl, "icon", ic); elm_object_text_set(sl, "Vertical inverted"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); @@ -178,7 +178,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); sl = elm_slider_add(win); - elm_object_content_part_set(sl, "icon", ic); + elm_object_part_content_set(sl, "icon", ic); elm_object_text_set(sl, "Disabled vertical"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); diff --git a/src/bin/test_toggle.c b/src/bin/test_toggle.c index 31a0f70..bb371db 100644 --- a/src/bin/test_toggle.c +++ b/src/bin/test_toggle.c @@ -32,7 +32,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5); elm_object_text_set(tg, "Icon sized to toggle"); - elm_object_content_part_set(tg, "icon", ic); + elm_object_part_content_set(tg, "icon", ic); elm_check_state_set(tg, 1); elm_object_part_text_set(tg, "on", "Yes"); elm_object_part_text_set(tg, "off", "No"); @@ -47,7 +47,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tg = elm_toggle_add(win); elm_object_text_set(tg, "Icon no scale"); - elm_object_content_part_set(tg, "icon", ic); + elm_object_part_content_set(tg, "icon", ic); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); @@ -59,7 +59,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tg = elm_toggle_add(win); elm_object_text_set(tg, "Icon no scale"); - elm_object_content_part_set(tg, "icon", ic); + elm_object_part_content_set(tg, "icon", ic); elm_object_disabled_set(tg, 1); elm_box_pack_end(bx, tg); evas_object_show(tg); @@ -79,7 +79,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tg = elm_check_add(win); elm_object_style_set(tg, "toggle"); - elm_object_content_part_set(tg, "icon", ic); + elm_object_part_content_set(tg, "icon", ic); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c index 559e521..c4d6c18 100644 --- a/src/bin/test_transit.c +++ b/src/bin/test_transit.c @@ -255,7 +255,7 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf bt = elm_button_add(win); elm_object_text_set(bt, "ImageAnimation Effect"); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_box_pack_end(bx, bt); evas_object_show(bt); evas_object_show(ic); @@ -386,7 +386,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_max_set(ic, 50, 50); bt = elm_button_add(win); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_text_set(bt, "Before Button - Blend Effect"); evas_object_move(bt, 25, 125); evas_object_resize(bt, 250, 50); @@ -398,7 +398,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_max_set(ic, 50, 50); bt2 = elm_button_add(win); - elm_object_content_part_set(bt2, "icon", ic); + elm_object_part_content_set(bt2, "icon", ic); elm_object_text_set(bt2, "After Button - Blend Effect"); evas_object_move(bt2, 25, 125); evas_object_resize(bt2, 250, 50); @@ -432,7 +432,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_max_set(ic, 50, 50); bt = elm_button_add(win); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_text_set(bt, "Before Button - Fade Effect"); evas_object_move(bt, 25, 125); evas_object_resize(bt, 250, 50); @@ -444,7 +444,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_max_set(ic, 50, 50); bt2 = elm_button_add(win); - elm_object_content_part_set(bt2, "icon", ic); + elm_object_part_content_set(bt2, "icon", ic); elm_object_text_set(bt2, "After Button - Fade Effect"); evas_object_move(bt2, 25, 125); evas_object_resize(bt2, 250, 50); diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c index f7f99be..0a3b5cb 100644 --- a/src/bin/test_win_inline.c +++ b/src/bin/test_win_inline.c @@ -54,8 +54,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 3"); - elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -78,8 +78,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 2"); - elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -113,8 +113,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); - elm_object_content_part_set(bb, "icon", ic); + elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); + elm_object_part_content_set(bb, "icon", ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/edje_externals/elm_bubble.c b/src/edje_externals/elm_bubble.c index 76858a2..4868294 100644 --- a/src/edje_externals/elm_bubble.c +++ b/src/edje_externals/elm_bubble.c @@ -20,9 +20,9 @@ external_bubble_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); - if (p->info) elm_object_text_part_set(obj, "info", p->info); - if (p->content) elm_bubble_content_set(obj, p->content); + elm_object_part_content_set(obj, "icon", p->icon); + if (p->info) elm_object_part_text_set(obj, "info", p->info); + if (p->content) elm_object_content_set(obj, p->content); } static Eina_Bool @@ -42,7 +42,7 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_button.c b/src/edje_externals/elm_button.c index 08f8901..ca8455d 100644 --- a/src/edje_externals/elm_button.c +++ b/src/edje_externals/elm_button.c @@ -19,7 +19,7 @@ external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); } static Eina_Bool @@ -39,7 +39,7 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_check.c b/src/edje_externals/elm_check.c index d150e13..287b734 100644 --- a/src/edje_externals/elm_check.c +++ b/src/edje_externals/elm_check.c @@ -21,7 +21,7 @@ external_check_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); if (p->state_exists) elm_check_state_set(obj, p->state); } @@ -43,7 +43,7 @@ external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_panes.c b/src/edje_externals/elm_panes.c index 15d19ea..3b96303 100644 --- a/src/edje_externals/elm_panes.c +++ b/src/edje_externals/elm_panes.c @@ -27,10 +27,10 @@ static void external_panes_state_set(void *data __UNUSED__, else return; if (p->content_left) - elm_object_content_part_set(obj, "left", p->content_left); + elm_object_part_content_set(obj, "left", p->content_left); if (p->content_right) - elm_object_content_part_set(obj, "right", p->content_right); + elm_object_part_content_set(obj, "right", p->content_right); if (p->is_left_size) elm_panes_content_left_size_set(obj, p->left_size); @@ -51,7 +51,7 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__, Evas_Object *content = external_common_param_edje_object_get(obj, param); if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE; - elm_object_content_part_set(obj, "left", content); + elm_object_part_content_set(obj, "left", content); return EINA_TRUE; } else if ((!strcmp(param->name, "content right")) @@ -60,7 +60,7 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__, Evas_Object *content = external_common_param_edje_object_get(obj, param); if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE; - elm_object_content_part_set(obj, "right", content); + elm_object_part_content_set(obj, "right", content); return EINA_TRUE; } else if ((!strcmp(param->name, "horizontal")) @@ -170,9 +170,9 @@ external_panes_content_get(void *data __UNUSED__, const Evas_Object *obj, const char *content) { if (!strcmp(content, "left")) - return elm_object_content_part_get(obj, "left"); + return elm_object_part_content_get(obj, "left"); else if (!strcmp(content, "right")) - return elm_object_content_part_get(obj, "right"); + return elm_object_part_content_get(obj, "right"); ERR("unknown content '%s'", content); diff --git a/src/edje_externals/elm_progressbar.c b/src/edje_externals/elm_progressbar.c index e32cb2e..c202fb4 100644 --- a/src/edje_externals/elm_progressbar.c +++ b/src/edje_externals/elm_progressbar.c @@ -28,7 +28,7 @@ external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const vo if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); if (p->span_exists) elm_progressbar_span_size_set(obj, p->span); if (p->value_exists) @@ -58,7 +58,7 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_radio.c b/src/edje_externals/elm_radio.c index 77ce14a..6d5ee5d 100644 --- a/src/edje_externals/elm_radio.c +++ b/src/edje_externals/elm_radio.c @@ -22,7 +22,7 @@ external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); if (p->value_exists) elm_radio_state_value_set(obj, p->value); if (p->group_name) @@ -50,7 +50,7 @@ external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_slider.c b/src/edje_externals/elm_slider.c index dcdd2bf..a5b5a28 100644 --- a/src/edje_externals/elm_slider.c +++ b/src/edje_externals/elm_slider.c @@ -33,7 +33,7 @@ external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); if (p->span_exists) elm_slider_span_size_set(obj, p->span); if ((p->min_exists) && (p->max_exists)) @@ -80,7 +80,7 @@ external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_toggle.c b/src/edje_externals/elm_toggle.c index 3152cf2..2efffa5 100644 --- a/src/edje_externals/elm_toggle.c +++ b/src/edje_externals/elm_toggle.c @@ -24,7 +24,7 @@ external_toggle_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_object_content_part_set(obj, "icon", p->icon); + elm_object_part_content_set(obj, "icon", p->icon); if (p->on) elm_object_part_text_set(obj, "on", p->on); @@ -52,7 +52,7 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); return EINA_TRUE; } } diff --git a/src/examples/bg_example_03.c b/src/examples/bg_example_03.c index 1139d10..8720254 100644 --- a/src/examples/bg_example_03.c +++ b/src/examples/bg_example_03.c @@ -38,10 +38,10 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__) parent = elm_object_parent_widget_get(o_bg); over = edje_object_add(evas_object_evas_get(parent)); edje_object_file_set(over, buff, "bg_overlay"); - elm_object_content_part_set(o_bg, "overlay", over); + elm_object_part_content_set(o_bg, "overlay", over); } else - elm_object_content_part_set(o_bg, "overlay", NULL); + elm_object_part_content_set(o_bg, "overlay", NULL); } static void diff --git a/src/examples/bubble_example_01.c b/src/examples/bubble_example_01.c index 01970e8..da6bdce 100644 --- a/src/examples/bubble_example_01.c +++ b/src/examples/bubble_example_01.c @@ -40,7 +40,7 @@ elm_main(int argc, char **argv) evas_object_show(icon); bubble = elm_bubble_add(win); - elm_object_content_part_set(bubble, "icon", icon); + elm_object_part_content_set(bubble, "icon", icon); elm_bubble_info_set(bubble, "INFO"); elm_object_text_set(bubble, "LABEL"); elm_bubble_content_set(bubble, label); diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c index 36e26de..d1c6247 100644 --- a/src/examples/button_example_01.c +++ b/src/examples/button_example_01.c @@ -24,7 +24,7 @@ static void _btn_cursors_release_cb(void *data, Evas_Object *btn __UNUSED__, void *ev __UNUSED__) { App_Data *app = data; - elm_object_content_part_set(app->mid, "icon", app->icon_still); + elm_object_part_content_set(app->mid, "icon", app->icon_still); app->icon_still = NULL; } @@ -40,7 +40,7 @@ _btn_cursors_move_cb(void *data, Evas_Object *btn, void *ev __UNUSED__) app->icon_still = elm_object_content_unset(app->mid); icon = elm_icon_add(app->mid); elm_icon_standard_set(icon, "chat"); - elm_object_content_part_set(app->mid, "icon", icon); + elm_object_part_content_set(app->mid, "icon", icon); } evas_object_size_hint_align_get(app->mid, &ax, &ay); @@ -185,7 +185,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, "arrow_up"); - elm_object_content_part_set(btn, "icon", icon); + elm_object_part_content_set(btn, "icon", icon); data.cursors.up = btn; @@ -210,7 +210,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, "arrow_left"); - elm_object_content_part_set(btn, "icon", icon); + elm_object_part_content_set(btn, "icon", icon); data.cursors.left = btn; @@ -221,7 +221,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, "close"); - elm_object_content_part_set(btn, "icon", icon); + elm_object_part_content_set(btn, "icon", icon); data.mid = btn; @@ -239,7 +239,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, "arrow_right"); - elm_object_content_part_set(btn, "icon", icon); + elm_object_part_content_set(btn, "icon", icon); data.cursors.right = btn; @@ -257,7 +257,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, "arrow_down"); - elm_object_content_part_set(btn, "icon", icon); + elm_object_part_content_set(btn, "icon", icon); data.cursors.down = btn; diff --git a/src/examples/check_example_01.c b/src/examples/check_example_01.c index a559779..a796752 100644 --- a/src/examples/check_example_01.c +++ b/src/examples/check_example_01.c @@ -40,7 +40,7 @@ elm_main(int argc, char **argv) cb2 = elm_check_add(win); elm_object_text_set(cb2, "another checkbox"); elm_check_state_set(cb2, EINA_TRUE); - elm_object_content_part_set(cb2, "icon", icon); + elm_object_part_content_set(cb2, "icon", icon); evas_object_move(cb2, 10, 50); evas_object_resize(cb2, 200, 30); evas_object_show(cb2); diff --git a/src/examples/entry_example.c b/src/examples/entry_example.c index 27e6fa5..ee03d29 100644 --- a/src/examples/entry_example.c +++ b/src/examples/entry_example.c @@ -553,7 +553,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) icon = elm_layout_add(win); elm_layout_theme_set(icon, "entry", "emoticon/haha", "default"); - elm_object_content_part_set(o, "icon", icon); + elm_object_part_content_set(o, "icon", icon); evas_object_smart_callback_add(o, "clicked", _image_insert_cb, &app); diff --git a/src/examples/layout_example_01.c b/src/examples/layout_example_01.c index 91ea464..7cf5eb6 100644 --- a/src/examples/layout_example_01.c +++ b/src/examples/layout_example_01.c @@ -52,7 +52,7 @@ _swallow_btn_cb(void *data, Evas_Object *btn __UNUSED__, void *event_info __UNUS elm_layout_table_clear(layout, TABLE, EINA_TRUE); elm_layout_box_remove_all(layout, BOX, EINA_TRUE); - item = elm_object_content_part_unset(layout, SWALLOW); + item = elm_object_part_content_unset(layout, SWALLOW); evas_object_del(item); } @@ -139,7 +139,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) bt2 = elm_button_add(win); elm_object_text_set(bt2, "Delete All"); - elm_object_content_part_set(layout, SWALLOW, bt2); + elm_object_part_content_set(layout, SWALLOW, bt2); evas_object_smart_callback_add(bt2, "clicked", _swallow_btn_cb, layout); evas_object_size_hint_min_set(bg, 160, 160); diff --git a/src/examples/layout_example_02.c b/src/examples/layout_example_02.c index 81e24f0..ad81d65 100644 --- a/src/examples/layout_example_02.c +++ b/src/examples/layout_example_02.c @@ -23,7 +23,7 @@ static void _signal_cb(void *data, Evas_Object *o, const char *emission, const char *source __UNUSED__) { struct _App *app = data; - Evas_Object *icon = elm_object_content_part_get(o, "elm.swallow.content"); + Evas_Object *icon = elm_object_part_content_get(o, "elm.swallow.content"); printf("signal received\n"); @@ -70,7 +70,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) icon = elm_icon_add(win); elm_icon_standard_set(icon, images[app.current]); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_content_part_set(layout, "elm.swallow.content", icon); + elm_object_part_content_set(layout, "elm.swallow.content", icon); elm_object_signal_callback_add(layout, "elm,action,back", "", _signal_cb, &app); elm_object_signal_callback_add(layout, "elm,action,next", "", _signal_cb, &app); diff --git a/src/examples/layout_example_03.c b/src/examples/layout_example_03.c index d974068..ec27e80 100644 --- a/src/examples/layout_example_03.c +++ b/src/examples/layout_example_03.c @@ -83,7 +83,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_object_text_set(btn, "Enlarge me!"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_content_part_set(layout, SWALLOW, btn); + elm_object_part_content_set(layout, SWALLOW, btn); evas_object_smart_callback_add(btn, "clicked", _swallow_btn_cb, layout); evas_object_size_hint_min_set(bg, 160, 160); diff --git a/src/examples/panes_example.c b/src/examples/panes_example.c index 5db8fd6..f9bbc08 100644 --- a/src/examples/panes_example.c +++ b/src/examples/panes_example.c @@ -86,7 +86,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bt); - elm_object_content_part_set(panes, "left", bt); + elm_object_part_content_set(panes, "left", bt); panes_h = elm_panes_add(win); elm_panes_horizontal_set(panes_h, EINA_TRUE); @@ -94,21 +94,21 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) EVAS_HINT_EXPAND); evas_object_size_hint_align_set(panes_h, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(panes_h); - elm_object_content_part_set(panes, "right", panes_h); + elm_object_part_content_set(panes, "right", panes_h); bt = elm_button_add(win); elm_object_text_set(bt, "Up"); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bt); - elm_object_content_part_set(panes_h, "left", bt); + elm_object_part_content_set(panes_h, "left", bt); bt = elm_button_add(win); elm_object_text_set(bt, "Down"); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bt); - elm_object_content_part_set(panes_h, "right", bt); + elm_object_part_content_set(panes_h, "right", bt); evas_object_smart_callback_add(panes, "clicked", _clicked, panes); evas_object_smart_callback_add(panes, "clicked,double", _clicked_double, diff --git a/src/examples/progressbar_example.c b/src/examples/progressbar_example.c index 12b2572..5a7ef9b 100644 --- a/src/examples/progressbar_example.c +++ b/src/examples/progressbar_example.c @@ -143,7 +143,7 @@ elm_main(int argc __UNUSED__, /* pb with label, icon, custom unit label and span size set */ pb = elm_progressbar_add(win); elm_object_text_set(pb, "Label"); - elm_object_content_part_set(pb, "icon", ic1); + elm_object_part_content_set(pb, "icon", ic1); elm_progressbar_inverted_set(pb, EINA_TRUE); elm_progressbar_unit_format_set(pb, "%1.1f units"); elm_progressbar_span_size_set(pb, 200); @@ -192,7 +192,7 @@ elm_main(int argc __UNUSED__, pb = elm_progressbar_add(win); elm_progressbar_horizontal_set(pb, EINA_FALSE); elm_object_text_set(pb, "Label"); - elm_object_content_part_set(pb, "icon", ic2); + elm_object_part_content_set(pb, "icon", ic2); elm_progressbar_inverted_set(pb, EINA_TRUE); elm_progressbar_unit_format_set(pb, "%1.2f%%"); elm_progressbar_span_size_set(pb, 200); diff --git a/src/examples/radio_example_01.c b/src/examples/radio_example_01.c index 05bf935..ec5741b 100644 --- a/src/examples/radio_example_01.c +++ b/src/examples/radio_example_01.c @@ -37,7 +37,7 @@ elm_main(int argc, char **argv) elm_radio_value_pointer_set(radio, &val); ic = elm_icon_add(win); elm_icon_standard_set(ic, "home"); - elm_object_content_part_set(radio, "icon", ic); + elm_object_part_content_set(radio, "icon", ic); elm_box_pack_end(bx, radio); evas_object_size_hint_weight_set(radio, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(radio, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -51,7 +51,7 @@ elm_main(int argc, char **argv) elm_radio_group_add(radio, group); ic = elm_icon_add(win); elm_icon_standard_set(ic, "file"); - elm_object_content_part_set(radio, "icon", ic); + elm_object_part_content_set(radio, "icon", ic); elm_box_pack_end(bx, radio); evas_object_size_hint_weight_set(radio, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(radio, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/examples/slider_example.c b/src/examples/slider_example.c index 9e93031..c4d783b 100644 --- a/src/examples/slider_example.c +++ b/src/examples/slider_example.c @@ -85,12 +85,12 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "home"); elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); - elm_object_content_part_set(sl, "icon", ic); + elm_object_part_content_set(sl, "icon", ic); ic = elm_icon_add(win); elm_icon_standard_set(ic, "folder"); elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); - elm_object_content_part_set(sl, "end", ic); + elm_object_part_content_set(sl, "end", ic); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/examples/transit_example_03.c b/src/examples/transit_example_03.c index 702ccee..a140788 100644 --- a/src/examples/transit_example_03.c +++ b/src/examples/transit_example_03.c @@ -227,7 +227,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); evas_object_resize(obj, 250, 100); evas_object_show(obj); diff --git a/src/examples/transit_example_04.c b/src/examples/transit_example_04.c index 9a1641c..faf4fe5 100644 --- a/src/examples/transit_example_04.c +++ b/src/examples/transit_example_04.c @@ -132,7 +132,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); evas_object_resize(obj, 250, 100); evas_object_show(obj); @@ -145,7 +145,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) icon = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/icon_08.png", PACKAGE_DATA_DIR); elm_icon_file_set(icon, buf, NULL); - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); evas_object_move(obj, 160, 60); evas_object_resize(obj, 250, 100); diff --git a/src/examples/web_example.c b/src/examples/web_example.c index 3e75382..a98705b 100644 --- a/src/examples/web_example.c +++ b/src/examples/web_example.c @@ -405,7 +405,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED ic = elm_icon_add(ad->win); elm_icon_standard_set(ic, "arrow_up"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _search_prev_cb, ad); @@ -415,7 +415,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED ic = elm_icon_add(ad->win); elm_icon_standard_set(ic, "arrow_down"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _search_next_cb, ad); @@ -425,7 +425,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED ic = elm_icon_add(ad->win); elm_icon_standard_set(ic, "close"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _search_close_cb, ad); @@ -523,7 +523,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "arrow_left"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _nav_back_cb, ad); @@ -535,7 +535,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "refresh"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _nav_refresh_cb, ad); @@ -547,7 +547,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "arrow_right"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _nav_fwd_cb, ad); @@ -564,7 +564,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "file"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); evas_object_smart_callback_add(btn, "clicked", _add_tab_cb, ad); @@ -586,7 +586,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ic = elm_icon_add(win); elm_icon_standard_set(ic, "close"); - elm_object_content_part_set(btn, "icon", ic); + elm_object_part_content_set(btn, "icon", ic); pager = elm_pager_add(win); evas_object_size_hint_weight_set(pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index c76b934..f1f99ef 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -1076,12 +1076,38 @@ extern "C" { * @param content The new content of the object * * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_set instead. + * @ingroup General + */ + EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); + + /** + * Set a content of an object + * + * @param obj The Elementary object + * @param part The content part name to set (NULL for the default content) + * @param content The new content of the object + * + * @note Elementary objects may have many contents * * @ingroup General */ - EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); + EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content); + +#define elm_object_content_set(obj, content) elm_object_part_content_set((obj), NULL, (content)) -#define elm_object_content_set(obj, content) elm_object_content_part_set((obj), NULL, (content)) + /** + * Get a content of an object + * + * @param obj The Elementary object + * @param item The content part name to get (NULL for the default content) + * @return content of the object or NULL for any error + * + * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_get instead. + * @ingroup General + */ + EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); /** * Get a content of an object @@ -1094,9 +1120,21 @@ extern "C" { * * @ingroup General */ - EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); + EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part); + +#define elm_object_content_get(obj) elm_object_part_content_get((obj), NULL) -#define elm_object_content_get(obj) elm_object_content_part_get((obj), NULL) + /** + * Unset a content of an object + * + * @param obj The Elementary object + * @param item The content part name to unset (NULL for the default content) + * + * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_unset instead. + * @ingroup General + */ + EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); /** * Unset a content of an object @@ -1108,9 +1146,9 @@ extern "C" { * * @ingroup General */ - EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); + EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part); -#define elm_object_content_unset(obj) elm_object_content_part_unset((obj), NULL) +#define elm_object_content_unset(obj) elm_object_part_content_unset((obj), NULL) /** * Get the widget object's handle which contains a given item @@ -4677,7 +4715,7 @@ extern "C" { * deleted, even if you set the new one to NULL. If you want to keep that * old content object, use the elm_bg_overlay_unset() function. * - * @deprecated use elm_object_content_part_set() instead + * @deprecated use elm_object_part_content_set() instead * * @ingroup Bg */ @@ -4706,7 +4744,7 @@ extern "C" { * * Unparent and return the overlay object which was set for this widget * - * @deprecated use elm_object_content_part_unset() instead + * @deprecated use elm_object_part_content_unset() instead * * @ingroup Bg */ @@ -6345,7 +6383,7 @@ extern "C" { * * @param obj The button object * @param icon The icon object for the button - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. */ EAPI void elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); /** @@ -6358,7 +6396,7 @@ extern "C" { * @param obj The button object * @return The icon object that is being used * - * @deprecated use elm_object_content_part_get() instead + * @deprecated use elm_object_part_content_get() instead */ EAPI Evas_Object *elm_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** @@ -6371,7 +6409,7 @@ extern "C" { * * @param obj The button object * @return The icon object that was being used - * @deprecated use elm_object_content_part_unset() instead. + * @deprecated use elm_object_part_content_unset() instead. */ EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); /** @@ -9804,9 +9842,10 @@ extern "C" { * elm_layout_box_append(). * * @see elm_layout_box_append() - * @see elm_object_content_part_get() - * @see elm_object_content_part_unset() + * @see elm_object_part_content_get() + * @see elm_object_part_content_unset() * @see @ref secBox + * @deprecated use elm_object_part_content_set() instead * * @ingroup Layout */ @@ -9819,7 +9858,7 @@ extern "C" { * * @return The swallowed object or NULL if none or an error occurred * - * @see elm_object_content_part_set() + * @deprecated use elm_object_part_content_get() instead * * @ingroup Layout */ @@ -9833,7 +9872,7 @@ extern "C" { * * Unparent and return the content object which was set for this part. * - * @see elm_object_content_part_set() + * @deprecated use elm_object_part_content_unset() instead * * @ingroup Layout */ @@ -10072,7 +10111,7 @@ extern "C" { * @see elm_object_signal_callback_add() * @see elm_object_signal_emit() * @see elm_object_part_text_set() - * @see elm_object_content_part_set() + * @see elm_object_part_content_set() * @see elm_layout_box_append() * @see elm_layout_table_pack() * @see elm_layout_data_get() @@ -10237,7 +10276,7 @@ extern "C" { #define elm_layout_icon_set(_ly, _obj) \ do { \ const char *sig; \ - elm_object_content_part_set((_ly), "elm.swallow.icon", (_obj)); \ + elm_object_part_content_set((_ly), "elm.swallow.icon", (_obj)); \ if ((_obj)) sig = "elm,state,icon,visible"; \ else sig = "elm,state,icon,hidden"; \ elm_object_signal_emit((_ly), sig, "elm"); \ @@ -10251,7 +10290,7 @@ extern "C" { * @ingroup Layout */ #define elm_layout_icon_get(_ly) \ - elm_object_content_part_get((_ly), "elm.swallow.icon") + elm_object_part_content_get((_ly), "elm.swallow.icon") /** * @def elm_layout_end_set @@ -10263,7 +10302,7 @@ extern "C" { #define elm_layout_end_set(_ly, _obj) \ do { \ const char *sig; \ - elm_object_content_part_set((_ly), "elm.swallow.end", (_obj)); \ + elm_object_part_content_set((_ly), "elm.swallow.end", (_obj)); \ if ((_obj)) sig = "elm,state,end,visible"; \ else sig = "elm,state,end,hidden"; \ elm_object_signal_emit((_ly), sig, "elm"); \ @@ -10277,7 +10316,7 @@ extern "C" { * @ingroup Layout */ #define elm_layout_end_get(_ly) \ - elm_object_content_part_get((_ly), "elm.swallow.end") + elm_object_part_content_get((_ly), "elm.swallow.end") /** * @def elm_layout_label_set @@ -17315,7 +17354,7 @@ extern "C" { * it won't get properly displayed. * * @ingroup Slider - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. */ EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); @@ -17334,7 +17373,7 @@ extern "C" { * * @see elm_slider_icon_set() for more details * @see elm_slider_icon_get() - * @deprecated use elm_object_content_part_unset() instead. + * @deprecated use elm_object_part_content_unset() instead. * * @ingroup Slider */ @@ -17353,7 +17392,7 @@ extern "C" { * @see elm_slider_icon_set() for more details * @see elm_slider_icon_unset() * - * @deprecated use elm_object_content_part_get() instead. + * @deprecated use elm_object_part_content_get() instead. * * @ingroup Slider */ @@ -17375,7 +17414,7 @@ extern "C" { * @warning If the object being set does not have minimum size hints set, * it won't get properly displayed. * - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. * * @ingroup Slider */ @@ -17397,7 +17436,7 @@ extern "C" { * @see elm_slider_end_set() for more details. * @see elm_slider_end_get() * - * @deprecated use elm_object_content_part_unset() instead + * @deprecated use elm_object_part_content_unset() instead * instead. * * @ingroup Slider @@ -17418,7 +17457,7 @@ extern "C" { * @see elm_slider_end_unset() * * - * @deprecated use elm_object_content_part_get() instead + * @deprecated use elm_object_part_content_get() instead * instead. * * @ingroup Slider @@ -19727,7 +19766,7 @@ extern "C" { * If you want to keep that old content object, use the * elm_object_content_unset() function. * - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. * */ EINA_DEPRECATED EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); @@ -19737,7 +19776,7 @@ extern "C" { * @param obj The check object * @return The icon object * - * @deprecated use elm_object_content_part_get() instead. + * @deprecated use elm_object_part_content_get() instead. * */ EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -19749,7 +19788,7 @@ extern "C" { * * Unparent and return the icon object which was set for this widget. * - * @deprecated use elm_object_content_part_unset() instead. + * @deprecated use elm_object_part_content_unset() instead. * */ EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -19923,7 +19962,7 @@ extern "C" { * want to keep that old content object, use the elm_radio_icon_unset() * function. * - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. * */ EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); @@ -19935,7 +19974,7 @@ extern "C" { * * @see elm_radio_icon_set() * - * @deprecated use elm_object_content_part_get() instead. + * @deprecated use elm_object_part_content_get() instead. * */ EAPI Evas_Object *elm_radio_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -19948,7 +19987,7 @@ extern "C" { * Unparent and return the icon object which was set for this widget. * * @see elm_radio_icon_set() - * @deprecated use elm_object_content_part_unset() instead. + * @deprecated use elm_object_part_content_unset() instead. * */ EAPI Evas_Object *elm_radio_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -21174,7 +21213,7 @@ extern "C" { * elm_progressbar_icon_unset() function. * * @see elm_progressbar_icon_get() - * @deprecated use elm_object_content_part_set() instead. + * @deprecated use elm_object_part_content_set() instead. * * @ingroup Progressbar */ @@ -21188,7 +21227,7 @@ extern "C" { * otherwise (and on errors) * * @see elm_progressbar_icon_set() for more details - * @deprecated use elm_object_content_part_get() instead. + * @deprecated use elm_object_part_content_get() instead. * * @ingroup Progressbar */ @@ -21205,7 +21244,7 @@ extern "C" { * for this widget, previously, on success. * * @see elm_progressbar_icon_set() for more details - * @deprecated use elm_object_content_part_unset() instead. + * @deprecated use elm_object_part_content_unset() instead. * * @ingroup Progressbar */ @@ -23950,6 +23989,8 @@ extern "C" { * @see elm_panes_content_left_get() * @see elm_panes_content_right_set() to set content on the other side. * + * @deprecated use elm_object_part_content_set() instead + * * @ingroup Panes */ EINA_DEPRECATED EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); @@ -23970,6 +24011,8 @@ extern "C" { * @see elm_panes_content_right_get() * @see elm_panes_content_left_set() to set content on the other side. * + * @deprecated use elm_object_part_content_set() instead + * * @ingroup Panes */ EINA_DEPRECATED EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); @@ -23984,6 +24027,8 @@ extern "C" { * * @see elm_panes_content_left_set() for details. * + * @deprecated use elm_object_part_content_get() instead + * * @ingroup Panes */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -23998,6 +24043,8 @@ extern "C" { * * @see elm_panes_content_right_set() for details. * + * @deprecated use elm_object_part_content_get() instead + * * @ingroup Panes */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -24013,6 +24060,8 @@ extern "C" { * @see elm_panes_content_left_set() for details. * @see elm_panes_content_left_get(). * + * @deprecated use elm_object_part_content_unset() instead + * * @ingroup Panes */ EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -24029,6 +24078,8 @@ extern "C" { * @see elm_panes_content_right_set() for details. * @see elm_panes_content_right_get(). * + * @deprecated use elm_object_part_content_unset() instead + * * @ingroup Panes */ EAPI Evas_Object *elm_panes_content_right_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); @@ -28111,7 +28162,7 @@ extern "C" { * * This function inserts a new player widget on the canvas. * - * @see elm_object_content_part_set() + * @see elm_object_part_content_set() * * @ingroup Video */ @@ -28129,7 +28180,7 @@ extern "C" { * * @see elm_player_add() * @see elm_video_add() - * @deprecated use elm_object_content_part_set() instead + * @deprecated use elm_object_part_content_set() instead * * @ingroup Video */ diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index ac62492..7436196 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -832,7 +832,7 @@ elm_fileselector_add(Evas_Object *parent) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(parent); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up")); evas_object_size_hint_align_set(bt, 0.0, 0.0); @@ -847,7 +847,7 @@ elm_fileselector_add(Evas_Object *parent) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(parent); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home")); evas_object_size_hint_align_set(bt, 0.0, 0.0); diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index 10341e4..8abf0de 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -512,7 +512,7 @@ elm_fileselector_button_icon_set(Evas_Object *obj, evas_object_del(icon); return; } - elm_object_content_part_set(wd->btn, "icon", icon); + elm_object_part_content_set(wd->btn, "icon", icon); } EAPI Evas_Object * @@ -521,7 +521,7 @@ elm_fileselector_button_icon_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return elm_object_content_part_get(wd->btn, "icon"); + return elm_object_part_content_get(wd->btn, "icon"); } EAPI Evas_Object * @@ -530,6 +530,6 @@ elm_fileselector_button_icon_unset(Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return elm_object_content_part_unset(wd->btn, "icon"); + return elm_object_part_content_unset(wd->btn, "icon"); } diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index b4a7625..9c41fc3 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -206,7 +206,7 @@ _activate(Evas_Object *obj) elm_icon_file_set(ic, item->icon_file, item->icon_group); else if (item->icon_type == ELM_ICON_STANDARD) elm_icon_standard_set(ic, item->icon_file); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_show(ic); } evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); @@ -374,7 +374,7 @@ elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - elm_object_content_part_set(wd->btn, "icon", icon); + elm_object_part_content_set(wd->btn, "icon", icon); } EAPI Evas_Object * @@ -383,7 +383,7 @@ elm_hoversel_icon_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if ((!wd) || (!wd->btn)) return NULL; - return elm_object_content_part_get(wd->btn, "icon"); + return elm_object_part_content_get(wd->btn, "icon"); } EAPI Evas_Object * @@ -392,7 +392,7 @@ elm_hoversel_icon_unset(Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if ((!wd) || (!wd->btn)) return NULL; - return elm_object_content_part_unset(wd->btn, "icon"); + return elm_object_part_content_unset(wd->btn, "icon"); } EAPI void diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c index e249954..9d90e43 100644 --- a/src/lib/elc_player.c +++ b/src/lib/elc_player.c @@ -418,7 +418,7 @@ _player_button_add(Evas_Object *parent, Evas_Object *obj, Evas_Object *layout, c evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(parent); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); - elm_object_content_part_set(bt, "icon", ic); + elm_object_part_content_set(bt, "icon", ic); evas_object_size_hint_align_set(bt, 0.0, 0.0); elm_object_style_set(bt, "anchor"); evas_object_smart_callback_add(bt, "clicked", func, obj); diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index a7494a8..d7acc84 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -976,12 +976,27 @@ elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part) } EAPI void +elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content) +{ + EINA_SAFETY_ON_NULL_RETURN(obj); + elm_widget_content_part_set(obj, part, content); +} + +EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content) { EINA_SAFETY_ON_NULL_RETURN(obj); elm_widget_content_part_set(obj, part, content); } + +EAPI Evas_Object * +elm_object_part_content_get(const Evas_Object *obj, const char *part) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); + return elm_widget_content_part_get(obj, part); +} + EAPI Evas_Object * elm_object_content_part_get(const Evas_Object *obj, const char *part) { @@ -990,6 +1005,14 @@ elm_object_content_part_get(const Evas_Object *obj, const char *part) } EAPI Evas_Object * +elm_object_part_content_unset(Evas_Object *obj, const char *part) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); + return elm_widget_content_part_unset(obj, part); +} + + +EAPI Evas_Object * elm_object_content_part_unset(Evas_Object *obj, const char *part) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 49ba444..9d7acd5 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -2498,7 +2498,7 @@ _group_object_create(Marker_Group *group) group->obj = elm_layout_add(group->wd->obj); elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj)); - if (icon) elm_object_content_part_set(group->obj, "elm.icon", icon); + if (icon) elm_object_part_content_set(group->obj, "elm.icon", icon); evas_object_smart_member_add(group->obj, group->wd->pan_smart); elm_widget_sub_object_add(group->wd->obj, group->obj); diff --git a/src/lib/elm_toggle.c b/src/lib/elm_toggle.c index a802243..5cdd33c 100644 --- a/src/lib/elm_toggle.c +++ b/src/lib/elm_toggle.c @@ -28,19 +28,19 @@ elm_toggle_label_get(const Evas_Object *obj) EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon) { - elm_object_content_part_set(obj, "icon", icon); + elm_object_part_content_set(obj, "icon", icon); } EAPI Evas_Object * elm_toggle_icon_get(const Evas_Object *obj) { - return elm_object_content_part_get(obj, "icon"); + return elm_object_part_content_get(obj, "icon"); } EAPI Evas_Object * elm_toggle_icon_unset(Evas_Object *obj) { - return elm_object_content_part_unset(obj, "icon"); + return elm_object_part_content_unset(obj, "icon"); } EAPI void -- 2.7.4