diff options
| author | Avi Levin <avi.levin@samsung.com> | 2015-05-07 18:14:27 +0300 |
|---|---|---|
| committer | Avi Levin <avi.levin@samsung.com> | 2015-06-29 17:03:32 +0300 |
| commit | 445fb2d8d3a16cd1e12ac943a46db95649d4fe8c (patch) | |
| tree | 3244e5d73b74f96736c7ad58e61424cd31c8cc2e | |
| parent | 57d5740f9c0f7889a71bf353ac1de021bc5722b2 (diff) | |
| download | elementary-445fb2d8d3a16cd1e12ac943a46db95649d4fe8c.tar.gz | |
elm_diskselector: porting evas smart callbacks to eo
| -rw-r--r-- | src/lib/elm_diskselector.c | 24 | ||||
| -rw-r--r-- | src/lib/elm_diskselector.eo | 4 |
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) _selected_item_indicate(sd->selected_item); if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); - evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it); + eo_do(WIDGET(it), eo_event_callback_call + (ELM_DISKSELECTOR_EVENT_SELECTED, eo_it)); } static int @@ -610,7 +611,8 @@ _item_click_cb(void *data, } if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); - evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it); + eo_do(WIDGET(it), eo_event_callback_call + (ELM_DISKSELECTOR_EVENT_CLICKED, eo_it)); } static char * @@ -1096,31 +1098,35 @@ _scroll_animate_stop_cb(Evas_Object *obj, if (!it) return; _item_select(it); - evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, EO_OBJ(it)); + eo_do(data, eo_event_callback_call + (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it))); } static void _scroll_animate_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - evas_object_smart_callback_call - (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj)); + eo_do(obj, eo_event_callback_call + (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, + elm_diskselector_selected_item_get(obj))); } static void _scroll_drag_start_cb(Evas_Object *obj, void *data EINA_UNUSED) { - evas_object_smart_callback_call - (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj)); + eo_do(obj, eo_event_callback_call + (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, + elm_diskselector_selected_item_get(obj))); } static void _scroll_drag_stop_cb(Evas_Object *obj, void *data EINA_UNUSED) { - evas_object_smart_callback_call - (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj)); + eo_do(obj, eo_event_callback_call + (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, + elm_diskselector_selected_item_get(obj))); } static 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, events { selected; clicked; - scroll,anim,start; - scroll,anim,stop; - scroll,drag,start; - scroll,drag,stop; language,changed; access,changed; focused; |