cedric pushed a commit to branch master.
commit 8db2c018f8163e86ea625336362a4bfdebe6947f
Author: Cedric Bail <[email protected]>
Date: Tue Jul 16 20:03:33 2013 +0900
edje: take that windows !
---
src/lib/edje/edje_callbacks.c | 38 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index ad46ee0..1a7de7e 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -432,47 +432,45 @@ _edje_pending_timer_cb(void *data)
return ECORE_CALLBACK_CANCEL;
}
-static Eo_Callback_Array_Item edje_callbacks[] = {
- { EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_IN, _edje_mouse_in_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_OUT, _edje_mouse_out_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_DOWN, _edje_mouse_down_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_UP, _edje_mouse_up_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_MOVE, _edje_mouse_move_signal_cb },
- { EVAS_OBJECT_EVENT_MOUSE_WHEEL, _edje_mouse_wheel_signal_cb },
- { NULL, NULL }
-};
-
-static Eo_Callback_Array_Item edje_focus_callbacks[] = {
- { EVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
- { EVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb },
- { NULL, NULL }
-};
+EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks, 8,
+ { EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_IN,
_edje_mouse_in_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_OUT,
_edje_mouse_out_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_DOWN,
_edje_mouse_down_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_UP,
_edje_mouse_up_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_MOVE,
_edje_mouse_move_signal_cb },
+ { EVAS_OBJECT_EVENT_MOUSE_WHEEL,
_edje_mouse_wheel_signal_cb },
+ { NULL, NULL });
+
+EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks, 3,
+ { EVAS_OBJECT_EVENT_FOCUS_IN,
_edje_focus_in_signal_cb },
+ { EVAS_OBJECT_EVENT_FOCUS_OUT,
_edje_focus_out_signal_cb },
+ { NULL, NULL });
void
_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{
- eo_do(obj, eo_event_callback_array_add(edje_callbacks, ed));
+ eo_do(obj, eo_event_callback_array_add(edje_callbacks(), ed));
evas_object_data_set(obj, "real_part", rp);
}
void
_edje_callbacks_del(Evas_Object *obj, Edje *ed)
{
- eo_do(obj, eo_event_callback_array_del(edje_callbacks, ed));
+ eo_do(obj, eo_event_callback_array_del(edje_callbacks(), ed));
evas_object_data_del(obj, "real_part");
}
void
_edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{
- eo_do(obj, eo_event_callback_array_add(edje_focus_callbacks, ed));
+ eo_do(obj, eo_event_callback_array_add(edje_focus_callbacks(), ed));
evas_object_data_set(obj, "real_part", rp);
}
void
_edje_callbacks_focus_del(Evas_Object *obj, Edje *ed)
{
- eo_do(obj, eo_event_callback_array_del(edje_focus_callbacks, ed));
+ eo_do(obj, eo_event_callback_array_del(edje_focus_callbacks(), ed));
evas_object_data_del(obj, "real_part");
}
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
