jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=da1e53820bf1786e2ada9be5e9f9ae7bb0704020
commit da1e53820bf1786e2ada9be5e9f9ae7bb0704020 Author: Jean-Philippe Andre <[email protected]> Date: Thu Jun 16 11:16:12 2016 +0900 Evas: Fix usage of callback arrays This should fix compilation of EFL for Windows (at least this is one more step...) - evas box - evas table --- src/lib/evas/canvas/evas_object_box.c | 11 +++++------ src/lib/evas/canvas/evas_object_table.c | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index d99ac4f..415a671 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -167,17 +167,16 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS return opt; } -static const Eo_Callback_Array_Item evas_object_box_callbacks[] = { +EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks, { EFL_GFX_EVENT_RESIZE, _on_child_resize }, { EO_EVENT_DEL, _on_child_del }, - { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }, - { NULL, NULL } -}; + { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } +); static void _evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent) { - eo_event_callback_array_del(obj, evas_object_box_callbacks, parent); + eo_event_callback_array_del(obj, evas_object_box_callbacks(), parent); } static Evas_Object_Box_Option * @@ -185,7 +184,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data { Evas_Object *obj = opt->obj; - eo_event_callback_array_add(obj, evas_object_box_callbacks, o); + eo_event_callback_array_add(obj, evas_object_box_callbacks(), o); return opt; } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index dd6d74e..f6c4486 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -263,22 +263,21 @@ _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) return EO_CALLBACK_CONTINUE; } -static const Eo_Callback_Array_Item evas_object_table_callbacks[] = { +EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, { EVAS_OBJECT_EVENT_DEL, _on_child_del }, - { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }, - { NULL, NULL } -}; + { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } +); static void _evas_object_table_child_connect(Evas_Object *o, Evas_Object *child) { - eo_event_callback_array_add(child, evas_object_table_callbacks, o); + eo_event_callback_array_add(child, evas_object_table_callbacks(), o); } static void _evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child) { - eo_event_callback_array_del(child, evas_object_table_callbacks, o); + eo_event_callback_array_del(child, evas_object_table_callbacks(), o); } static void --
