From: Enlightenment S. <no-...@en...> - 2010-04-29 17:35:54
|
Log: * evas: specify Evas canvas for Evas_Object. Author: cedric Date: 2010-04-29 10:35:47 -0700 (Thu, 29 Apr 2010) New Revision: 48428 Modified: trunk/evas/src/lib/canvas/evas_object_gradient.c trunk/evas/src/lib/canvas/evas_object_gradient2_linear.c trunk/evas/src/lib/canvas/evas_object_gradient2_radial.c trunk/evas/src/lib/canvas/evas_object_image.c trunk/evas/src/lib/canvas/evas_object_line.c trunk/evas/src/lib/canvas/evas_object_main.c trunk/evas/src/lib/canvas/evas_object_polygon.c trunk/evas/src/lib/canvas/evas_object_rectangle.c trunk/evas/src/lib/canvas/evas_object_smart.c trunk/evas/src/lib/canvas/evas_object_text.c trunk/evas/src/lib/canvas/evas_object_textblock.c trunk/evas/src/lib/include/evas_private.h Modified: trunk/evas/src/lib/canvas/evas_object_gradient.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_gradient.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_gradient.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -103,7 +103,7 @@ 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) Modified: trunk/evas/src/lib/canvas/evas_object_gradient2_linear.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_gradient2_linear.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_gradient2_linear.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -88,7 +88,7 @@ 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) Modified: trunk/evas/src/lib/canvas/evas_object_gradient2_radial.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_gradient2_radial.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_gradient2_radial.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -88,7 +88,7 @@ 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) Modified: trunk/evas/src/lib/canvas/evas_object_image.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_image.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_image.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -141,7 +141,7 @@ 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); Modified: trunk/evas/src/lib/canvas/evas_object_line.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_line.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_line.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -91,7 +91,7 @@ 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; Modified: trunk/evas/src/lib/canvas/evas_object_main.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_main.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_main.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -35,7 +35,7 @@ /* evas internal stuff */ Evas_Object * -evas_object_new(void) +evas_object_new(Evas *e) { Evas_Object *obj; Modified: trunk/evas/src/lib/canvas/evas_object_polygon.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_polygon.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_polygon.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -93,7 +93,7 @@ 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; Modified: trunk/evas/src/lib/canvas/evas_object_rectangle.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_rectangle.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_rectangle.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -85,7 +85,7 @@ 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; Modified: trunk/evas/src/lib/canvas/evas_object_smart.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_smart.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_smart.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -380,7 +380,7 @@ 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; Modified: trunk/evas/src/lib/canvas/evas_object_text.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_text.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_text.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -104,7 +104,7 @@ 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; Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2010-04-29 17:35:47 UTC (rev 48428) @@ -2522,7 +2522,7 @@ 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; Modified: trunk/evas/src/lib/include/evas_private.h =================================================================== --- trunk/evas/src/lib/include/evas_private.h 2010-04-29 17:35:44 UTC (rev 48427) +++ trunk/evas/src/lib/include/evas_private.h 2010-04-29 17:35:47 UTC (rev 48428) @@ -736,7 +736,7 @@ 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); |