From: cedric Date: Thu, 29 Apr 2010 17:35:47 +0000 (+0000) Subject: * evas: specify Evas canvas for Evas_Object. X-Git-Tag: accepted/2.0/20130306.225542~242^2~1878 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c43b474574c5699bc932400068c3dee6dcffd96d;p=profile%2Fivi%2Fevas.git * evas: specify Evas canvas for Evas_Object. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@48428 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/canvas/evas_object_gradient.c b/src/lib/canvas/evas_object_gradient.c index 9a97a46..54b50c9 100644 --- a/src/lib/canvas/evas_object_gradient.c +++ b/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/src/lib/canvas/evas_object_gradient2_linear.c b/src/lib/canvas/evas_object_gradient2_linear.c index 88fc016..4358463 100644 --- a/src/lib/canvas/evas_object_gradient2_linear.c +++ b/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/src/lib/canvas/evas_object_gradient2_radial.c b/src/lib/canvas/evas_object_gradient2_radial.c index 01aadb3..a0048be 100644 --- a/src/lib/canvas/evas_object_gradient2_radial.c +++ b/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/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c index b3e938d..233c5d8 100644 --- a/src/lib/canvas/evas_object_image.c +++ b/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/src/lib/canvas/evas_object_line.c b/src/lib/canvas/evas_object_line.c index 2cf1b0a..39f0acf 100644 --- a/src/lib/canvas/evas_object_line.c +++ b/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/src/lib/canvas/evas_object_main.c b/src/lib/canvas/evas_object_main.c index a016e2a..2dc2104 100644 --- a/src/lib/canvas/evas_object_main.c +++ b/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/src/lib/canvas/evas_object_polygon.c b/src/lib/canvas/evas_object_polygon.c index 15a5546..b5c459e 100644 --- a/src/lib/canvas/evas_object_polygon.c +++ b/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/src/lib/canvas/evas_object_rectangle.c b/src/lib/canvas/evas_object_rectangle.c index b3d8fed..16893bd 100644 --- a/src/lib/canvas/evas_object_rectangle.c +++ b/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/src/lib/canvas/evas_object_smart.c b/src/lib/canvas/evas_object_smart.c index 6556b14..f695394 100644 --- a/src/lib/canvas/evas_object_smart.c +++ b/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/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c index 0c72b1f..575b449 100644 --- a/src/lib/canvas/evas_object_text.c +++ b/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/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index cf7778b..6253e89 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/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/src/lib/include/evas_private.h b/src/lib/include/evas_private.h index 74ae39d..88ee0b2 100644 --- a/src/lib/include/evas_private.h +++ b/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);