vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix eo compilation. 

This commit applies the following efl commits.

Evas: Move smart_callbacks_descriptions to legacy
Evas: Rename smart object into Efl.Canvas.Group
This commit is contained in:
Jaehyun Cho 2016-06-19 12:44:09 +09:00
parent 86c531cad8
commit 9e98077d30
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/enventor_object.eo
View File

@ -297,15 +297,15 @@ class Enventor.Object (Elm.Widget, Efl.File) {
implements {
class.constructor;
Eo.Base.constructor;
Evas.Object.Smart.add;
Evas.Object.Smart.del;
Evas.Object.Smart.move;
Evas.Object.Smart.resize;
Evas.Object.Smart.show;
Evas.Object.Smart.hide;
Evas.Object.Smart.clip.set;
Evas.Object.Smart.clip_unset;
Evas.Object.Smart.member_add;
Efl.Canvas.Group.group_add;
Efl.Canvas.Group.group_del;
Efl.Canvas.Group.group_move;
Efl.Canvas.Group.group_resize;
Efl.Canvas.Group.group_show;
Efl.Canvas.Group.group_hide;
Efl.Canvas.Group.group_clip.set;
Efl.Canvas.Group.group_clip_unset;
Efl.Canvas.Group.group_member_add;
Efl.File.file.set;
}
events {

25
src/lib/enventor_smart.c
View File

@ -223,12 +223,12 @@ _enventor_object_class_constructor(Eo_Class *klass)
}
EOLIAN static void
_enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd)
_enventor_object_efl_canvas_group_group_add(Eo *obj, Enventor_Object_Data *pd)
{
pd->obj = obj;
elm_widget_sub_object_parent_add(obj);
evas_obj_smart_add(eo_super(obj, MY_CLASS));
efl_canvas_group_add(eo_super(obj, MY_CLASS));
build_init();
autocomp_init();
@ -254,8 +254,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd)
}
EOLIAN static void
_enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED,
Enventor_Object_Data *pd)
_enventor_object_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
{
eina_stringshare_del(pd->font_name);
eina_stringshare_del(pd->font_style);
@ -270,9 +269,9 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED,
}
EOLIAN static void
_enventor_object_evas_object_smart_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child)
_enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child)
{
evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child);
efl_canvas_group_member_add(eo_super(obj, MY_CLASS), child);
if (evas_object_visible_get(obj)) evas_object_show(child);
else evas_object_hide(child);
@ -286,7 +285,7 @@ _enventor_object_evas_object_smart_member_add(Eo *obj, Enventor_Object_Data *pd
}
EOLIAN static void
_enventor_object_evas_object_smart_move(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord x, Evas_Coord y)
_enventor_object_efl_canvas_group_group_move(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord x, Evas_Coord y)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -294,7 +293,7 @@ _enventor_object_evas_object_smart_move(Evas_Object *obj EINA_UNUSED, Enventor_O
}
EOLIAN static void
_enventor_object_evas_object_smart_resize(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord w, Evas_Coord h)
_enventor_object_efl_canvas_group_group_resize(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Coord w, Evas_Coord h)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -302,7 +301,7 @@ _enventor_object_evas_object_smart_resize(Evas_Object *obj EINA_UNUSED, Enventor
}
EOLIAN static void
_enventor_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
_enventor_object_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -310,7 +309,7 @@ _enventor_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Enventor_O
}
EOLIAN static void
_enventor_object_evas_object_smart_hide(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
_enventor_object_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -318,7 +317,7 @@ _enventor_object_evas_object_smart_hide(Evas_Object *obj EINA_UNUSED, Enventor_O
}
EOLIAN static void
_enventor_object_evas_object_smart_clip_set(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Object *clip)
_enventor_object_efl_canvas_group_group_clip_set(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd, Evas_Object *clip)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -326,7 +325,7 @@ _enventor_object_evas_object_smart_clip_set(Evas_Object *obj EINA_UNUSED, Envent
}
EOLIAN static void
_enventor_object_evas_object_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
_enventor_object_efl_canvas_group_group_clip_unset(Evas_Object *obj EINA_UNUSED, Enventor_Object_Data *pd)
{
//Main Item
Evas_Object *o = edit_obj_get(pd->main_it.ed);
@ -339,7 +338,7 @@ _enventor_object_eo_base_constructor(Eo *obj,
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
return obj;
}