summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-07 17:29:22 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commit6ed6a6c4fda0284cfebc758551c788ede5c0da0f (patch)
tree8bfd1c9241dbae0e91f03582cd84fafcfb2925a6
parent2f45862dca600fecfd532a37f7e03573760264be (diff)
elm_button: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_button.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 7a2be46a7..d96ee42d8 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -66,7 +66,8 @@ _activate(Evas_Object *obj)
66 _elm_access_say(E_("Clicked")); 66 _elm_access_say(E_("Clicked"));
67 if (!elm_widget_disabled_get(obj) && 67 if (!elm_widget_disabled_get(obj) &&
68 !evas_object_freeze_events_get(obj)) 68 !evas_object_freeze_events_get(obj))
69 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); 69 eo_do(obj, eo_event_callback_call
70 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
70 } 71 }
71} 72}
72 73
@@ -89,7 +90,8 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
89 if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; 90 if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
90 if (evas_object_freeze_events_get(obj)) return EINA_FALSE; 91 if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
91 92
92 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); 93 eo_do(obj, eo_event_callback_call
94 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
93 elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); 95 elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
94 96
95 return EINA_TRUE; 97 return EINA_TRUE;
@@ -196,7 +198,8 @@ _autorepeat_send(void *data)
196{ 198{
197 ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL); 199 ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
198 200
199 evas_object_smart_callback_call(data, SIG_REPEATED, NULL); 201 eo_do(data, eo_event_callback_call
202 (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL));
200 if (!sd->repeating) 203 if (!sd->repeating)
201 { 204 {
202 sd->timer = NULL; 205 sd->timer = NULL;
@@ -236,7 +239,8 @@ _on_pressed_signal(void *data,
236 (sd->ar_initial_timeout, _autorepeat_initial_send, data); 239 (sd->ar_initial_timeout, _autorepeat_initial_send, data);
237 } 240 }
238 241
239 evas_object_smart_callback_call(data, SIG_PRESSED, NULL); 242 eo_do(data, eo_event_callback_call
243 (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL));
240} 244}
241 245
242static void 246static void
@@ -249,7 +253,8 @@ _on_unpressed_signal(void *data,
249 253
250 ELM_SAFE_FREE(sd->timer, ecore_timer_del); 254 ELM_SAFE_FREE(sd->timer, ecore_timer_del);
251 sd->repeating = EINA_FALSE; 255 sd->repeating = EINA_FALSE;
252 evas_object_smart_callback_call(data, SIG_UNPRESSED, NULL); 256 eo_do(data, eo_event_callback_call
257 (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL));
253} 258}
254 259
255static char * 260static char *