summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-09 16:01:26 +0000
committerTom Hacohen <tom@stosb.com>2016-03-09 16:09:17 +0000
commit90e465317d10ca01ff39824e56828ee983f7ae41 (patch)
treedc94f4bdc77fe0ad8dd5bcb65f864eb226d5a2cf
parentd5a26c084f5b6efa9d27e6bf08f0f55871b3ca19 (diff)
Combobox: Semi automatic migration to the new eo_add.
-rw-r--r--src/lib/elc_combobox.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index af79c72f9..4227cea41 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -309,7 +309,8 @@ EAPI Evas_Object *
309elm_combobox_add(Evas_Object *parent) 309elm_combobox_add(Evas_Object *parent)
310{ 310{
311 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 311 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
312 Evas_Object *obj = eo_add(MY_CLASS, parent); 312 Evas_Object *obj = NULL;
313 eo_add(&obj, MY_CLASS, parent);
313 return obj; 314 return obj;
314} 315}
315 316
@@ -332,7 +333,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
332 sd->hover_parent = elm_object_parent_widget_get(obj); 333 sd->hover_parent = elm_object_parent_widget_get(obj);
333 334
334 //hover 335 //hover
335 sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent); 336 eo_add(&sd->hover, ELM_HOVER_CLASS, sd->hover_parent);
336 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE); 337 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
337 elm_hover_target_set(sd->hover, obj); 338 elm_hover_target_set(sd->hover, obj);
338 elm_widget_sub_object_add(obj, sd->hover); 339 elm_widget_sub_object_add(obj, sd->hover);
@@ -358,7 +359,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
358 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1); 359 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1);
359 360
360 // This is the genlist object that will take over the genlist call 361 // This is the genlist object that will take over the genlist call
361 sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj); 362 sd->genlist = gl = eo_add(&gl, ELM_GENLIST_CLASS, obj);
362 elm_genlist_filter_set(gl, NULL); 363 elm_genlist_filter_set(gl, NULL);
363 elm_widget_mirrored_automatic_set(gl, EINA_FALSE); 364 elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
364 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj)); 365 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
@@ -372,7 +373,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
372 elm_table_pack(sd->tbl, gl, 0, 0, 1, 1); 373 elm_table_pack(sd->tbl, gl, 0, 0, 1, 1);
373 374
374 // This is the entry object that will take over the entry call 375 // This is the entry object that will take over the entry call
375 sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj); 376 sd->entry = entry = eo_add(&entry, ELM_ENTRY_CLASS, obj);
376 elm_widget_mirrored_automatic_set(entry, EINA_FALSE); 377 elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
377 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj)); 378 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
378 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, 379 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,