summaryrefslogtreecommitdiff
path: root/src/lib/eo
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-04-20 16:14:18 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-04-20 16:15:22 +0200
commitda982535f603688021fdef6caf4681e523791261 (patch)
treeef502374fa54ac5800af3177faaea3c9cfde7c4b /src/lib/eo
parent295940c0bc08eb00f33bb67f74e7b4d47e0d8bd3 (diff)
eo: move Efl_Event definition back to C
It's not used anywhere in eo files and has a void pointer.
Diffstat (limited to 'src/lib/eo')
-rw-r--r--src/lib/eo/Eo.h12
-rw-r--r--src/lib/eo/efl_object.eo8
2 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 11b36cace2..178308a8e1 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);
216 */ 216 */
217typedef Eo Efl_Future; 217typedef Eo Efl_Future;
218 218
219/**
220 * @typedef Efl_Event
221 * A parameter passed in event callbacks holding extra event parameters.
222 */
223typedef struct _Efl_Event Efl_Event;
224
219#include "efl_object_override.eo.h" 225#include "efl_object_override.eo.h"
220#include "efl_object.eo.h" 226#include "efl_object.eo.h"
221#include "efl_interface.eo.h" 227#include "efl_interface.eo.h"
222#define EO_CLASS EFL_OBJECT_CLASS 228#define EO_CLASS EFL_OBJECT_CLASS
223 229
230struct _Efl_Event {
231 Efl_Object *object; /**< The object the event was called on. */
232 const Efl_Event_Description *desc; /**< The event description. */
233 void *info; /**< Extra event information passed by the event caller. */
234};
235
224/** 236/**
225 * @addtogroup Eo_Debug_Information Eo's Debug information helper. 237 * @addtogroup Eo_Debug_Information Eo's Debug information helper.
226 * @{ 238 * @{
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 9994db6df2..1d47ebab05 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -8,16 +8,8 @@ struct Efl.Event.Description {
8 restart: bool; [[$true if when the event is triggered again from a callback, it should start from where it was]] 8 restart: bool; [[$true if when the event is triggered again from a callback, it should start from where it was]]
9} 9}
10 10
11struct Efl.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]]
13 object: Efl.Object; [[The object the event was called on.]]
14 desc: ptr(const(Efl.Event.Description)); [[The event description.]]
15 info: void_ptr; [[Extra event information passed by the event caller.]]
16}
17
18type Efl.Event_Cb: __builtin_event_cb; [[An event callback prototype.]] 11type Efl.Event_Cb: __builtin_event_cb; [[An event callback prototype.]]
19 12
20
21struct Efl.Callback_Array_Item { 13struct Efl.Callback_Array_Item {
22 [[An item in an array of callback desc/func. 14 [[An item in an array of callback desc/func.
23 15