From eff11550fcb4c5b52c075e6f0e08ee0bea07bedf Mon Sep 17 00:00:00 2001 From: hermet Date: Fri, 27 Jan 2012 06:09:01 +0000 Subject: [PATCH] elementary/genlist - changed to use ssize_t type for the 16/32/64 bits compatibility. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@67560 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_cursor.c | 8 ++++---- src/bin/test_genlist.c | 31 ++++++++++++++++--------------- src/bin/test_tooltip.c | 8 ++++---- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c index 4a95400..0d26c5f 100644 --- a/src/bin/test_cursor.c +++ b/src/bin/test_cursor.c @@ -47,15 +47,15 @@ glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_genlist_item_genlist_get(glit); - int val = (int) elm_object_item_data_get(glit); + ssize_t val = (ssize_t) elm_object_item_data_get(glit); Elm_Object_Item *glit1, *glit2, *glit3; val *= 10; - glit1 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 1), glit, + glit1 = elm_genlist_item_append(gl, &itct, (void *) (val + 1), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 2), glit, + glit2 = elm_genlist_item_append(gl, &itct, (void *) (val + 2), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit3 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 3), glit, + glit3 = elm_genlist_item_append(gl, &itct, (void *) (val + 3), glit, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2); diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 0e0364c..b052011 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -273,7 +273,7 @@ my_gl_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) printf("no item selected\n"); return; } - elm_genlist_item_del(gli); + elm_object_item_del(gli); } static void @@ -1051,20 +1051,20 @@ gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_genlist_item_genlist_get(glit); - int val = (int) elm_object_item_data_get(glit); + ssize_t val = (ssize_t) elm_object_item_data_get(glit); val *= 10; elm_genlist_item_append(gl, &itc4, - (void *)(long)(val + 1)/* item data */, + (void *)(val + 1)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, &itc4, - (void *)(long)(val + 2)/* item data */, + (void *)(val + 2)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, &itc4, - (void *)(long)(val + 3)/* item data */, + (void *)(val + 3)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */, NULL/* func data */); @@ -1536,20 +1536,20 @@ gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_genlist_item_genlist_get(glit); - int val = (int) elm_object_item_data_get(glit); + ssize_t val = (ssize_t) elm_object_item_data_get(glit); val *= 10; elm_genlist_item_append(gl, &itc1, - (void *)(long)(val + 1)/* item data */, + (void *)(val + 1)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, &itc1, - (void *)(long)(val + 2)/* item data */, + (void *)(val + 2)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, &itc1, - (void *)(long)(val + 3)/* item data */, + (void *)(val + 3)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */, NULL/* func data */); @@ -1953,8 +1953,8 @@ static int gl13_cmp(const void *pa, const void *pb) { const Elm_Object_Item *ia = pa, *ib = pb; - int a = (int) elm_object_item_data_get(ia); - int b = (int) elm_object_item_data_get(ib); + int a = (ssize_t) elm_object_item_data_get(ia); + int b = (ssize_t) elm_object_item_data_get(ib); return a - b; } @@ -2103,12 +2103,13 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i { Elm_Object_Item *pi[6]; Evas_Object *win, *bg, *bx, *bx2, *bt, *gl; - int i, base; + int i; + ssize_t base; /* index: 0, 1, 2, 3, 4, 5 * items: 1, 15, 11, 2, 33, 21 * final: 1, 2, 11, 15, 21, 33 */ - const int idx[6] = {1, 15, 11, 2, 33, 21}; + const ssize_t idx[6] = {1, 15, 11, 2, 33, 21}; const int relative[6] = { 0, /* item '1' - not used */ 0, /* item '15' - insert after pi[0], item '1' */ @@ -2172,7 +2173,7 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i Elm_Object_Item *sub_glit[6]; int j; - base = 1000 * (long) elm_object_item_data_get(pi[i]); + base = 1000 * (ssize_t) elm_object_item_data_get(pi[i]); sub_glit[0] = elm_genlist_item_append (gl, &itc4, (void *)(idx[0] + base)/* item data */, pi[i]/* parent */, @@ -2211,7 +2212,7 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i Elm_Object_Item *sub_glit[6]; int j; - base = 1000 * (long) elm_object_item_data_get(pi[i]); + base = 1000 * (ssize_t) elm_object_item_data_get(pi[i]); sub_glit[0] = elm_genlist_item_append (gl, &itc4, (void *)(idx[0] + base)/* item data */, pi[i]/* parent */, diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 7fafdd4..9949c81 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -53,15 +53,15 @@ gltt_exp(void *data __UNUSED__, { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_genlist_item_genlist_get(glit); - int val = (int) elm_object_item_data_get(glit); + ssize_t val = (ssize_t) elm_object_item_data_get(glit); Elm_Object_Item *glit1, *glit2, *glit3; val *= 10; - glit1 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 1), glit, + glit1 = elm_genlist_item_append(gl, &itct, (void *)(val + 1), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 2), glit, + glit2 = elm_genlist_item_append(gl, &itct, (void *)(val + 2), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit3 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 3), glit, + glit3 = elm_genlist_item_append(gl, &itct, (void *)(val + 3), glit, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); elm_genlist_item_tooltip_text_set(glit1, "Testing A"); -- 2.7.4