summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-11 12:34:19 +0000
committerTom Hacohen <tom@stosb.com>2016-03-11 12:36:19 +0000
commitc32d0bc58f1e6e1f5e4721f0dd2a359c79170b4d (patch)
treec304a934c502de2ba83aaca93b562db34feb05f0
parent97ca9e387903306c01c0a7b7dcbb3f3886d03862 (diff)
Revert "Combobox: Semi automatic migration to the new eo_add."
Reverted eo_add() changes following the return to the old eo_add() syntax. This reverts commit 90e465317d10ca01ff39824e56828ee983f7ae41.
-rw-r--r--src/lib/elc_combobox.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index 0c552b564..fe3f4a34b 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -409,8 +409,7 @@ EAPI Evas_Object *
409elm_combobox_add(Evas_Object *parent) 409elm_combobox_add(Evas_Object *parent)
410{ 410{
411 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 411 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
412 Evas_Object *obj = NULL; 412 Evas_Object *obj = eo_add(MY_CLASS, parent);
413 eo_add(&obj, MY_CLASS, parent);
414 return obj; 413 return obj;
415} 414}
416 415
@@ -433,7 +432,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
433 sd->hover_parent = elm_object_parent_widget_get(obj); 432 sd->hover_parent = elm_object_parent_widget_get(obj);
434 433
435 //hover 434 //hover
436 eo_add(&sd->hover, ELM_HOVER_CLASS, sd->hover_parent); 435 sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent);
437 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE); 436 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
438 elm_hover_target_set(sd->hover, obj); 437 elm_hover_target_set(sd->hover, obj);
439 snprintf(buf, sizeof(buf), "combobox_vertical/%s", 438 snprintf(buf, sizeof(buf), "combobox_vertical/%s",
@@ -458,7 +457,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
458 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1); 457 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1);
459 458
460 // This is the genlist object that will take over the genlist call 459 // This is the genlist object that will take over the genlist call
461 sd->genlist = gl = eo_add(&gl, ELM_GENLIST_CLASS, obj); 460 sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj);
462 elm_genlist_filter_set(gl, NULL); 461 elm_genlist_filter_set(gl, NULL);
463 elm_widget_mirrored_automatic_set(gl, EINA_FALSE); 462 elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
464 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj)); 463 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
@@ -472,7 +471,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
472 elm_table_pack(sd->tbl, gl, 0, 0, 1, 1); 471 elm_table_pack(sd->tbl, gl, 0, 0, 1, 1);
473 472
474 // This is the entry object that will take over the entry call 473 // This is the entry object that will take over the entry call
475 sd->entry = entry = eo_add(&entry, ELM_ENTRY_CLASS, obj); 474 sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj);
476 elm_widget_mirrored_automatic_set(entry, EINA_FALSE); 475 elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
477 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj)); 476 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
478 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, 477 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,