From: Avi Levin Date: Thu, 7 May 2015 14:29:22 +0000 (+0300) Subject: elm_button: porting evas smart callbacks to eo X-Git-Tag: v1.15.0-alpha1~53 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8222ecd252cf20388bf413654c9e15652b47441d;p=platform%2Fupstream%2Felementary.git elm_button: porting evas smart callbacks to eo --- diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 7a2be46..d96ee42 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -66,7 +66,8 @@ _activate(Evas_Object *obj) _elm_access_say(E_("Clicked")); if (!elm_widget_disabled_get(obj) && !evas_object_freeze_events_get(obj)) - evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); + eo_do(obj, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL)); } } @@ -89,7 +90,8 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; if (evas_object_freeze_events_get(obj)) return EINA_FALSE; - evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); + eo_do(obj, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL)); elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); return EINA_TRUE; @@ -196,7 +198,8 @@ _autorepeat_send(void *data) { ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL); - evas_object_smart_callback_call(data, SIG_REPEATED, NULL); + eo_do(data, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL)); if (!sd->repeating) { sd->timer = NULL; @@ -236,7 +239,8 @@ _on_pressed_signal(void *data, (sd->ar_initial_timeout, _autorepeat_initial_send, data); } - evas_object_smart_callback_call(data, SIG_PRESSED, NULL); + eo_do(data, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL)); } static void @@ -249,7 +253,8 @@ _on_unpressed_signal(void *data, ELM_SAFE_FREE(sd->timer, ecore_timer_del); sd->repeating = EINA_FALSE; - evas_object_smart_callback_call(data, SIG_UNPRESSED, NULL); + eo_do(data, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL)); } static char *