kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ecore/src/lib/ecore_evas/ecore_evas_quartz.c, 

* ecore/src/lib/ecore_evas/ecore_evas_fb.c,
	* ecore/src/lib/ecore_evas/ecore_evas_x.c,
	* ecore/src/lib/ecore_evas/ecore_evas_directfb.c,
	* ecore/src/lib/ecore_evas/ecore_evas_sdl.c: Prevent use of deleted object.



SVN revision: 38949
This commit is contained in:
Cedric BAIL 2009-02-05 10:45:52 +00:00
parent 0ab2d474ef
commit 3f767e7cf8
5 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
View File

@ -408,6 +408,16 @@ _ecore_evas_directfb_shaped_set(Ecore_Evas *ee, int shaped)
}
static void
_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee;
ee = data;
if (ee)
ee->prop.cursor.object = NULL;
}
static void
_ecore_evas_directfb_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
{
@ -439,6 +449,8 @@ _ecore_evas_directfb_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int lay
evas_object_pass_events_set(ee->prop.cursor.object, 1);
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
}
static void

12
legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
View File

@ -435,6 +435,16 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
static void
_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee;
ee = data;
if (ee)
ee->prop.cursor.object = NULL;
}
static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
{
@ -463,6 +473,8 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
evas_object_pass_events_set(ee->prop.cursor.object, 1);
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
}
static void

12
legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c
View File

@ -401,6 +401,16 @@ _ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
static void
_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee;
ee = data;
if (ee)
ee->prop.cursor.object = NULL;
}
static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
{
@ -432,6 +442,8 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
}
static const Ecore_Evas_Engine_Func _ecore_quartz_engine_func =

12
legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
View File

@ -368,6 +368,16 @@ _ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
static void
_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee;
ee = data;
if (ee)
ee->prop.cursor.object = NULL;
}
static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
{
@ -396,6 +406,8 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
evas_object_pass_events_set(ee->prop.cursor.object, 1);
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
}
static const Ecore_Evas_Engine_Func _ecore_sdl_engine_func =

12
legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
View File

@ -2126,6 +2126,16 @@ _ecore_evas_x_size_step_set(Ecore_Evas *ee, int w, int h)
_ecore_evas_x_size_pos_hints_update(ee);
}
static void
_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Ecore_Evas *ee;
ee = data;
if (ee)
ee->prop.cursor.object = NULL;
}
static void
_ecore_evas_x_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
{
@ -2158,6 +2168,8 @@ _ecore_evas_x_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int
evas_object_pass_events_set(ee->prop.cursor.object, 1);
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
}
/*