q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=da982535f603688021fdef6caf4681e523791261
commit da982535f603688021fdef6caf4681e523791261 Author: Daniel Kolesa <d.kol...@osg.samsung.com> Date: Thu Apr 20 16:14:18 2017 +0200 eo: move Efl_Event definition back to C It's not used anywhere in eo files and has a void pointer. --- src/lib/eo/Eo.h | 12 ++++++++++++ src/lib/eo/efl_object.eo | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 11b36ca..178308a 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -216,11 +216,23 @@ typedef void (*Efl_Del_Intercept) (Eo *obj_id); */ typedef Eo Efl_Future; +/** + * @typedef Efl_Event + * A parameter passed in event callbacks holding extra event parameters. + */ +typedef struct _Efl_Event Efl_Event; + #include "efl_object_override.eo.h" #include "efl_object.eo.h" #include "efl_interface.eo.h" #define EO_CLASS EFL_OBJECT_CLASS +struct _Efl_Event { + Efl_Object *object; /**< The object the event was called on. */ + const Efl_Event_Description *desc; /**< The event description. */ + void *info; /**< Extra event information passed by the event caller. */ +}; + /** * @addtogroup Eo_Debug_Information Eo's Debug information helper. * @{ diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo index 9994db6..1d47eba 100644 --- a/src/lib/eo/efl_object.eo +++ b/src/lib/eo/efl_object.eo @@ -8,16 +8,8 @@ struct Efl.Event.Description { restart: bool; [[$true if when the event is triggered again from a callback, it should start from where it was]] } -struct Efl.Event { - [[Parameter passed in event callbacks holding extra event parameters]] - object: Efl.Object; [[The object the event was called on.]] - desc: ptr(const(Efl.Event.Description)); [[The event description.]] - info: void_ptr; [[Extra event information passed by the event caller.]] -} - type Efl.Event_Cb: __builtin_event_cb; [[An event callback prototype.]] - struct Efl.Callback_Array_Item { [[An item in an array of callback desc/func. --