From a52773a8ab85970ed1e5d301256547de88898fab Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 29 Apr 2010 17:35:47 +0000 Subject: [PATCH] * evas: specify Evas canvas for Evas_Object. SVN revision: 48428 --- legacy/evas/src/lib/canvas/evas_object_gradient.c | 2 +- legacy/evas/src/lib/canvas/evas_object_gradient2_linear.c | 2 +- legacy/evas/src/lib/canvas/evas_object_gradient2_radial.c | 2 +- legacy/evas/src/lib/canvas/evas_object_image.c | 2 +- legacy/evas/src/lib/canvas/evas_object_line.c | 2 +- legacy/evas/src/lib/canvas/evas_object_main.c | 2 +- legacy/evas/src/lib/canvas/evas_object_polygon.c | 2 +- legacy/evas/src/lib/canvas/evas_object_rectangle.c | 2 +- legacy/evas/src/lib/canvas/evas_object_smart.c | 2 +- legacy/evas/src/lib/canvas/evas_object_text.c | 2 +- legacy/evas/src/lib/canvas/evas_object_textblock.c | 2 +- legacy/evas/src/lib/include/evas_private.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_gradient.c b/legacy/evas/src/lib/canvas/evas_object_gradient.c index 9a97a4695c..54b50c9028 100644 --- a/legacy/evas/src/lib/canvas/evas_object_gradient.c +++ b/legacy/evas/src/lib/canvas/evas_object_gradient.c @@ -103,7 +103,7 @@ evas_object_gradient_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_gradient_init(obj); evas_object_inject(obj, e); if (obj->object_data) diff --git a/legacy/evas/src/lib/canvas/evas_object_gradient2_linear.c b/legacy/evas/src/lib/canvas/evas_object_gradient2_linear.c index 88fc016cfb..435846329b 100644 --- a/legacy/evas/src/lib/canvas/evas_object_gradient2_linear.c +++ b/legacy/evas/src/lib/canvas/evas_object_gradient2_linear.c @@ -88,7 +88,7 @@ evas_object_gradient2_linear_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_gradient2_linear_init(obj); evas_object_inject(obj, e); if (obj->object_data) diff --git a/legacy/evas/src/lib/canvas/evas_object_gradient2_radial.c b/legacy/evas/src/lib/canvas/evas_object_gradient2_radial.c index 01aadb3ebd..a0048bebd3 100644 --- a/legacy/evas/src/lib/canvas/evas_object_gradient2_radial.c +++ b/legacy/evas/src/lib/canvas/evas_object_gradient2_radial.c @@ -88,7 +88,7 @@ evas_object_gradient2_radial_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_gradient2_radial_init(obj); evas_object_inject(obj, e); if (obj->object_data) diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index b3e938d492..233c5d8dd4 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -141,7 +141,7 @@ evas_object_image_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_image_init(obj); evas_object_inject(obj, e); o = (Evas_Object_Image *)(obj->object_data); diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c index 2cf1b0afc0..39f0acf117 100644 --- a/legacy/evas/src/lib/canvas/evas_object_line.c +++ b/legacy/evas/src/lib/canvas/evas_object_line.c @@ -91,7 +91,7 @@ evas_object_line_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_line_init(obj); evas_object_inject(obj, e); return obj; diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index a016e2a7c2..2dc21041af 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -35,7 +35,7 @@ get_layer_objects(Evas_Layer *l) /* evas internal stuff */ Evas_Object * -evas_object_new(void) +evas_object_new(Evas *e) { Evas_Object *obj; diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/legacy/evas/src/lib/canvas/evas_object_polygon.c index 15a5546b12..b5c459eeb3 100644 --- a/legacy/evas/src/lib/canvas/evas_object_polygon.c +++ b/legacy/evas/src/lib/canvas/evas_object_polygon.c @@ -93,7 +93,7 @@ evas_object_polygon_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_polygon_init(obj); evas_object_inject(obj, e); return obj; diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/legacy/evas/src/lib/canvas/evas_object_rectangle.c index b3d8fed2c5..16893bd090 100644 --- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c +++ b/legacy/evas/src/lib/canvas/evas_object_rectangle.c @@ -85,7 +85,7 @@ evas_object_rectangle_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_rectangle_init(obj); evas_object_inject(obj, e); return obj; diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c index 6556b1413e..f695394a81 100644 --- a/legacy/evas/src/lib/canvas/evas_object_smart.c +++ b/legacy/evas/src/lib/canvas/evas_object_smart.c @@ -380,7 +380,7 @@ evas_object_smart_add(Evas *e, Evas_Smart *s) return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); if (!obj) return NULL; obj->smart.smart = s; obj->type = s->smart_class->name; diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index 0c72b1f2d8..575b449d5c 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -104,7 +104,7 @@ evas_object_text_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_text_init(obj); evas_object_inject(obj, e); return obj; diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index cf7778bea7..6253e89ef0 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -2522,7 +2522,7 @@ evas_object_textblock_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - obj = evas_object_new(); + obj = evas_object_new(e); evas_object_textblock_init(obj); evas_object_inject(obj, e); return obj; diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h index 74ae39d3b9..88ee0b2bc1 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/legacy/evas/src/lib/include/evas_private.h @@ -736,7 +736,7 @@ struct _Evas_Image_Save_Func extern "C" { #endif -Evas_Object *evas_object_new(void); +Evas_Object *evas_object_new(Evas *e); void evas_object_free(Evas_Object *obj, int clean_layer); void evas_object_inject(Evas_Object *obj, Evas *e); void evas_object_release(Evas_Object *obj, int clean_layer);