summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-19 15:42:44 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-26 10:18:01 +0900
commit4746627fcfcdda9b73636d0f2a98def6a526b940 (patch)
treeb6faca1bd89fdf98ec445ebd3182c111cf6a7664
parentb325097e7179af87a7bf7302382adf9d220d4ca5 (diff)
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.eo2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c10
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,
599 Efl.Gfx.Map.map_enable.get; 599 Efl.Gfx.Map.map_enable.get;
600 } 600 }
601 events { 601 events {
602 free @beta; [[Object Being Freed (Called after Del) ]]
603 focus,in; [[Focus In Event ]] 602 focus,in; [[Focus In Event ]]
604 focus,out; [[Focus Out Event ]] 603 focus,out; [[Focus Out Event ]]
605 del @beta; [[Object Being Deleted (called before Free) ]]
606 } 604 }
607} 605}
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);
11 11
12extern Eina_Hash* signals_hash_table; 12extern Eina_Hash* signals_hash_table;
13 13
14/* Legacy events, do not use anywhere */
15static const Efl_Event_Description _EVAS_OBJECT_EVENT_FREE = EFL_EVENT_DESCRIPTION("free");
16static const Efl_Event_Description _EVAS_OBJECT_EVENT_DEL = EFL_EVENT_DESCRIPTION("del");
17#define EVAS_OBJECT_EVENT_FREE (&(_EVAS_OBJECT_EVENT_FREE))
18#define EVAS_OBJECT_EVENT_DEL (&(_EVAS_OBJECT_EVENT_DEL))
19
14/** 20/**
15 * Evas events descriptions for Eo. 21 * Evas events descriptions for Eo.
16 */ 22 */
@@ -39,7 +45,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
39 EFL_EVENT_POINTER_DOWN, 45 EFL_EVENT_POINTER_DOWN,
40 EFL_EVENT_POINTER_UP, 46 EFL_EVENT_POINTER_UP,
41 EFL_EVENT_POINTER_MOVE, 47 EFL_EVENT_POINTER_MOVE,
42 EFL_CANVAS_OBJECT_EVENT_FREE, 48 EVAS_OBJECT_EVENT_FREE,
43 EFL_EVENT_KEY_DOWN, 49 EFL_EVENT_KEY_DOWN,
44 EFL_EVENT_KEY_UP, 50 EFL_EVENT_KEY_UP,
45 EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, 51 EFL_CANVAS_OBJECT_EVENT_FOCUS_IN,
@@ -49,7 +55,7 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
49 EFL_GFX_EVENT_MOVE, 55 EFL_GFX_EVENT_MOVE,
50 EFL_GFX_EVENT_RESIZE, 56 EFL_GFX_EVENT_RESIZE,
51 EFL_GFX_EVENT_RESTACK, 57 EFL_GFX_EVENT_RESTACK,
52 EFL_CANVAS_OBJECT_EVENT_DEL, 58 EVAS_OBJECT_EVENT_DEL,
53 EFL_EVENT_HOLD, 59 EFL_EVENT_HOLD,
54 EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 60 EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
55 EFL_IMAGE_EVENT_PRELOAD, 61 EFL_IMAGE_EVENT_PRELOAD,