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)
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
109_propagate_event(void *data, const Eo_Event *event); 109_propagate_event(void *data, const Eo_Event *event);
110 110
111EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 111EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
112 { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }, 112 { EFL_EVENT_DEL, _on_sub_obj_del },
113 { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide }); 113 { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide });
114EFL_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks, 114EFL_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
115 { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }); 115 { EFL_EVENT_DEL, _on_sub_obj_del });
116EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks, 116EFL_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
117 { EFL_EVENT_KEY_DOWN, _propagate_event }, 117 { EFL_EVENT_KEY_DOWN, _propagate_event },
118 { EFL_EVENT_KEY_UP, _propagate_event }, 118 { EFL_EVENT_KEY_UP, _propagate_event },
@@ -4444,7 +4444,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4444 { EFL_GFX_EVENT_MOVE, _track_obj_view_update }, 4444 { EFL_GFX_EVENT_MOVE, _track_obj_view_update },
4445 { EFL_GFX_EVENT_SHOW, _track_obj_view_update }, 4445 { EFL_GFX_EVENT_SHOW, _track_obj_view_update },
4446 { EFL_GFX_EVENT_HIDE, _track_obj_view_update }, 4446 { EFL_GFX_EVENT_HIDE, _track_obj_view_update },
4447 { EFL_CANVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); 4447 { EFL_EVENT_DEL, _track_obj_view_del });
4448 4448
4449static void 4449static void
4450_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) 4450_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)
265} 265}
266 266
267EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, 267EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
268 { EFL_CANVAS_OBJECT_EVENT_DEL, _on_child_del }, 268 { EFL_EVENT_DEL, _on_child_del },
269 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } 269 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
270); 270);
271 271
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)
7633static void 7633static void
7634_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) 7634_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
7635{ 7635{
7636 efl_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); 7636 efl_event_callback_del(obs->eo_obs, EFL_EVENT_DEL, _obstacle_del_cb, eo_obj);
7637} 7637}
7638 7638
7639static void 7639static void
@@ -7669,7 +7669,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
7669 if (!obs) return EINA_FALSE; 7669 if (!obs) return EINA_FALSE;
7670 7670
7671 obs->eo_obs = eo_obs; 7671 obs->eo_obs = eo_obs;
7672 efl_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); 7672 efl_event_callback_add(eo_obs, EFL_EVENT_DEL, _obstacle_del_cb, eo_obj);
7673 7673
7674 obj->obstacles = eina_list_append(obj->obstacles, obs); 7674 obj->obstacles = eina_list_append(obj->obstacles, obs);
7675 _obstacle_update(obs, eo_obj); 7675 _obstacle_update(obs, eo_obj);