summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-19 15:38:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-26 10:18:01 +0900
commitb325097e7179af87a7bf7302382adf9d220d4ca5 (patch)
tree9ea45e24634803662a0c6807925173b48b8bb767
parent834794ed84d737e394c47fc4145a0219f7124b01 (diff)
downloadefl-b325097e7179af87a7bf7302382adf9d220d4ca5.tar.gz
elm,evas: Remove use of EFL_CANVAS_OBJECT_EVENT_DEL
This event should not be exposed at all, it's not necessary anymore, EFL_EVENT_DEL already exists and should be good enough. This does move the callback call a little bit ealier in the del process, but at first glance, this shouldn't have any impact.
-rw-r--r--src/lib/elementary/elm_widget.c6
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 447ea477a5..24119e1755 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -109,10 +109,10 @@ static void
_propagate_event(void *data, const Eo_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
- { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
+ { EFL_EVENT_DEL, _on_sub_obj_del },
{ EFL_GFX_EVENT_HIDE, _on_sub_obj_hide });
EFL_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
- { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del });
+ { EFL_EVENT_DEL, _on_sub_obj_del });
EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
{ EFL_EVENT_KEY_DOWN, _propagate_event },
{ EFL_EVENT_KEY_UP, _propagate_event },
@@ -4444,7 +4444,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
{ EFL_GFX_EVENT_MOVE, _track_obj_view_update },
{ EFL_GFX_EVENT_SHOW, _track_obj_view_update },
{ EFL_GFX_EVENT_HIDE, _track_obj_view_update },
- { EFL_CANVAS_OBJECT_EVENT_DEL, _track_obj_view_del });
+ { EFL_EVENT_DEL, _track_obj_view_del });
static void
_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED)
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index d8a79af023..e7b3bb073d 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -265,7 +265,7 @@ _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED)
}
EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
- { EFL_CANVAS_OBJECT_EVENT_DEL, _on_child_del },
+ { EFL_EVENT_DEL, _on_child_del },
{ EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
);
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index ec3c372306..10cfbd1462 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7633,7 +7633,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
static void
_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
{
- efl_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
+ efl_event_callback_del(obs->eo_obs, EFL_EVENT_DEL, _obstacle_del_cb, eo_obj);
}
static void
@@ -7669,7 +7669,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
if (!obs) return EINA_FALSE;
obs->eo_obs = eo_obs;
- efl_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
+ efl_event_callback_add(eo_obs, EFL_EVENT_DEL, _obstacle_del_cb, eo_obj);
obj->obstacles = eina_list_append(obj->obstacles, obs);
_obstacle_update(obs, eo_obj);