From: discomfitor Date: Fri, 21 Oct 2011 23:10:56 +0000 (+0000) Subject: deprecate elm_genlist_item_selected_set and elm_gengrid_item_selected_set: use elm_ge... X-Git-Tag: REL_F_I9500_20120323_1~17^2~1536 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7b5f590da7bb2469abbfbd4e29b812dfa111d69;p=framework%2Fuifw%2Felementary.git deprecate elm_genlist_item_selected_set and elm_gengrid_item_selected_set: use elm_gen_item_selected_set instead git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64277 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c index e0987f7..ef539c7 100644 --- a/src/bin/test_cursor.c +++ b/src/bin/test_cursor.c @@ -275,7 +275,7 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf else elm_gengrid_item_cursor_set(ti[i].item, ELM_CURSOR_CLOCK); if (!(i % 5)) - elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); + elm_gen_item_selected_set(ti[i].item, EINA_TRUE); } elm_box_pack_end(bx, grid); evas_object_show(grid); diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c index a988da7..a3705a1 100644 --- a/src/bin/test_gengrid.c +++ b/src/bin/test_gengrid.c @@ -195,7 +195,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf 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_gengrid_item_selected_set(ti[i].item, EINA_TRUE); + elm_gen_item_selected_set(ti[i].item, EINA_TRUE); } evas_object_show(grid); @@ -443,7 +443,7 @@ test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in else ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL); if (!(i % 5)) - elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); + elm_gen_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 dad6770..7224fa7 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -287,7 +287,7 @@ my_gl_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED return; } elm_genlist_item_disabled_set(gli, 1); - elm_genlist_item_selected_set(gli, 0); + elm_gen_item_selected_set(gli, 0); elm_genlist_item_update(gli); } @@ -313,7 +313,7 @@ my_gl_first(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__ Elm_Genlist_Item *gli = elm_genlist_first_item_get(gl); if (!gli) return; elm_genlist_item_show(gli); - elm_genlist_item_selected_set(gli, 1); + elm_gen_item_selected_set(gli, 1); } static void @@ -323,7 +323,7 @@ my_gl_last(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) Elm_Genlist_Item *gli = elm_genlist_last_item_get(gl); if (!gli) return; elm_genlist_item_show(gli); - elm_genlist_item_selected_set(gli, 1); + elm_gen_item_selected_set(gli, 1); } static Eina_Bool diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 70c7e90..2210fcf 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -565,7 +565,7 @@ test_tooltip2(void *data __UNUSED__, else elm_gengrid_item_tooltip_text_set(ti[i].item, "Testing Y"); if (!(i % 5)) - elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); + elm_gen_item_selected_set(ti[i].item, EINA_TRUE); } elm_box_pack_end(bx, grid); diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 9fc9971..2d6b9bb 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -8939,7 +8939,7 @@ extern "C" { * * @ingroup Gengrid */ - EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); /** * Get whether a given gengrid item is selected or not @@ -18852,7 +18852,7 @@ extern "C" { * * @ingroup Genlist */ - EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected) EINA_ARG_NONNULL(1); /** * Get whether a given genlist item is selected or not * diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 4a3127b..d39ddda 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -351,7 +351,7 @@ _deselect_all_items(Widget_Data *wd) { if (!wd->selected) return EINA_FALSE; while (wd->selected) - elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE); + elm_gen_item_selected_set(wd->selected->data, EINA_FALSE); return EINA_TRUE; } @@ -365,13 +365,13 @@ _item_multi_select_left(Widget_Data *wd) if (!prev) return EINA_TRUE; if (elm_gengrid_item_selected_get(prev)) { - elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); + elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = prev; elm_gengrid_item_show(wd->last_selected_item); } else { - elm_gengrid_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_show(prev); } @@ -387,13 +387,13 @@ _item_multi_select_right(Widget_Data *wd) if (!next) return EINA_TRUE; if (elm_gengrid_item_selected_get(next)) { - elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); + elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = next; elm_gengrid_item_show(wd->last_selected_item); } else { - elm_gengrid_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_show(next); } @@ -440,7 +440,7 @@ _item_single_select_up(Widget_Data *wd) prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last); while ((prev) && (prev->delete_me)) prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); - elm_gengrid_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_show(prev); return EINA_TRUE; } @@ -457,7 +457,7 @@ _item_single_select_up(Widget_Data *wd) _deselect_all_items(wd); - elm_gengrid_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_show(prev); return EINA_TRUE; } @@ -474,7 +474,7 @@ _item_single_select_down(Widget_Data *wd) next = ELM_GEN_ITEM_FROM_INLIST(wd->items); while ((next) && (next->delete_me)) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); - elm_gengrid_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_show(next); return EINA_TRUE; } @@ -491,7 +491,7 @@ _item_single_select_down(Widget_Data *wd) _deselect_all_items(wd); - elm_gengrid_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_show(next); return EINA_TRUE; } @@ -512,7 +512,7 @@ _item_single_select_left(Widget_Data *wd) _deselect_all_items(wd); - elm_gengrid_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_gengrid_item_show(prev); return EINA_TRUE; } @@ -533,7 +533,7 @@ _item_single_select_right(Widget_Data *wd) _deselect_all_items(wd); - elm_gengrid_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_gengrid_item_show(next); return EINA_TRUE; } diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index afd2ff8..8f56c67 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -416,7 +416,7 @@ _deselect_all_items(Widget_Data *wd) { if (!wd->selected) return EINA_FALSE; while (wd->selected) - elm_genlist_item_selected_set(wd->selected->data, EINA_FALSE); + elm_gen_item_selected_set(wd->selected->data, EINA_FALSE); return EINA_TRUE; } @@ -432,13 +432,13 @@ _item_multi_select_up(Widget_Data *wd) if (elm_genlist_item_selected_get(prev)) { - elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE); + elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = prev; elm_genlist_item_show(wd->last_selected_item); } else { - elm_genlist_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_genlist_item_show(prev); } return EINA_TRUE; @@ -455,13 +455,13 @@ _item_multi_select_down(Widget_Data *wd) if (elm_genlist_item_selected_get(next)) { - elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE); + elm_gen_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = next; elm_genlist_item_show(wd->last_selected_item); } else { - elm_genlist_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_genlist_item_show(next); } return EINA_TRUE; @@ -483,7 +483,7 @@ _item_single_select_up(Widget_Data *wd) _deselect_all_items(wd); - elm_genlist_item_selected_set(prev, EINA_TRUE); + elm_gen_item_selected_set(prev, EINA_TRUE); elm_genlist_item_show(prev); return EINA_TRUE; } @@ -504,7 +504,7 @@ _item_single_select_down(Widget_Data *wd) _deselect_all_items(wd); - elm_genlist_item_selected_set(next, EINA_TRUE); + elm_gen_item_selected_set(next, EINA_TRUE); elm_genlist_item_show(next); return EINA_TRUE; } @@ -3934,7 +3934,7 @@ elm_genlist_item_disabled_set(Elm_Gen_Item *it, if (it->delete_me) return; it->disabled = !!disabled; if (it->selected) - elm_genlist_item_selected_set(it, EINA_FALSE); + elm_gen_item_selected_set(it, EINA_FALSE); if (it->realized) { if (it->disabled) @@ -4667,13 +4667,13 @@ elm_genlist_item_mode_set(Elm_Gen_Item *it, { EINA_LIST_FOREACH(wd->selected, l, it2) if (it2->realized) - elm_genlist_item_selected_set(it2, EINA_FALSE); + elm_gen_item_selected_set(it2, EINA_FALSE); } else { it2 = elm_genlist_selected_item_get(wd->obj); if ((it2) && (it2->realized)) - elm_genlist_item_selected_set(it2, EINA_FALSE); + elm_gen_item_selected_set(it2, EINA_FALSE); } if (((wd->mode_type) && (strcmp(mode_type, wd->mode_type))) ||