diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c index ce21aeb..7a30977 100644 --- a/src/bin/test_anchorblock.c +++ b/src/bin/test_anchorblock.c @@ -181,7 +181,7 @@ TEST_START(test_anchorblock) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 3"); elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); - elm_bubble_icon_set(bb, ic); + 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); @@ -208,7 +208,7 @@ TEST_START(test_anchorblock) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 2"); elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); - elm_bubble_icon_set(bb, ic); + 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); @@ -245,7 +245,7 @@ TEST_START(test_anchorblock) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); - elm_bubble_icon_set(bb, ic); + 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_bubble.c b/src/bin/test_bubble.c index fad2520..284d4c6 100644 --- a/src/bin/test_bubble.c +++ b/src/bin/test_bubble.c @@ -121,7 +121,7 @@ TEST_START(test_bubble) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); elm_object_part_text_set(bb, "info", "Corner: bottom_right"); - elm_bubble_icon_set(bb, ic); + 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_ctxpopup.c b/src/bin/test_ctxpopup.c index 9757a4f..60543ee 100644 --- a/src/bin/test_ctxpopup.c +++ b/src/bin/test_ctxpopup.c @@ -36,7 +36,7 @@ static void _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { printf("ctxpopup item selected: %s\n", - elm_ctxpopup_item_label_get(event_info)); + elm_object_item_text_get(event_info)); } #define ITEM_NEW(_hov, _label, _icon) \ diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c index e61ed02..8661c7a 100644 --- a/src/bin/test_gengrid.c +++ b/src/bin/test_gengrid.c @@ -172,36 +172,36 @@ set_api_state(api_data *api) break; case GRID_BRING_IN: /* 1 */ - elm_gengrid_item_bring_in(elm_gen_first_item_get(grid)); + elm_gengrid_item_bring_in(elm_gengrid_first_item_get(grid)); break; case GRID_NO_SELECT_MODE: /* 2 */ - elm_gen_no_select_mode_set(grid, EINA_TRUE); + elm_gengrid_no_select_mode_set(grid, EINA_TRUE); break; case GRID_NO_BOUNCE: /* 3 */ - elm_gen_bounce_set(grid, EINA_TRUE, EINA_FALSE); + elm_gengrid_bounce_set(grid, EINA_TRUE, EINA_FALSE); break; case GRID_PAGE_RELATIVE: /* 4 */ - elm_gen_bounce_set(grid, EINA_TRUE, EINA_TRUE); - elm_gen_page_relative_set(grid, 0.5, 0.5); + elm_gengrid_bounce_set(grid, EINA_TRUE, EINA_TRUE); + elm_gengrid_page_relative_set(grid, 0.5, 0.5); break; case GRID_PAGE_SIZE: /* 5 */ - elm_gen_page_size_set(grid, 50, 25); + elm_gengrid_page_size_set(grid, 50, 25); break; case GRID_TOOLTIP_SET_TEXT: /* 6 */ { - Elm_Gengrid_Item *item = elm_gen_first_item_get(grid); + Elm_Gengrid_Item *item = elm_gengrid_first_item_get(grid); elm_gengrid_item_tooltip_text_set(item, "This is the first item"); } break; case GRID_TOOLTIP_UNSET: /* 7 */ { - Elm_Gengrid_Item *item = elm_gen_first_item_get(grid); + Elm_Gengrid_Item *item = elm_gengrid_first_item_get(grid); elm_gengrid_item_tooltip_unset(item); } break; @@ -288,7 +288,7 @@ TEST_START(test_gengrid) ti[i].path = eina_stringshare_add(buf); ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL); if (!(i % 5)) - elm_gen_item_selected_set(ti[i].item, EINA_TRUE); + elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); } evas_object_show(grid); @@ -527,7 +527,7 @@ TEST_START(test_gengrid3) else ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL); if (!(i % 5)) - elm_gen_item_selected_set(ti[i].item, EINA_TRUE); + elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); } evas_object_show(grid); diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index f48f702..891a437 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -126,21 +126,21 @@ set_api_state(api_data *api) break; case NO_SELECT_MODE_SET: /* 1 */ - elm_gen_no_select_mode_set(gl, EINA_TRUE); + elm_genlist_no_select_mode_set(gl, EINA_TRUE); elm_genlist_horizontal_set(gl, ELM_LIST_SCROLL); /* Back to default */ break; case COMPRESS_MODE_SET: /* 2 */ - elm_gen_no_select_mode_set(gl, EINA_FALSE); /* Back to default */ + elm_genlist_no_select_mode_set(gl, EINA_FALSE); /* Back to default */ elm_genlist_compress_mode_set(gl, EINA_TRUE); break; case BOUNCE_SET: /* 3 */ - elm_gen_bounce_set(gl, EINA_FALSE, EINA_FALSE); + elm_genlist_bounce_set(gl, EINA_FALSE, EINA_FALSE); break; case HOMOGENEOUS_SET: /* 4 */ - elm_gen_bounce_set(gl, EINA_TRUE, EINA_TRUE); /* Back to default */ + elm_genlist_bounce_set(gl, EINA_TRUE, EINA_TRUE); /* Back to default */ elm_genlist_homogeneous_set(gl, EINA_TRUE); break; @@ -151,13 +151,13 @@ set_api_state(api_data *api) case TOOLTIP_TEXT_SET: /* 6 */ { - elm_genlist_item_tooltip_text_set(elm_gen_first_item_get(gl), "Tooltip text from API"); - elm_genlist_item_bring_in(elm_gen_first_item_get(gl)); + elm_genlist_item_tooltip_text_set(elm_genlist_first_item_get(gl), "Tooltip text from API"); + elm_genlist_item_bring_in(elm_genlist_first_item_get(gl)); } break; case ITEM_CURSOR_SET: /* 7 */ - elm_genlist_item_cursor_set(elm_gen_first_item_get(gl), ELM_CURSOR_HAND2); + elm_genlist_item_cursor_set(elm_genlist_first_item_get(gl), ELM_CURSOR_HAND2); break; default: