forked from enlightenment/efl
evas/edje/elm: Remove all uses of clipped groups
This removes the uses of the *EO* class, obviously not the use of the clipped smart objects.
This commit is contained in:
parent
71e122424e
commit
8572cd5def
|
@ -2,7 +2,7 @@ import edje_types;
|
||||||
|
|
||||||
// FIXME: This EO doc needs a direct link to the "edcref" doc
|
// FIXME: This EO doc needs a direct link to the "edcref" doc
|
||||||
|
|
||||||
class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
|
class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
|
||||||
Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc,
|
Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc,
|
||||||
Efl.Canvas.Layout_Signal, Efl.Canvas.Layout_Group,
|
Efl.Canvas.Layout_Signal, Efl.Canvas.Layout_Group,
|
||||||
Efl.Player)
|
Efl.Player)
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
#include "edje_private.h"
|
#include "edje_private.h"
|
||||||
|
|
||||||
#include <Eo.h>
|
|
||||||
|
|
||||||
#ifdef MY_CLASS
|
#ifdef MY_CLASS
|
||||||
# undef MY_CLASS
|
# undef MY_CLASS
|
||||||
#endif
|
#endif
|
||||||
|
@ -32,6 +30,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
|
||||||
Evas *e;
|
Evas *e;
|
||||||
void *tmp;
|
void *tmp;
|
||||||
|
|
||||||
|
efl_canvas_group_unclipped_set(obj, EINA_FALSE);
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
ed->base = evas_object_smart_data_get(obj);
|
ed->base = evas_object_smart_data_get(obj);
|
||||||
|
|
|
@ -198,6 +198,7 @@ _elm_pan_add(Evas *evas)
|
||||||
EOLIAN static Eo *
|
EOLIAN static Eo *
|
||||||
_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
|
_elm_pan_efl_object_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
efl_canvas_group_unclipped_set(obj, EINA_FALSE);
|
||||||
obj = efl_constructor(efl_super(obj, MY_PAN_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_PAN_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Elm.Pan (Efl.Canvas.Group.Clipped)
|
class Elm.Pan (Efl.Canvas.Group)
|
||||||
{
|
{
|
||||||
[[Elementary pan class]]
|
[[Elementary pan class]]
|
||||||
legacy_prefix: elm_pan;
|
legacy_prefix: elm_pan;
|
||||||
|
|
|
@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; [[Evas object box layout
|
||||||
type @extern Eina_Free_Cb: __undefined_type; [[Eina free callback type]] /* FIXME: Function pointers are not supported */
|
type @extern Eina_Free_Cb: __undefined_type; [[Eina free callback type]] /* FIXME: Function pointers are not supported */
|
||||||
type @extern va_list: __undefined_type; [[va_list type]] /* FIXME: va_list is not supported */
|
type @extern va_list: __undefined_type; [[va_list type]] /* FIXME: va_list is not supported */
|
||||||
|
|
||||||
class Evas.Box (Efl.Canvas.Group.Clipped)
|
class Evas.Box (Efl.Canvas.Group)
|
||||||
{
|
{
|
||||||
[[Evas box class]]
|
[[Evas box class]]
|
||||||
legacy_prefix: evas_object_box;
|
legacy_prefix: evas_object_box;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Evas.Grid (Efl.Canvas.Group.Clipped)
|
class Evas.Grid (Efl.Canvas.Group)
|
||||||
{
|
{
|
||||||
[[Evas grid class]]
|
[[Evas grid class]]
|
||||||
legacy_prefix: evas_object_grid;
|
legacy_prefix: evas_object_grid;
|
||||||
|
|
|
@ -484,6 +484,7 @@ evas_object_box_add(Evas *evas)
|
||||||
EOLIAN static Eo *
|
EOLIAN static Eo *
|
||||||
_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
|
_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
efl_canvas_group_unclipped_set(obj, EINA_FALSE);
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _signals);
|
evas_object_smart_callbacks_descriptions_set(obj, _signals);
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
|
|
|
@ -285,6 +285,7 @@ evas_object_grid_add(Evas *evas)
|
||||||
EOLIAN static Eo *
|
EOLIAN static Eo *
|
||||||
_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
|
_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
efl_canvas_group_unclipped_set(obj, EINA_FALSE);
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
|
evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
|
||||||
|
|
||||||
|
|
|
@ -988,6 +988,7 @@ evas_object_table_add(Evas *evas)
|
||||||
EOLIAN static Eo *
|
EOLIAN static Eo *
|
||||||
_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
|
_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
efl_canvas_group_unclipped_set(obj, EINA_FALSE);
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode {
|
||||||
item = 2 [[Item mode]]
|
item = 2 [[Item mode]]
|
||||||
}
|
}
|
||||||
|
|
||||||
class Evas.Table (Efl.Canvas.Group.Clipped)
|
class Evas.Table (Efl.Canvas.Group)
|
||||||
{
|
{
|
||||||
[[Evas table class]]
|
[[Evas table class]]
|
||||||
legacy_prefix: evas_object_table;
|
legacy_prefix: evas_object_table;
|
||||||
|
|
Loading…
Reference in New Issue