summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-22 00:26:21 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-22 00:26:21 +0000
commit81fb2abd7e34a67957cb3e9f6c9929c1347e2650 (patch)
tree0d46b13bfda9cac8628b6190c5a9b46511d70038 /legacy
parent9987b1034f3867b118ce3efc5509b27750ebefba (diff)
deprecate all genlist/gengrid functions related to 64281
SVN revision: 64282
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/bin/test_cursor.c2
-rw-r--r--legacy/elementary/src/bin/test_genlist.c14
-rw-r--r--legacy/elementary/src/bin/test_tooltip.c2
-rw-r--r--legacy/elementary/src/edje_externals/elm_gengrid.c52
-rw-r--r--legacy/elementary/src/edje_externals/elm_genlist.c32
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in60
-rw-r--r--legacy/elementary/src/lib/elm_gen.c2
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c141
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c85
9 files changed, 128 insertions, 262 deletions
diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c
index ef539c7a05..f14b80c0a6 100644
--- a/legacy/elementary/src/bin/test_cursor.c
+++ b/legacy/elementary/src/bin/test_cursor.c
@@ -46,7 +46,7 @@ static void
46glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) 46glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
47{ 47{
48 Elm_Genlist_Item *it = event_info; 48 Elm_Genlist_Item *it = event_info;
49 Evas_Object *gl = elm_genlist_item_genlist_get(it); 49 Evas_Object *gl = elm_gen_item_widget_get(it);
50 int val = (int)(long)elm_genlist_item_data_get(it); 50 int val = (int)(long)elm_genlist_item_data_get(it);
51 Elm_Genlist_Item *it1, *it2, *it3; 51 Elm_Genlist_Item *it1, *it2, *it3;
52 52
diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c
index 7224fa7004..05e14a4025 100644
--- a/legacy/elementary/src/bin/test_genlist.c
+++ b/legacy/elementary/src/bin/test_genlist.c
@@ -296,13 +296,13 @@ my_gl_update_all(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
296{ 296{
297 Evas_Object *gl = data; 297 Evas_Object *gl = data;
298 int i = 0; 298 int i = 0;
299 Elm_Genlist_Item *it = elm_genlist_first_item_get(gl); 299 Elm_Genlist_Item *it = elm_gen_first_item_get(gl);
300 while (it) 300 while (it)
301 { 301 {
302 elm_genlist_item_update(it); 302 elm_genlist_item_update(it);
303 printf("%i\n", i); 303 printf("%i\n", i);
304 i++; 304 i++;
305 it = elm_genlist_item_next_get(it); 305 it = elm_gen_item_next_get(it);
306 } 306 }
307} 307}
308 308
@@ -310,7 +310,7 @@ static void
310my_gl_first(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 310my_gl_first(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
311{ 311{
312 Evas_Object *gl = data; 312 Evas_Object *gl = data;
313 Elm_Genlist_Item *gli = elm_genlist_first_item_get(gl); 313 Elm_Genlist_Item *gli = elm_gen_first_item_get(gl);
314 if (!gli) return; 314 if (!gli) return;
315 elm_genlist_item_show(gli); 315 elm_genlist_item_show(gli);
316 elm_gen_item_selected_set(gli, 1); 316 elm_gen_item_selected_set(gli, 1);
@@ -320,7 +320,7 @@ static void
320my_gl_last(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 320my_gl_last(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
321{ 321{
322 Evas_Object *gl = data; 322 Evas_Object *gl = data;
323 Elm_Genlist_Item *gli = elm_genlist_last_item_get(gl); 323 Elm_Genlist_Item *gli = elm_gen_last_item_get(gl);
324 if (!gli) return; 324 if (!gli) return;
325 elm_genlist_item_show(gli); 325 elm_genlist_item_show(gli);
326 elm_gen_item_selected_set(gli, 1); 326 elm_gen_item_selected_set(gli, 1);
@@ -943,7 +943,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
943 evas_object_show(bx); 943 evas_object_show(bx);
944 944
945 gl = elm_genlist_add(win); 945 gl = elm_genlist_add(win);
946 elm_genlist_always_select_mode_set(gl, 1); 946 elm_gen_always_select_mode_set(gl, 1);
947 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); 947 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
948 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 948 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
949 evas_object_show(gl); 949 evas_object_show(gl);
@@ -1036,7 +1036,7 @@ static void
1036gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) 1036gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
1037{ 1037{
1038 Elm_Genlist_Item *it = event_info; 1038 Elm_Genlist_Item *it = event_info;
1039 Evas_Object *gl = elm_genlist_item_genlist_get(it); 1039 Evas_Object *gl = elm_gen_item_widget_get(it);
1040 int val = (int)(long)elm_genlist_item_data_get(it); 1040 int val = (int)(long)elm_genlist_item_data_get(it);
1041 val *= 10; 1041 val *= 10;
1042 elm_genlist_item_append(gl, &itc4, 1042 elm_genlist_item_append(gl, &itc4,
@@ -1519,7 +1519,7 @@ static void
1519gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) 1519gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
1520{ 1520{
1521 Elm_Genlist_Item *it = event_info; 1521 Elm_Genlist_Item *it = event_info;
1522 Evas_Object *gl = elm_genlist_item_genlist_get(it); 1522 Evas_Object *gl = elm_gen_item_widget_get(it);
1523 int val = (int)(long)elm_genlist_item_data_get(it); 1523 int val = (int)(long)elm_genlist_item_data_get(it);
1524 val *= 10; 1524 val *= 10;
1525 elm_genlist_item_append(gl, &itc1, 1525 elm_genlist_item_append(gl, &itc1,
diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c
index 2210fcf3b7..dc1d8220e7 100644
--- a/legacy/elementary/src/bin/test_tooltip.c
+++ b/legacy/elementary/src/bin/test_tooltip.c
@@ -52,7 +52,7 @@ gltt_exp(void *data __UNUSED__,
52 void *event_info) 52 void *event_info)
53{ 53{
54 Elm_Genlist_Item *it = event_info; 54 Elm_Genlist_Item *it = event_info;
55 Evas_Object *gl = elm_genlist_item_genlist_get(it); 55 Evas_Object *gl = elm_gen_item_widget_get(it);
56 int val = (int)(long)elm_genlist_item_data_get(it); 56 int val = (int)(long)elm_genlist_item_data_get(it);
57 Elm_Genlist_Item *it1, *it2, *it3; 57 Elm_Genlist_Item *it1, *it2, *it3;
58 58
diff --git a/legacy/elementary/src/edje_externals/elm_gengrid.c b/legacy/elementary/src/edje_externals/elm_gengrid.c
index 6c3bf07017..61307406a1 100644
--- a/legacy/elementary/src/edje_externals/elm_gengrid.c
+++ b/legacy/elementary/src/edje_externals/elm_gengrid.c
@@ -43,32 +43,32 @@ external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
43 if (p->multi_exists) 43 if (p->multi_exists)
44 elm_gengrid_multi_select_set(obj, p->multi); 44 elm_gengrid_multi_select_set(obj, p->multi);
45 if (p->no_select_exists) 45 if (p->no_select_exists)
46 elm_gengrid_no_select_mode_set (obj, p->no_select); 46 elm_gen_no_select_mode_set (obj, p->no_select);
47 if (p->always_select_exists) 47 if (p->always_select_exists)
48 elm_gengrid_always_select_mode_set (obj, p->always_select); 48 elm_gen_always_select_mode_set (obj, p->always_select);
49 if (p->h_bounce_exists) 49 if (p->h_bounce_exists)
50 { 50 {
51 Eina_Bool h_bounce, v_bounce; 51 Eina_Bool h_bounce, v_bounce;
52 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 52 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
53 elm_gengrid_bounce_set(obj, p->h_bounce, v_bounce); 53 elm_gen_bounce_set(obj, p->h_bounce, v_bounce);
54 } 54 }
55 if (p->v_bounce_exists) 55 if (p->v_bounce_exists)
56 { 56 {
57 Eina_Bool h_bounce, v_bounce; 57 Eina_Bool h_bounce, v_bounce;
58 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 58 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
59 elm_gengrid_bounce_set(obj, h_bounce, p->v_bounce); 59 elm_gen_bounce_set(obj, h_bounce, p->v_bounce);
60 } 60 }
61 if (p->h_pagerel_exists) 61 if (p->h_pagerel_exists)
62 { 62 {
63 double h_pagerel, v_pagerel; 63 double h_pagerel, v_pagerel;
64 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 64 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
65 elm_gengrid_page_relative_set(obj, h_pagerel, p->v_pagerel); 65 elm_gen_page_relative_set(obj, h_pagerel, p->v_pagerel);
66 } 66 }
67 if (p->v_pagerel_exists) 67 if (p->v_pagerel_exists)
68 { 68 {
69 double h_pagerel, v_pagerel; 69 double h_pagerel, v_pagerel;
70 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 70 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
71 elm_gengrid_page_relative_set(obj, p->h_pagerel, v_pagerel); 71 elm_gen_page_relative_set(obj, p->h_pagerel, v_pagerel);
72 } 72 }
73 if (p->h_itemsize_exists) 73 if (p->h_itemsize_exists)
74 { 74 {
@@ -112,7 +112,7 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
112 { 112 {
113 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 113 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
114 { 114 {
115 elm_gengrid_no_select_mode_set(obj, param->i); 115 elm_gen_no_select_mode_set(obj, param->i);
116 return EINA_TRUE; 116 return EINA_TRUE;
117 } 117 }
118 } 118 }
@@ -120,7 +120,7 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
120 { 120 {
121 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 121 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
122 { 122 {
123 elm_gengrid_always_select_mode_set(obj, param->i); 123 elm_gen_always_select_mode_set(obj, param->i);
124 return EINA_TRUE; 124 return EINA_TRUE;
125 } 125 }
126 } 126 }
@@ -129,8 +129,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
129 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 129 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
130 { 130 {
131 Eina_Bool h_bounce, v_bounce; 131 Eina_Bool h_bounce, v_bounce;
132 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 132 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
133 elm_gengrid_bounce_set(obj, param->i, v_bounce); 133 elm_gen_bounce_set(obj, param->i, v_bounce);
134 return EINA_TRUE; 134 return EINA_TRUE;
135 } 135 }
136 } 136 }
@@ -139,8 +139,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
139 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 139 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
140 { 140 {
141 Eina_Bool h_bounce, v_bounce; 141 Eina_Bool h_bounce, v_bounce;
142 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 142 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
143 elm_gengrid_bounce_set(obj, h_bounce, param->i); 143 elm_gen_bounce_set(obj, h_bounce, param->i);
144 return EINA_TRUE; 144 return EINA_TRUE;
145 } 145 }
146 } 146 }
@@ -149,8 +149,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
149 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 149 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
150 { 150 {
151 double h_pagerel, v_pagerel; 151 double h_pagerel, v_pagerel;
152 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 152 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
153 elm_gengrid_page_relative_set(obj, param->d, v_pagerel); 153 elm_gen_page_relative_set(obj, param->d, v_pagerel);
154 return EINA_TRUE; 154 return EINA_TRUE;
155 } 155 }
156 } 156 }
@@ -159,8 +159,8 @@ external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
159 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 159 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
160 { 160 {
161 double h_pagerel, v_pagerel; 161 double h_pagerel, v_pagerel;
162 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 162 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
163 elm_gengrid_page_relative_set(obj, h_pagerel, param->d); 163 elm_gen_page_relative_set(obj, h_pagerel, param->d);
164 return EINA_TRUE; 164 return EINA_TRUE;
165 } 165 }
166 } 166 }
@@ -229,7 +229,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
229 { 229 {
230 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 230 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
231 { 231 {
232 param->i = elm_gengrid_no_select_mode_get(obj); 232 param->i = elm_gen_no_select_mode_get(obj);
233 return EINA_TRUE; 233 return EINA_TRUE;
234 } 234 }
235 } 235 }
@@ -237,7 +237,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
237 { 237 {
238 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 238 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
239 { 239 {
240 param->i = elm_gengrid_always_select_mode_get(obj); 240 param->i = elm_gen_always_select_mode_get(obj);
241 return EINA_TRUE; 241 return EINA_TRUE;
242 } 242 }
243 } 243 }
@@ -246,7 +246,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
246 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 246 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
247 { 247 {
248 Eina_Bool h_bounce, v_bounce; 248 Eina_Bool h_bounce, v_bounce;
249 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 249 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
250 param->i = h_bounce; 250 param->i = h_bounce;
251 return EINA_TRUE; 251 return EINA_TRUE;
252 } 252 }
@@ -256,7 +256,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
256 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 256 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
257 { 257 {
258 Eina_Bool h_bounce, v_bounce; 258 Eina_Bool h_bounce, v_bounce;
259 elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce); 259 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
260 param->i = v_bounce; 260 param->i = v_bounce;
261 return EINA_TRUE; 261 return EINA_TRUE;
262 } 262 }
@@ -266,7 +266,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
266 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 266 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
267 { 267 {
268 double h_pagerel, v_pagerel; 268 double h_pagerel, v_pagerel;
269 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 269 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
270 param->d = h_pagerel; 270 param->d = h_pagerel;
271 return EINA_TRUE; 271 return EINA_TRUE;
272 } 272 }
@@ -276,7 +276,7 @@ external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
276 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 276 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
277 { 277 {
278 double h_pagerel, v_pagerel; 278 double h_pagerel, v_pagerel;
279 elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel); 279 elm_gen_page_relative_get(obj, &h_pagerel, &v_pagerel);
280 param->d = v_pagerel; 280 param->d = v_pagerel;
281 return EINA_TRUE; 281 return EINA_TRUE;
282 } 282 }
diff --git a/legacy/elementary/src/edje_externals/elm_genlist.c b/legacy/elementary/src/edje_externals/elm_genlist.c
index 75fb90894d..e2f5e56930 100644
--- a/legacy/elementary/src/edje_externals/elm_genlist.c
+++ b/legacy/elementary/src/edje_externals/elm_genlist.c
@@ -58,24 +58,24 @@ external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
58 if (p->multi_exists) 58 if (p->multi_exists)
59 elm_genlist_multi_select_set(obj, p->multi); 59 elm_genlist_multi_select_set(obj, p->multi);
60 if (p->always_select_exists) 60 if (p->always_select_exists)
61 elm_genlist_always_select_mode_set(obj, p->always_select); 61 elm_gen_always_select_mode_set(obj, p->always_select);
62 if (p->no_select_exists) 62 if (p->no_select_exists)
63 elm_genlist_no_select_mode_set(obj, p->no_select); 63 elm_gen_no_select_mode_set(obj, p->no_select);
64 if (p->compress_exists) 64 if (p->compress_exists)
65 elm_genlist_compress_mode_set(obj, p->compress); 65 elm_genlist_compress_mode_set(obj, p->compress);
66 if (p->homogeneous_exists) 66 if (p->homogeneous_exists)
67 elm_genlist_homogeneous_set(obj, p->homogeneous); 67 elm_genlist_homogeneous_set(obj, p->homogeneous);
68 if ((p->h_bounce_exists) && (p->v_bounce_exists)) 68 if ((p->h_bounce_exists) && (p->v_bounce_exists))
69 elm_genlist_bounce_set(obj, p->h_bounce, p->v_bounce); 69 elm_gen_bounce_set(obj, p->h_bounce, p->v_bounce);
70 else if ((p->h_bounce_exists) || (p->v_bounce_exists)) 70 else if ((p->h_bounce_exists) || (p->v_bounce_exists))
71 { 71 {
72 Eina_Bool h_bounce, v_bounce; 72 Eina_Bool h_bounce, v_bounce;
73 73
74 elm_genlist_bounce_get(obj, &h_bounce, &v_bounce); 74 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
75 if (p->h_bounce_exists) 75 if (p->h_bounce_exists)
76 elm_genlist_bounce_set(obj, p->h_bounce, v_bounce); 76 elm_gen_bounce_set(obj, p->h_bounce, v_bounce);
77 else 77 else
78 elm_genlist_bounce_set(obj, h_bounce, p->v_bounce); 78 elm_gen_bounce_set(obj, h_bounce, p->v_bounce);
79 } 79 }
80} 80}
81 81
@@ -105,7 +105,7 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
105 { 105 {
106 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 106 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
107 { 107 {
108 elm_genlist_always_select_mode_set(obj, param->i); 108 elm_gen_always_select_mode_set(obj, param->i);
109 return EINA_TRUE; 109 return EINA_TRUE;
110 } 110 }
111 } 111 }
@@ -113,7 +113,7 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
113 { 113 {
114 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 114 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
115 { 115 {
116 elm_genlist_no_select_mode_set(obj, param->i); 116 elm_gen_no_select_mode_set(obj, param->i);
117 return EINA_TRUE; 117 return EINA_TRUE;
118 } 118 }
119 } 119 }
@@ -138,8 +138,8 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
138 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 138 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
139 { 139 {
140 Eina_Bool h_bounce, v_bounce; 140 Eina_Bool h_bounce, v_bounce;
141 elm_genlist_bounce_get(obj, &h_bounce, &v_bounce); 141 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
142 elm_genlist_bounce_set(obj, param->i, v_bounce); 142 elm_gen_bounce_set(obj, param->i, v_bounce);
143 return EINA_TRUE; 143 return EINA_TRUE;
144 } 144 }
145 } 145 }
@@ -148,8 +148,8 @@ external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
148 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 148 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
149 { 149 {
150 Eina_Bool h_bounce, v_bounce; 150 Eina_Bool h_bounce, v_bounce;
151 elm_genlist_bounce_get(obj, &h_bounce, &v_bounce); 151 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
152 elm_genlist_bounce_set(obj, h_bounce, param->i); 152 elm_gen_bounce_set(obj, h_bounce, param->i);
153 return EINA_TRUE; 153 return EINA_TRUE;
154 } 154 }
155 } 155 }
@@ -188,7 +188,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
188 { 188 {
189 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 189 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
190 { 190 {
191 param->i = elm_genlist_always_select_mode_get(obj); 191 param->i = elm_gen_always_select_mode_get(obj);
192 return EINA_TRUE; 192 return EINA_TRUE;
193 } 193 }
194 } 194 }
@@ -196,7 +196,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
196 { 196 {
197 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 197 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
198 { 198 {
199 param->i = elm_genlist_no_select_mode_get(obj); 199 param->i = elm_gen_no_select_mode_get(obj);
200 return EINA_TRUE; 200 return EINA_TRUE;
201 } 201 }
202 } 202 }
@@ -221,7 +221,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
221 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 221 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
222 { 222 {
223 Eina_Bool h_bounce, v_bounce; 223 Eina_Bool h_bounce, v_bounce;
224 elm_genlist_bounce_get(obj, &h_bounce, &v_bounce); 224 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
225 param->i = h_bounce; 225 param->i = h_bounce;
226 return EINA_TRUE; 226 return EINA_TRUE;
227 } 227 }
@@ -231,7 +231,7 @@ external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
231 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 231 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
232 { 232 {
233 Eina_Bool h_bounce, v_bounce; 233 Eina_Bool h_bounce, v_bounce;
234 elm_genlist_bounce_get(obj, &h_bounce, &v_bounce); 234 elm_gen_bounce_get(obj, &h_bounce, &v_bounce);
235 param->i = v_bounce; 235 param->i = v_bounce;
236 return EINA_TRUE; 236 return EINA_TRUE;
237 } 237 }
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index fc80c3cde5..b8f0016c71 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -7940,7 +7940,7 @@ extern "C" {
7940 EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj); 7940 EAPI Elm_Gen_Item *elm_gen_last_item_get(const Evas_Object *obj);
7941 EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it); 7941 EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it);
7942 EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it); 7942 EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it);
7943 EAPI Evas_Object *elm_gen_item_gen_get(const Elm_Gen_Item *it); 7943 EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it);
7944 7944
7945 /** 7945 /**
7946 * @defgroup Gengrid Gengrid (Generic grid) 7946 * @defgroup Gengrid Gengrid (Generic grid)
@@ -8463,7 +8463,7 @@ extern "C" {
8463 * 8463 *
8464 * @ingroup Gengrid 8464 * @ingroup Gengrid
8465 */ 8465 */
8466 EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1); 8466 EINA_DEPRECATED EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1);
8467 8467
8468 /** 8468 /**
8469 * Get whether items on a given gengrid widget have their selection 8469 * Get whether items on a given gengrid widget have their selection
@@ -8478,7 +8478,7 @@ extern "C" {
8478 * 8478 *
8479 * @ingroup Gengrid 8479 * @ingroup Gengrid
8480 */ 8480 */
8481 EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 8481 EINA_DEPRECATED EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
8482 8482
8483 /** 8483 /**
8484 * Set whether items on a given gengrid widget can be selected or not. 8484 * Set whether items on a given gengrid widget can be selected or not.
@@ -8496,7 +8496,7 @@ extern "C" {
8496 * 8496 *
8497 * @ingroup Gengrid 8497 * @ingroup Gengrid
8498 */ 8498 */
8499 EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1); 8499 EINA_DEPRECATED EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1);
8500 8500
8501 /** 8501 /**
8502 * Get whether items on a given gengrid widget can be selected or 8502 * Get whether items on a given gengrid widget can be selected or
@@ -8510,7 +8510,7 @@ extern "C" {
8510 * 8510 *
8511 * @ingroup Gengrid 8511 * @ingroup Gengrid
8512 */ 8512 */
8513 EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 8513 EINA_DEPRECATED EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
8514 8514
8515 /** 8515 /**
8516 * Enable or disable multi-selection in a given gengrid widget 8516 * Enable or disable multi-selection in a given gengrid widget
@@ -8568,7 +8568,7 @@ extern "C" {
8568 * 8568 *
8569 * @ingroup Gengrid 8569 * @ingroup Gengrid
8570 */ 8570 */
8571 EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1); 8571 EINA_DEPRECATED EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1);
8572 8572
8573 /** 8573 /**
8574 * Get whether bouncing effects are enabled or disabled, for a 8574 * Get whether bouncing effects are enabled or disabled, for a
@@ -8584,7 +8584,7 @@ extern "C" {
8584 * 8584 *
8585 * @ingroup Gengrid 8585 * @ingroup Gengrid
8586 */ 8586 */
8587 EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1); 8587 EINA_DEPRECATED EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1);
8588 8588
8589 /** 8589 /**
8590 * Set a given gengrid widget's scrolling page size, relative to 8590 * Set a given gengrid widget's scrolling page size, relative to
@@ -8618,7 +8618,7 @@ extern "C" {
8618 * 8618 *
8619 * @ingroup Gengrid 8619 * @ingroup Gengrid
8620 */ 8620 */
8621 EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel) EINA_ARG_NONNULL(1); 8621 EINA_DEPRECATED EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel) EINA_ARG_NONNULL(1);
8622 8622
8623 /** 8623 /**
8624 * Get a given gengrid widget's scrolling page size, relative to 8624 * Get a given gengrid widget's scrolling page size, relative to
@@ -8634,7 +8634,7 @@ extern "C" {
8634 * 8634 *
8635 * @ingroup Gengrid 8635 * @ingroup Gengrid
8636 */ 8636 */
8637 EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) EINA_ARG_NONNULL(1); 8637 EINA_DEPRECATED EAPI void elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) EINA_ARG_NONNULL(1);
8638 8638
8639 /** 8639 /**
8640 * Set a given gengrid widget's scrolling page size 8640 * Set a given gengrid widget's scrolling page size
@@ -8662,7 +8662,7 @@ extern "C" {
8662 * 8662 *
8663 * @ingroup Gengrid 8663 * @ingroup Gengrid
8664 */ 8664 */
8665 EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) EINA_ARG_NONNULL(1); 8665 EINA_DEPRECATED EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) EINA_ARG_NONNULL(1);
8666 8666
8667 /** 8667 /**
8668 * @brief Get gengrid current page number. 8668 * @brief Get gengrid current page number.
@@ -8680,7 +8680,7 @@ extern "C" {
8680 * @see elm_gengrid_page_show() 8680 * @see elm_gengrid_page_show()
8681 * @see elm_gengrid_page_brint_in() 8681 * @see elm_gengrid_page_brint_in()
8682 */ 8682 */
8683 EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1); 8683 EINA_DEPRECATED EAPI void elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1);
8684 8684
8685 /** 8685 /**
8686 * @brief Get scroll last page number. 8686 * @brief Get scroll last page number.
@@ -8696,7 +8696,7 @@ extern "C" {
8696 * @see elm_gengrid_page_show() 8696 * @see elm_gengrid_page_show()
8697 * @see elm_gengrid_page_brint_in() 8697 * @see elm_gengrid_page_brint_in()
8698 */ 8698 */
8699 EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1); 8699 EINA_DEPRECATED EAPI void elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) EINA_ARG_NONNULL(1);
8700 8700
8701 /** 8701 /**
8702 * Show a specific virtual region within the gengrid content object by page number. 8702 * Show a specific virtual region within the gengrid content object by page number.
@@ -8720,7 +8720,7 @@ extern "C" {
8720 * 8720 *
8721 * @see elm_gengrid_page_bring_in() 8721 * @see elm_gengrid_page_bring_in()
8722 */ 8722 */
8723 EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1); 8723 EINA_DEPRECATED EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1);
8724 8724
8725 /** 8725 /**
8726 * Show a specific virtual region within the gengrid content object by page number. 8726 * Show a specific virtual region within the gengrid content object by page number.
@@ -8744,7 +8744,7 @@ extern "C" {
8744 * 8744 *
8745 * @see elm_gengrid_page_show() 8745 * @see elm_gengrid_page_show()
8746 */ 8746 */
8747 EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1); 8747 EINA_DEPRECATED EAPI void elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) EINA_ARG_NONNULL(1);
8748 8748
8749 /** 8749 /**
8750 * Set for what direction a given gengrid widget will expand while 8750 * Set for what direction a given gengrid widget will expand while
@@ -8796,7 +8796,7 @@ extern "C" {
8796 * 8796 *
8797 * @ingroup Gengrid 8797 * @ingroup Gengrid
8798 */ 8798 */
8799 EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 8799 EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
8800 8800
8801 /** 8801 /**
8802 * Get the last item in a given gengrid widget 8802 * Get the last item in a given gengrid widget
@@ -8812,7 +8812,7 @@ extern "C" {
8812 * 8812 *
8813 * @ingroup Gengrid 8813 * @ingroup Gengrid
8814 */ 8814 */
8815 EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 8815 EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
8816 8816
8817 /** 8817 /**
8818 * Get the @b next item in a gengrid widget's internal list of items, 8818 * Get the @b next item in a gengrid widget's internal list of items,
@@ -8829,7 +8829,7 @@ extern "C" {
8829 * 8829 *
8830 * @ingroup Gengrid 8830 * @ingroup Gengrid
8831 */ 8831 */
8832 EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); 8832 EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
8833 8833
8834 /** 8834 /**
8835 * Get the @b previous item in a gengrid widget's internal list of items, 8835 * Get the @b previous item in a gengrid widget's internal list of items,
@@ -8846,7 +8846,7 @@ extern "C" {
8846 * 8846 *
8847 * @ingroup Gengrid 8847 * @ingroup Gengrid
8848 */ 8848 */
8849 EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); 8849 EINA_DEPRECATED EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
8850 8850
8851 /** 8851 /**
8852 * Get the gengrid object's handle which contains a given gengrid 8852 * Get the gengrid object's handle which contains a given gengrid
@@ -8859,7 +8859,7 @@ extern "C" {
8859 * 8859 *
8860 * @ingroup Gengrid 8860 * @ingroup Gengrid
8861 */ 8861 */
8862 EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1); 8862 EINA_DEPRECATED EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item) EINA_ARG_NONNULL(1);
8863 8863
8864 /** 8864 /**
8865 * Remove a gengrid item from the its parent, deleting it. 8865 * Remove a gengrid item from the its parent, deleting it.
@@ -18289,7 +18289,7 @@ extern "C" {
18289 * 18289 *
18290 * @ingroup Genlist 18290 * @ingroup Genlist
18291 */ 18291 */
18292 EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1); 18292 EINA_DEPRECATED EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) EINA_ARG_NONNULL(1);
18293 /** 18293 /**
18294 * Get the always select mode. 18294 * Get the always select mode.
18295 * 18295 *
@@ -18301,7 +18301,7 @@ extern "C" {
18301 * 18301 *
18302 * @ingroup Genlist 18302 * @ingroup Genlist
18303 */ 18303 */
18304 EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 18304 EINA_DEPRECATED EAPI Eina_Bool elm_genlist_always_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
18305 /** 18305 /**
18306 * Enable/disable the no select mode. 18306 * Enable/disable the no select mode.
18307 * 18307 *
@@ -18316,7 +18316,7 @@ extern "C" {
18316 * 18316 *
18317 * @ingroup Genlist 18317 * @ingroup Genlist
18318 */ 18318 */
18319 EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1); 18319 EINA_DEPRECATED EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) EINA_ARG_NONNULL(1);
18320 /** 18320 /**
18321 * Gets whether the no select mode is enabled. 18321 * Gets whether the no select mode is enabled.
18322 * 18322 *
@@ -18328,7 +18328,7 @@ extern "C" {
18328 * 18328 *
18329 * @ingroup Genlist 18329 * @ingroup Genlist
18330 */ 18330 */
18331 EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 18331 EINA_DEPRECATED EAPI Eina_Bool elm_genlist_no_select_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
18332 /** 18332 /**
18333 * Enable/disable compress mode. 18333 * Enable/disable compress mode.
18334 * 18334 *
@@ -18410,7 +18410,7 @@ extern "C" {
18410 * 18410 *
18411 * @ingroup Genlist 18411 * @ingroup Genlist
18412 */ 18412 */
18413 EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1); 18413 EINA_DEPRECATED EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) EINA_ARG_NONNULL(1);
18414 /** 18414 /**
18415 * Get whether the horizontal and vertical bouncing effect is enabled. 18415 * Get whether the horizontal and vertical bouncing effect is enabled.
18416 * 18416 *
@@ -18424,7 +18424,7 @@ extern "C" {
18424 * 18424 *
18425 * @ingroup Genlist 18425 * @ingroup Genlist
18426 */ 18426 */
18427 EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1); 18427 EINA_DEPRECATED EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1);
18428 /** 18428 /**
18429 * Enable/disable homogenous mode. 18429 * Enable/disable homogenous mode.
18430 * 18430 *
@@ -18742,7 +18742,7 @@ extern "C" {
18742 * 18742 *
18743 * @ingroup Genlist 18743 * @ingroup Genlist
18744 */ 18744 */
18745 EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 18745 EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
18746 /** 18746 /**
18747 * Get the last item in the genlist 18747 * Get the last item in the genlist
18748 * 18748 *
@@ -18752,7 +18752,7 @@ extern "C" {
18752 * 18752 *
18753 * @ingroup Genlist 18753 * @ingroup Genlist
18754 */ 18754 */
18755 EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); 18755 EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
18756 /** 18756 /**
18757 * Set the scrollbar policy 18757 * Set the scrollbar policy
18758 * 18758 *
@@ -18800,7 +18800,7 @@ extern "C" {
18800 * 18800 *
18801 * @ingroup Genlist 18801 * @ingroup Genlist
18802 */ 18802 */
18803 EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); 18803 EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
18804 /** 18804 /**
18805 * Get the @b previous item in a genlist widget's internal list of items, 18805 * Get the @b previous item in a genlist widget's internal list of items,
18806 * given a handle to one of those items. 18806 * given a handle to one of those items.
@@ -18816,7 +18816,7 @@ extern "C" {
18816 * 18816 *
18817 * @ingroup Genlist 18817 * @ingroup Genlist
18818 */ 18818 */
18819 EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); 18819 EINA_DEPRECATED EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
18820 /** 18820 /**
18821 * Get the genlist object's handle which contains a given genlist 18821 * Get the genlist object's handle which contains a given genlist
18822 * item 18822 * item
@@ -18828,7 +18828,7 @@ extern "C" {
18828 * 18828 *
18829 * @ingroup Genlist 18829 * @ingroup Genlist
18830 */ 18830 */
18831 EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1); 18831 EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
18832 /** 18832 /**
18833 * Get the parent item of the given item 18833 * Get the parent item of the given item
18834 * 18834 *
diff --git a/legacy/elementary/src/lib/elm_gen.c b/legacy/elementary/src/lib/elm_gen.c
index e5858184f5..0d66974ddb 100644
--- a/legacy/elementary/src/lib/elm_gen.c
+++ b/legacy/elementary/src/lib/elm_gen.c
@@ -724,7 +724,7 @@ elm_gen_item_prev_get(const Elm_Gen_Item *it)
724} 724}
725 725
726EAPI Evas_Object * 726EAPI Evas_Object *
727elm_gen_item_gen_get(const Elm_Gen_Item *it) 727elm_gen_item_widget_get(const Elm_Gen_Item *it)
728{ 728{
729 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 729 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
730 return WIDGET(it); 730 return WIDGET(it);
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 04a4e7145e..b189b5d9d5 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -280,14 +280,14 @@ _event_hook(Evas_Object *obj,
280 } 280 }
281 else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) 281 else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
282 { 282 {
283 it = elm_gengrid_first_item_get(obj); 283 it = elm_gen_first_item_get(obj);
284 elm_gengrid_item_bring_in(it); 284 elm_gengrid_item_bring_in(it);
285 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 285 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
286 return EINA_TRUE; 286 return EINA_TRUE;
287 } 287 }
288 else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) 288 else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
289 { 289 {
290 it = elm_gengrid_last_item_get(obj); 290 it = elm_gen_last_item_get(obj);
291 elm_gengrid_item_bring_in(it); 291 elm_gengrid_item_bring_in(it);
292 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 292 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
293 return EINA_TRUE; 293 return EINA_TRUE;
@@ -361,7 +361,7 @@ _item_multi_select_left(Widget_Data *wd)
361{ 361{
362 if (!wd->selected) return EINA_FALSE; 362 if (!wd->selected) return EINA_FALSE;
363 363
364 Elm_Gen_Item *prev = elm_gengrid_item_prev_get(wd->last_selected_item); 364 Elm_Gen_Item *prev = elm_gen_item_prev_get(wd->last_selected_item);
365 if (!prev) return EINA_TRUE; 365 if (!prev) return EINA_TRUE;
366 if (elm_gen_item_selected_get(prev)) 366 if (elm_gen_item_selected_get(prev))
367 { 367 {
@@ -383,7 +383,7 @@ _item_multi_select_right(Widget_Data *wd)
383{ 383{
384 if (!wd->selected) return EINA_FALSE; 384 if (!wd->selected) return EINA_FALSE;
385 385
386 Elm_Gen_Item *next = elm_gengrid_item_next_get(wd->last_selected_item); 386 Elm_Gen_Item *next = elm_gen_item_next_get(wd->last_selected_item);
387 if (!next) return EINA_TRUE; 387 if (!next) return EINA_TRUE;
388 if (elm_gen_item_selected_get(next)) 388 if (elm_gen_item_selected_get(next))
389 { 389 {
@@ -444,13 +444,13 @@ _item_single_select_up(Widget_Data *wd)
444 elm_gengrid_item_show(prev); 444 elm_gengrid_item_show(prev);
445 return EINA_TRUE; 445 return EINA_TRUE;
446 } 446 }
447 else prev = elm_gengrid_item_prev_get(wd->last_selected_item); 447 else prev = elm_gen_item_prev_get(wd->last_selected_item);
448 448
449 if (!prev) return EINA_FALSE; 449 if (!prev) return EINA_FALSE;
450 450
451 for (i = 1; i < wd->nmax; i++) 451 for (i = 1; i < wd->nmax; i++)
452 { 452 {
453 Elm_Gen_Item *tmp = elm_gengrid_item_prev_get(prev); 453 Elm_Gen_Item *tmp = elm_gen_item_prev_get(prev);
454 if (!tmp) return EINA_FALSE; 454 if (!tmp) return EINA_FALSE;
455 prev = tmp; 455 prev = tmp;
456 } 456 }
@@ -478,13 +478,13 @@ _item_single_select_down(Widget_Data *wd)
478 elm_gengrid_item_show(next); 478 elm_gengrid_item_show(next);
479 return EINA_TRUE; 479 return EINA_TRUE;
480 } 480 }
481 else next = elm_gengrid_item_next_get(wd->last_selected_item); 481 else next = elm_gen_item_next_get(wd->last_selected_item);
482 482
483 if (!next) return EINA_FALSE; 483 if (!next) return EINA_FALSE;
484 484
485 for (i = 1; i < wd->nmax; i++) 485 for (i = 1; i < wd->nmax; i++)
486 { 486 {
487 Elm_Gen_Item *tmp = elm_gengrid_item_next_get(next); 487 Elm_Gen_Item *tmp = elm_gen_item_next_get(next);
488 if (!tmp) return EINA_FALSE; 488 if (!tmp) return EINA_FALSE;
489 next = tmp; 489 next = tmp;
490 } 490 }
@@ -506,7 +506,7 @@ _item_single_select_left(Widget_Data *wd)
506 while ((prev) && (prev->delete_me)) 506 while ((prev) && (prev->delete_me))
507 prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); 507 prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
508 } 508 }
509 else prev = elm_gengrid_item_prev_get(wd->last_selected_item); 509 else prev = elm_gen_item_prev_get(wd->last_selected_item);
510 510
511 if (!prev) return EINA_FALSE; 511 if (!prev) return EINA_FALSE;
512 512
@@ -527,7 +527,7 @@ _item_single_select_right(Widget_Data *wd)
527 while ((next) && (next->delete_me)) 527 while ((next) && (next->delete_me))
528 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); 528 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
529 } 529 }
530 else next = elm_gengrid_item_next_get(wd->last_selected_item); 530 else next = elm_gen_item_next_get(wd->last_selected_item);
531 531
532 if (!next) return EINA_FALSE; 532 if (!next) return EINA_FALSE;
533 533
@@ -2558,38 +2558,26 @@ EAPI void
2558elm_gengrid_always_select_mode_set(Evas_Object *obj, 2558elm_gengrid_always_select_mode_set(Evas_Object *obj,
2559 Eina_Bool always_select) 2559 Eina_Bool always_select)
2560{ 2560{
2561 ELM_CHECK_WIDTYPE(obj, widtype); 2561 elm_gen_always_select_mode_set(obj, always_select);
2562 Widget_Data *wd = elm_widget_data_get(obj);
2563 if (!wd) return;
2564 wd->always_select = always_select;
2565} 2562}
2566 2563
2567EAPI Eina_Bool 2564EAPI Eina_Bool
2568elm_gengrid_always_select_mode_get(const Evas_Object *obj) 2565elm_gengrid_always_select_mode_get(const Evas_Object *obj)
2569{ 2566{
2570 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 2567 return elm_gen_always_select_mode_get(obj);
2571 Widget_Data *wd = elm_widget_data_get(obj);
2572 if (!wd) return EINA_FALSE;
2573 return wd->always_select;
2574} 2568}
2575 2569
2576EAPI void 2570EAPI void
2577elm_gengrid_no_select_mode_set(Evas_Object *obj, 2571elm_gengrid_no_select_mode_set(Evas_Object *obj,
2578 Eina_Bool no_select) 2572 Eina_Bool no_select)
2579{ 2573{
2580 ELM_CHECK_WIDTYPE(obj, widtype); 2574 elm_gen_no_select_mode_set(obj, no_select);
2581 Widget_Data *wd = elm_widget_data_get(obj);
2582 if (!wd) return;
2583 wd->no_select = no_select;
2584} 2575}
2585 2576
2586EAPI Eina_Bool 2577EAPI Eina_Bool
2587elm_gengrid_no_select_mode_get(const Evas_Object *obj) 2578elm_gengrid_no_select_mode_get(const Evas_Object *obj)
2588{ 2579{
2589 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 2580 return elm_gen_no_select_mode_get(obj);
2590 Widget_Data *wd = elm_widget_data_get(obj);
2591 if (!wd) return EINA_FALSE;
2592 return wd->no_select;
2593} 2581}
2594 2582
2595EAPI void 2583EAPI void
@@ -2597,12 +2585,7 @@ elm_gengrid_bounce_set(Evas_Object *obj,
2597 Eina_Bool h_bounce, 2585 Eina_Bool h_bounce,
2598 Eina_Bool v_bounce) 2586 Eina_Bool v_bounce)
2599{ 2587{
2600 ELM_CHECK_WIDTYPE(obj, widtype); 2588 elm_gen_bounce_set(obj, h_bounce, v_bounce);
2601 Widget_Data *wd = elm_widget_data_get(obj);
2602 if (!wd) return;
2603 elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
2604 wd->h_bounce = h_bounce;
2605 wd->v_bounce = v_bounce;
2606} 2589}
2607 2590
2608EAPI void 2591EAPI void
@@ -2610,11 +2593,7 @@ elm_gengrid_bounce_get(const Evas_Object *obj,
2610 Eina_Bool *h_bounce, 2593 Eina_Bool *h_bounce,
2611 Eina_Bool *v_bounce) 2594 Eina_Bool *v_bounce)
2612{ 2595{
2613 ELM_CHECK_WIDTYPE(obj, widtype); 2596 return elm_gen_bounce_get(obj, h_bounce, v_bounce);
2614 Widget_Data *wd = elm_widget_data_get(obj);
2615 if (!wd) return;
2616 if (h_bounce) *h_bounce = wd->h_bounce;
2617 if (v_bounce) *v_bounce = wd->v_bounce;
2618} 2597}
2619 2598
2620EAPI void 2599EAPI void
@@ -2622,26 +2601,13 @@ elm_gengrid_page_relative_set(Evas_Object *obj,
2622 double h_pagerel, 2601 double h_pagerel,
2623 double v_pagerel) 2602 double v_pagerel)
2624{ 2603{
2625 Evas_Coord pagesize_h; 2604 elm_gen_page_relative_set(obj, h_pagerel, v_pagerel);
2626 Evas_Coord pagesize_v;
2627
2628 ELM_CHECK_WIDTYPE(obj, widtype);
2629 Widget_Data *wd = elm_widget_data_get(obj);
2630 if (!wd) return;
2631
2632 elm_smart_scroller_paging_get(wd->scr, NULL, NULL, &pagesize_h, &pagesize_v);
2633 elm_smart_scroller_paging_set(wd->scr, h_pagerel, v_pagerel, pagesize_h,
2634 pagesize_v);
2635} 2605}
2636 2606
2637EAPI void 2607EAPI void
2638elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel) 2608elm_gengrid_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel)
2639{ 2609{
2640 ELM_CHECK_WIDTYPE(obj, widtype); 2610 elm_gen_page_relative_get(obj, h_pagerel, v_pagerel);
2641 Widget_Data *wd = elm_widget_data_get(obj);
2642 if (!wd) return;
2643
2644 elm_smart_scroller_paging_get(wd->scr, h_pagerel, v_pagerel, NULL, NULL);
2645} 2611}
2646 2612
2647EAPI void 2613EAPI void
@@ -2649,112 +2615,61 @@ elm_gengrid_page_size_set(Evas_Object *obj,
2649 Evas_Coord h_pagesize, 2615 Evas_Coord h_pagesize,
2650 Evas_Coord v_pagesize) 2616 Evas_Coord v_pagesize)
2651{ 2617{
2652 double pagerel_h; 2618 elm_gen_page_size_set(obj, h_pagesize, v_pagesize);
2653 double pagerel_v;
2654
2655 ELM_CHECK_WIDTYPE(obj, widtype);
2656 Widget_Data *wd = elm_widget_data_get(obj);
2657 if (!wd) return;
2658 elm_smart_scroller_paging_get(wd->scr, &pagerel_h, &pagerel_v, NULL, NULL);
2659 elm_smart_scroller_paging_set(wd->scr, pagerel_h, pagerel_v, h_pagesize,
2660 v_pagesize);
2661} 2619}
2662 2620
2663EAPI void 2621EAPI void
2664elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) 2622elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
2665{ 2623{
2666 ELM_CHECK_WIDTYPE(obj, widtype); 2624 elm_gen_current_page_get(obj, h_pagenumber, v_pagenumber);
2667 Widget_Data *wd = elm_widget_data_get(obj);
2668 if (!wd) return;
2669 if (wd->scr)
2670 elm_smart_scroller_current_page_get(wd->scr, h_pagenumber, v_pagenumber);
2671} 2625}
2672 2626
2673EAPI void 2627EAPI void
2674elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) 2628elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
2675{ 2629{
2676 ELM_CHECK_WIDTYPE(obj, widtype); 2630 elm_gen_last_page_get(obj, h_pagenumber, v_pagenumber);
2677 Widget_Data *wd = elm_widget_data_get(obj);
2678 if (!wd) return;
2679 if (wd->scr)
2680 elm_smart_scroller_last_page_get(wd->scr, h_pagenumber, v_pagenumber);
2681} 2631}
2682 2632
2683EAPI void 2633EAPI void
2684elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) 2634elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
2685{ 2635{
2686 ELM_CHECK_WIDTYPE(obj, widtype); 2636 elm_gen_page_show(obj, h_pagenumber, v_pagenumber);
2687 Widget_Data *wd = elm_widget_data_get(obj);
2688 if (!wd) return;
2689 if (wd->scr)
2690 elm_smart_scroller_page_show(wd->scr, h_pagenumber, v_pagenumber);
2691} 2637}
2692 2638
2693EAPI void 2639EAPI void
2694elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber) 2640elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
2695{ 2641{
2696 ELM_CHECK_WIDTYPE(obj, widtype); 2642 elm_gen_page_bring_in(obj, h_pagenumber, v_pagenumber);
2697 Widget_Data *wd = elm_widget_data_get(obj);
2698 if (!wd) return;
2699 if (wd->scr)
2700 elm_smart_scroller_page_bring_in(wd->scr, h_pagenumber, v_pagenumber);
2701} 2643}
2702 2644
2703EAPI Elm_Gen_Item * 2645EAPI Elm_Gen_Item *
2704elm_gengrid_first_item_get(const Evas_Object *obj) 2646elm_gengrid_first_item_get(const Evas_Object *obj)
2705{ 2647{
2706 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 2648 return elm_gen_first_item_get(obj);
2707 Widget_Data *wd = elm_widget_data_get(obj);
2708 if (!wd) return NULL;
2709 if (!wd->items) return NULL;
2710 Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items);
2711 while ((it) && (it->delete_me))
2712 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
2713 return it;
2714} 2649}
2715 2650
2716EAPI Elm_Gen_Item * 2651EAPI Elm_Gen_Item *
2717elm_gengrid_last_item_get(const Evas_Object *obj) 2652elm_gengrid_last_item_get(const Evas_Object *obj)
2718{ 2653{
2719 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 2654 return elm_gen_last_item_get(obj);
2720 Widget_Data *wd = elm_widget_data_get(obj);
2721 if (!wd) return NULL;
2722 if (!wd->items) return NULL;
2723 Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
2724 while ((it) && (it->delete_me))
2725 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
2726 return it;
2727} 2655}
2728 2656
2729EAPI Elm_Gen_Item * 2657EAPI Elm_Gen_Item *
2730elm_gengrid_item_next_get(const Elm_Gen_Item *it) 2658elm_gengrid_item_next_get(const Elm_Gen_Item *it)
2731{ 2659{
2732 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 2660 return elm_gen_item_next_get(it);
2733 while (it)
2734 {
2735 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
2736 if ((it) && (!it->delete_me)) break;
2737 }
2738 return (Elm_Gen_Item *)it;
2739} 2661}
2740 2662
2741EAPI Elm_Gen_Item * 2663EAPI Elm_Gen_Item *
2742elm_gengrid_item_prev_get(const Elm_Gen_Item *it) 2664elm_gengrid_item_prev_get(const Elm_Gen_Item *it)
2743{ 2665{
2744 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 2666 return elm_gen_item_prev_get(it);
2745 while (it)
2746 {
2747 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
2748 if ((it) && (!it->delete_me)) break;
2749 }
2750 return (Elm_Gen_Item *)it;
2751} 2667}
2752 2668
2753EAPI Evas_Object * 2669EAPI Evas_Object *
2754elm_gengrid_item_gengrid_get(const Elm_Gen_Item *it) 2670elm_gengrid_item_gengrid_get(const Elm_Gen_Item *it)
2755{ 2671{
2756 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 2672 return elm_gen_item_widget_get(it);
2757 return WIDGET(it);
2758} 2673}
2759 2674
2760EAPI void 2675EAPI void
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 3a86a41286..01520b14dc 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -359,14 +359,14 @@ _event_hook(Evas_Object *obj,
359 } 359 }
360 else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) 360 else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
361 { 361 {
362 it = elm_genlist_first_item_get(obj); 362 it = elm_gen_first_item_get(obj);
363 elm_genlist_item_bring_in(it); 363 elm_genlist_item_bring_in(it);
364 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 364 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
365 return EINA_TRUE; 365 return EINA_TRUE;
366 } 366 }
367 else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) 367 else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
368 { 368 {
369 it = elm_genlist_last_item_get(obj); 369 it = elm_gen_last_item_get(obj);
370 elm_genlist_item_bring_in(it); 370 elm_genlist_item_bring_in(it);
371 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 371 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
372 return EINA_TRUE; 372 return EINA_TRUE;
@@ -429,7 +429,7 @@ _item_multi_select_up(Widget_Data *wd)
429 if (!wd->selected) return EINA_FALSE; 429 if (!wd->selected) return EINA_FALSE;
430 if (!wd->multi) return EINA_FALSE; 430 if (!wd->multi) return EINA_FALSE;
431 431
432 Elm_Gen_Item *prev = elm_genlist_item_prev_get(wd->last_selected_item); 432 Elm_Gen_Item *prev = elm_gen_item_prev_get(wd->last_selected_item);
433 if (!prev) return EINA_TRUE; 433 if (!prev) return EINA_TRUE;
434 434
435 if (elm_gen_item_selected_get(prev)) 435 if (elm_gen_item_selected_get(prev))
@@ -452,7 +452,7 @@ _item_multi_select_down(Widget_Data *wd)
452 if (!wd->selected) return EINA_FALSE; 452 if (!wd->selected) return EINA_FALSE;
453 if (!wd->multi) return EINA_FALSE; 453 if (!wd->multi) return EINA_FALSE;
454 454
455 Elm_Gen_Item *next = elm_genlist_item_next_get(wd->last_selected_item); 455 Elm_Gen_Item *next = elm_gen_item_next_get(wd->last_selected_item);
456 if (!next) return EINA_TRUE; 456 if (!next) return EINA_TRUE;
457 457
458 if (elm_gen_item_selected_get(next)) 458 if (elm_gen_item_selected_get(next))
@@ -479,7 +479,7 @@ _item_single_select_up(Widget_Data *wd)
479 while ((prev) && (prev->delete_me)) 479 while ((prev) && (prev->delete_me))
480 prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); 480 prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
481 } 481 }
482 else prev = elm_genlist_item_prev_get(wd->last_selected_item); 482 else prev = elm_gen_item_prev_get(wd->last_selected_item);
483 483
484 if (!prev) return EINA_FALSE; 484 if (!prev) return EINA_FALSE;
485 485
@@ -500,7 +500,7 @@ _item_single_select_down(Widget_Data *wd)
500 while ((next) && (next->delete_me)) 500 while ((next) && (next->delete_me))
501 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); 501 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
502 } 502 }
503 else next = elm_genlist_item_next_get(wd->last_selected_item); 503 else next = elm_gen_item_next_get(wd->last_selected_item);
504 504
505 if (!next) return EINA_FALSE; 505 if (!next) return EINA_FALSE;
506 506
@@ -3799,58 +3799,31 @@ elm_genlist_at_xy_item_get(const Evas_Object *obj,
3799EAPI Elm_Gen_Item * 3799EAPI Elm_Gen_Item *
3800elm_genlist_first_item_get(const Evas_Object *obj) 3800elm_genlist_first_item_get(const Evas_Object *obj)
3801{ 3801{
3802 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 3802 return elm_gen_first_item_get(obj);
3803 Widget_Data *wd = elm_widget_data_get(obj);
3804 if (!wd) return NULL;
3805 if (!wd->items) return NULL;
3806 Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items);
3807 while ((it) && (it->delete_me))
3808 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
3809 return it;
3810} 3803}
3811 3804
3812EAPI Elm_Gen_Item * 3805EAPI Elm_Gen_Item *
3813elm_genlist_last_item_get(const Evas_Object *obj) 3806elm_genlist_last_item_get(const Evas_Object *obj)
3814{ 3807{
3815 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 3808 return elm_gen_last_item_get(obj);
3816 Widget_Data *wd = elm_widget_data_get(obj);
3817 if (!wd) return NULL;
3818 if (!wd->items) return NULL;
3819 Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
3820 while ((it) && (it->delete_me))
3821 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
3822 return it;
3823} 3809}
3824 3810
3825EAPI Elm_Gen_Item * 3811EAPI Elm_Gen_Item *
3826elm_genlist_item_next_get(const Elm_Gen_Item *it) 3812elm_genlist_item_next_get(const Elm_Gen_Item *it)
3827{ 3813{
3828 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 3814 return elm_gen_item_next_get(it);
3829 while (it)
3830 {
3831 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
3832 if ((it) && (!it->delete_me)) break;
3833 }
3834 return (Elm_Gen_Item *)it;
3835} 3815}
3836 3816
3837EAPI Elm_Gen_Item * 3817EAPI Elm_Gen_Item *
3838elm_genlist_item_prev_get(const Elm_Gen_Item *it) 3818elm_genlist_item_prev_get(const Elm_Gen_Item *it)
3839{ 3819{
3840 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 3820 return elm_gen_item_prev_get(it);
3841 while (it)
3842 {
3843 it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
3844 if ((it) && (!it->delete_me)) break;
3845 }
3846 return (Elm_Gen_Item *)it;
3847} 3821}
3848 3822
3849EAPI Evas_Object * 3823EAPI Evas_Object *
3850elm_genlist_item_genlist_get(const Elm_Gen_Item *it) 3824elm_genlist_item_genlist_get(const Elm_Gen_Item *it)
3851{ 3825{
3852 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL); 3826 return elm_gen_item_widget_get(it);
3853 return WIDGET(it);
3854} 3827}
3855 3828
3856EAPI Elm_Gen_Item * 3829EAPI Elm_Gen_Item *
@@ -3883,8 +3856,7 @@ elm_genlist_item_selected_set(Elm_Gen_Item *it,
3883EAPI Eina_Bool 3856EAPI Eina_Bool
3884elm_genlist_item_selected_get(const Elm_Gen_Item *it) 3857elm_genlist_item_selected_get(const Elm_Gen_Item *it)
3885{ 3858{
3886 ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE); 3859 return elm_gen_item_selected_get(it);
3887 return it->selected;
3888} 3860}
3889 3861
3890EAPI void 3862EAPI void
@@ -4443,38 +4415,26 @@ EAPI void
4443elm_genlist_always_select_mode_set(Evas_Object *obj, 4415elm_genlist_always_select_mode_set(Evas_Object *obj,
4444 Eina_Bool always_select) 4416 Eina_Bool always_select)
4445{ 4417{
4446 ELM_CHECK_WIDTYPE(obj, widtype); 4418 elm_gen_always_select_mode_set(obj, always_select);
4447 Widget_Data *wd = elm_widget_data_get(obj);
4448 if (!wd) return;
4449 wd->always_select = always_select;
4450} 4419}
4451 4420
4452EAPI Eina_Bool 4421EAPI Eina_Bool
4453elm_genlist_always_select_mode_get(const Evas_Object *obj) 4422elm_genlist_always_select_mode_get(const Evas_Object *obj)
4454{ 4423{
4455 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 4424 return elm_gen_always_select_mode_get(obj);
4456 Widget_Data *wd = elm_widget_data_get(obj);
4457 if (!wd) return EINA_FALSE;
4458 return wd->always_select;
4459} 4425}
4460 4426
4461EAPI void 4427EAPI void
4462elm_genlist_no_select_mode_set(Evas_Object *obj, 4428elm_genlist_no_select_mode_set(Evas_Object *obj,
4463 Eina_Bool no_select) 4429 Eina_Bool no_select)
4464{ 4430{
4465 ELM_CHECK_WIDTYPE(obj, widtype); 4431 elm_gen_no_select_mode_set(obj, no_select);
4466 Widget_Data *wd = elm_widget_data_get(obj);
4467 if (!wd) return;
4468 wd->no_select = no_select;
4469} 4432}
4470 4433
4471EAPI Eina_Bool 4434EAPI Eina_Bool
4472elm_genlist_no_select_mode_get(const Evas_Object *obj) 4435elm_genlist_no_select_mode_get(const Evas_Object *obj)
4473{ 4436{
4474 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 4437 return elm_gen_no_select_mode_get(obj);
4475 Widget_Data *wd = elm_widget_data_get(obj);
4476 if (!wd) return EINA_FALSE;
4477 return wd->no_select;
4478} 4438}
4479 4439
4480EAPI void 4440EAPI void
@@ -4526,12 +4486,7 @@ elm_genlist_bounce_set(Evas_Object *obj,
4526 Eina_Bool h_bounce, 4486 Eina_Bool h_bounce,
4527 Eina_Bool v_bounce) 4487 Eina_Bool v_bounce)
4528{ 4488{
4529 ELM_CHECK_WIDTYPE(obj, widtype); 4489 elm_gen_bounce_set(obj, h_bounce, v_bounce);
4530 Widget_Data *wd = elm_widget_data_get(obj);
4531 if (!wd) return;
4532 elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
4533 wd->h_bounce = h_bounce;
4534 wd->v_bounce = v_bounce;
4535} 4490}
4536 4491
4537EAPI void 4492EAPI void
@@ -4539,11 +4494,7 @@ elm_genlist_bounce_get(const Evas_Object *obj,
4539 Eina_Bool *h_bounce, 4494 Eina_Bool *h_bounce,
4540 Eina_Bool *v_bounce) 4495 Eina_Bool *v_bounce)
4541{ 4496{
4542 ELM_CHECK_WIDTYPE(obj, widtype); 4497 elm_gen_bounce_get(obj, h_bounce, v_bounce);
4543 Widget_Data *wd = elm_widget_data_get(obj);
4544 if (!wd) return;
4545 if (h_bounce) *h_bounce = wd->h_bounce;
4546 if (v_bounce) *v_bounce = wd->v_bounce;
4547} 4498}
4548 4499
4549EAPI void 4500EAPI void