forked from enlightenment/efl
* evas: specify Evas canvas for Evas_Object.
SVN revision: 48428
This commit is contained in:
parent
d239b6c524
commit
a52773a8ab
|
@ -103,7 +103,7 @@ evas_object_gradient_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_gradient_init(obj);
|
evas_object_gradient_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
if (obj->object_data)
|
if (obj->object_data)
|
||||||
|
|
|
@ -88,7 +88,7 @@ evas_object_gradient2_linear_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_gradient2_linear_init(obj);
|
evas_object_gradient2_linear_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
if (obj->object_data)
|
if (obj->object_data)
|
||||||
|
|
|
@ -88,7 +88,7 @@ evas_object_gradient2_radial_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_gradient2_radial_init(obj);
|
evas_object_gradient2_radial_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
if (obj->object_data)
|
if (obj->object_data)
|
||||||
|
|
|
@ -141,7 +141,7 @@ evas_object_image_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_image_init(obj);
|
evas_object_image_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
o = (Evas_Object_Image *)(obj->object_data);
|
o = (Evas_Object_Image *)(obj->object_data);
|
||||||
|
|
|
@ -91,7 +91,7 @@ evas_object_line_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_line_init(obj);
|
evas_object_line_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
return obj;
|
return obj;
|
||||||
|
|
|
@ -35,7 +35,7 @@ get_layer_objects(Evas_Layer *l)
|
||||||
|
|
||||||
/* evas internal stuff */
|
/* evas internal stuff */
|
||||||
Evas_Object *
|
Evas_Object *
|
||||||
evas_object_new(void)
|
evas_object_new(Evas *e)
|
||||||
{
|
{
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ evas_object_polygon_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_polygon_init(obj);
|
evas_object_polygon_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
return obj;
|
return obj;
|
||||||
|
|
|
@ -85,7 +85,7 @@ evas_object_rectangle_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_rectangle_init(obj);
|
evas_object_rectangle_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
return obj;
|
return obj;
|
||||||
|
|
|
@ -380,7 +380,7 @@ evas_object_smart_add(Evas *e, Evas_Smart *s)
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
|
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
if (!obj) return NULL;
|
if (!obj) return NULL;
|
||||||
obj->smart.smart = s;
|
obj->smart.smart = s;
|
||||||
obj->type = s->smart_class->name;
|
obj->type = s->smart_class->name;
|
||||||
|
|
|
@ -104,7 +104,7 @@ evas_object_text_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_text_init(obj);
|
evas_object_text_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
return obj;
|
return obj;
|
||||||
|
|
|
@ -2522,7 +2522,7 @@ evas_object_textblock_add(Evas *e)
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return NULL;
|
return NULL;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
obj = evas_object_new();
|
obj = evas_object_new(e);
|
||||||
evas_object_textblock_init(obj);
|
evas_object_textblock_init(obj);
|
||||||
evas_object_inject(obj, e);
|
evas_object_inject(obj, e);
|
||||||
return obj;
|
return obj;
|
||||||
|
|
|
@ -736,7 +736,7 @@ struct _Evas_Image_Save_Func
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#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_free(Evas_Object *obj, int clean_layer);
|
||||||
void evas_object_inject(Evas_Object *obj, Evas *e);
|
void evas_object_inject(Evas_Object *obj, Evas *e);
|
||||||
void evas_object_release(Evas_Object *obj, int clean_layer);
|
void evas_object_release(Evas_Object *obj, int clean_layer);
|
||||||
|
|
Loading…
Reference in New Issue