diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-08-19 15:42:44 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-08-26 10:18:01 +0900 |
| commit | 4746627fcfcdda9b73636d0f2a98def6a526b940 (patch) | |
| tree | b6faca1bd89fdf98ec445ebd3182c111cf6a7664 | |
| parent | b325097e7179af87a7bf7302382adf9d220d4ca5 (diff) | |
| download | efl-4746627fcfcdda9b73636d0f2a98def6a526b940.tar.gz | |
evas: Remove deprecated events from public EO class
del and free eo events don't need to be exposed, even as beta
API. They are still required for legacy callbacks.
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_object.eo | 2 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_callbacks.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index cd21b3e62f..e115d16cda 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -599,9 +599,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, Efl.Gfx.Map.map_enable.get; } events { - free @beta; [[Object Being Freed (Called after Del) ]] focus,in; [[Focus In Event ]] focus,out; [[Focus Out Event ]] - del @beta; [[Object Being Deleted (called before Free) ]] } } diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 7ecd5509e4..7de24a3510 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -11,6 +11,12 @@ EVAS_MEMPOOL(_mp_pc); extern Eina_Hash* signals_hash_table; +/* Legacy events, do not use anywhere */ +static const Efl_Event_Description _EVAS_OBJECT_EVENT_FREE = EFL_EVENT_DESCRIPTION("free"); +static const Efl_Event_Description _EVAS_OBJECT_EVENT_DEL = EFL_EVENT_DESCRIPTION("del"); +#define EVAS_OBJECT_EVENT_FREE (&(_EVAS_OBJECT_EVENT_FREE)) +#define EVAS_OBJECT_EVENT_DEL (&(_EVAS_OBJECT_EVENT_DEL)) + /** * Evas events descriptions for Eo. */ @@ -39,7 +45,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST, EFL_EVENT_POINTER_DOWN, EFL_EVENT_POINTER_UP, EFL_EVENT_POINTER_MOVE, - EFL_CANVAS_OBJECT_EVENT_FREE, + EVAS_OBJECT_EVENT_FREE, EFL_EVENT_KEY_DOWN, EFL_EVENT_KEY_UP, EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, @@ -49,7 +55,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST, EFL_GFX_EVENT_MOVE, EFL_GFX_EVENT_RESIZE, EFL_GFX_EVENT_RESTACK, - EFL_CANVAS_OBJECT_EVENT_DEL, + EVAS_OBJECT_EVENT_DEL, EFL_EVENT_HOLD, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, EFL_IMAGE_EVENT_PRELOAD, |