summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-07 18:14:27 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commit445fb2d8d3a16cd1e12ac943a46db95649d4fe8c (patch)
tree3244e5d73b74f96736c7ad58e61424cd31c8cc2e
parent57d5740f9c0f7889a71bf353ac1de021bc5722b2 (diff)
elm_diskselector: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_diskselector.c24
-rw-r--r--src/lib/elm_diskselector.eo4
2 files changed, 15 insertions, 13 deletions
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 8433a88b9..4d0e866be 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -89,7 +89,8 @@ _item_select(Elm_Diskselector_Item_Data *it)
89 _selected_item_indicate(sd->selected_item); 89 _selected_item_indicate(sd->selected_item);
90 90
91 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 91 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
92 evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it); 92 eo_do(WIDGET(it), eo_event_callback_call
93 (ELM_DISKSELECTOR_EVENT_SELECTED, eo_it));
93} 94}
94 95
95static int 96static int
@@ -610,7 +611,8 @@ _item_click_cb(void *data,
610 } 611 }
611 612
612 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 613 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
613 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it); 614 eo_do(WIDGET(it), eo_event_callback_call
615 (ELM_DISKSELECTOR_EVENT_CLICKED, eo_it));
614} 616}
615 617
616static char * 618static char *
@@ -1096,31 +1098,35 @@ _scroll_animate_stop_cb(Evas_Object *obj,
1096 1098
1097 if (!it) return; 1099 if (!it) return;
1098 _item_select(it); 1100 _item_select(it);
1099 evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, EO_OBJ(it)); 1101 eo_do(data, eo_event_callback_call
1102 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)));
1100} 1103}
1101 1104
1102static void 1105static void
1103_scroll_animate_start_cb(Evas_Object *obj, 1106_scroll_animate_start_cb(Evas_Object *obj,
1104 void *data EINA_UNUSED) 1107 void *data EINA_UNUSED)
1105{ 1108{
1106 evas_object_smart_callback_call 1109 eo_do(obj, eo_event_callback_call
1107 (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); 1110 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
1111 elm_diskselector_selected_item_get(obj)));
1108} 1112}
1109 1113
1110static void 1114static void
1111_scroll_drag_start_cb(Evas_Object *obj, 1115_scroll_drag_start_cb(Evas_Object *obj,
1112 void *data EINA_UNUSED) 1116 void *data EINA_UNUSED)
1113{ 1117{
1114 evas_object_smart_callback_call 1118 eo_do(obj, eo_event_callback_call
1115 (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); 1119 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
1120 elm_diskselector_selected_item_get(obj)));
1116} 1121}
1117 1122
1118static void 1123static void
1119_scroll_drag_stop_cb(Evas_Object *obj, 1124_scroll_drag_stop_cb(Evas_Object *obj,
1120 void *data EINA_UNUSED) 1125 void *data EINA_UNUSED)
1121{ 1126{
1122 evas_object_smart_callback_call 1127 eo_do(obj, eo_event_callback_call
1123 (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); 1128 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP,
1129 elm_diskselector_selected_item_get(obj)));
1124} 1130}
1125 1131
1126static void 1132static void
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 2a6fb126f..a1fcb491d 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -253,10 +253,6 @@ class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
253 events { 253 events {
254 selected; 254 selected;
255 clicked; 255 clicked;
256 scroll,anim,start;
257 scroll,anim,stop;
258 scroll,drag,start;
259 scroll,drag,stop;
260 language,changed; 256 language,changed;
261 access,changed; 257 access,changed;
262 focused; 258 focused;