summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-18 17:52:17 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-19 14:07:00 +0900
commit55b529cebc113dd66906ce39034299df97a2a2ed (patch)
tree5b74383d2638bc7d46e709884c62653131db33a0
parent2cdc02b03c3a45c825cdd116a8f348b5673131dd (diff)
evas/elm: Make group_add/group_del internal functions
This hides those two legacy functions from the EO API.
-rw-r--r--src/lib/edje/edje_edit.c5
-rw-r--r--src/lib/edje/edje_edit.eo1
-rw-r--r--src/lib/edje/edje_object.eo2
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_smart.c3
-rw-r--r--src/lib/elementary/efl_ui_box.c5
-rw-r--r--src/lib/elementary/efl_ui_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_clock.c5
-rw-r--r--src/lib/elementary/efl_ui_clock.eo2
-rw-r--r--src/lib/elementary/efl_ui_flip.c5
-rw-r--r--src/lib/elementary/efl_ui_flip.eo2
-rw-r--r--src/lib/elementary/efl_ui_frame.c5
-rw-r--r--src/lib/elementary/efl_ui_frame.eo1
-rw-r--r--src/lib/elementary/efl_ui_grid.c5
-rw-r--r--src/lib/elementary/efl_ui_grid.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c5
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c5
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c5
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.c5
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/efl_ui_win.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c6
-rw-r--r--src/lib/elementary/elc_ctxpopup.c5
-rw-r--r--src/lib/elementary/elc_fileselector.c3
-rw-r--r--src/lib/elementary/elc_fileselector_button.c5
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c5
-rw-r--r--src/lib/elementary/elc_hoversel.c5
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c5
-rw-r--r--src/lib/elementary/elc_naviframe.c5
-rw-r--r--src/lib/elementary/elc_player.c5
-rw-r--r--src/lib/elementary/elc_popup.c5
-rw-r--r--src/lib/elementary/elm_access.c5
-rw-r--r--src/lib/elementary/elm_access.eo1
-rw-r--r--src/lib/elementary/elm_actionslider.c5
-rw-r--r--src/lib/elementary/elm_actionslider.eo1
-rw-r--r--src/lib/elementary/elm_bg.c5
-rw-r--r--src/lib/elementary/elm_bg.eo1
-rw-r--r--src/lib/elementary/elm_box.c5
-rw-r--r--src/lib/elementary/elm_box.eo2
-rw-r--r--src/lib/elementary/elm_bubble.c5
-rw-r--r--src/lib/elementary/elm_bubble.eo1
-rw-r--r--src/lib/elementary/elm_button.c5
-rw-r--r--src/lib/elementary/elm_button.eo1
-rw-r--r--src/lib/elementary/elm_calendar.c5
-rw-r--r--src/lib/elementary/elm_calendar.eo2
-rw-r--r--src/lib/elementary/elm_check.c5
-rw-r--r--src/lib/elementary/elm_check.eo1
-rw-r--r--src/lib/elementary/elm_clock.c5
-rw-r--r--src/lib/elementary/elm_clock.eo2
-rw-r--r--src/lib/elementary/elm_code_widget.c5
-rw-r--r--src/lib/elementary/elm_code_widget.eo1
-rw-r--r--src/lib/elementary/elm_colorselector.c5
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_combobox.eo2
-rw-r--r--src/lib/elementary/elm_conform.c5
-rw-r--r--src/lib/elementary/elm_conformant.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_dayselector.c5
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.c5
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_entry.c5
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_flipselector.c5
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.c5
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c11
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo1
-rw-r--r--src/lib/elementary/elm_gesture_layer.c5
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo2
-rw-r--r--src/lib/elementary/elm_glview.c6
-rw-r--r--src/lib/elementary/elm_glview.eo2
-rw-r--r--src/lib/elementary/elm_grid.c5
-rw-r--r--src/lib/elementary/elm_grid.eo2
-rw-r--r--src/lib/elementary/elm_hover.c5
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_icon.c5
-rw-r--r--src/lib/elementary/elm_icon.eo2
-rw-r--r--src/lib/elementary/elm_index.c5
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c8
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo2
-rw-r--r--src/lib/elementary/elm_inwin.c5
-rw-r--r--src/lib/elementary/elm_inwin.eo1
-rw-r--r--src/lib/elementary/elm_label.c5
-rw-r--r--src/lib/elementary/elm_label.eo1
-rw-r--r--src/lib/elementary/elm_layout.c4
-rw-r--r--src/lib/elementary/elm_layout.eo2
-rw-r--r--src/lib/elementary/elm_list.c5
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_map.c5
-rw-r--r--src/lib/elementary/elm_map.eo2
-rw-r--r--src/lib/elementary/elm_mapbuf.c5
-rw-r--r--src/lib/elementary/elm_mapbuf.eo2
-rw-r--r--src/lib/elementary/elm_menu.c5
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_notify.c5
-rw-r--r--src/lib/elementary/elm_notify.eo2
-rw-r--r--src/lib/elementary/elm_pan.eo2
-rw-r--r--src/lib/elementary/elm_panel.c5
-rw-r--r--src/lib/elementary/elm_panel.eo2
-rw-r--r--src/lib/elementary/elm_panes.c5
-rw-r--r--src/lib/elementary/elm_panes.eo1
-rw-r--r--src/lib/elementary/elm_photo.c5
-rw-r--r--src/lib/elementary/elm_photo.eo2
-rw-r--r--src/lib/elementary/elm_photocam.c5
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/elementary/elm_player.eo2
-rw-r--r--src/lib/elementary/elm_plug.c5
-rw-r--r--src/lib/elementary/elm_plug.eo1
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_prefs.c5
-rw-r--r--src/lib/elementary/elm_prefs.eo2
-rw-r--r--src/lib/elementary/elm_progressbar.c5
-rw-r--r--src/lib/elementary/elm_progressbar.eo2
-rw-r--r--src/lib/elementary/elm_radio.c5
-rw-r--r--src/lib/elementary/elm_radio.eo2
-rw-r--r--src/lib/elementary/elm_route.c5
-rw-r--r--src/lib/elementary/elm_route.eo2
-rw-r--r--src/lib/elementary/elm_scroller.c5
-rw-r--r--src/lib/elementary/elm_scroller.eo1
-rw-r--r--src/lib/elementary/elm_segment_control.c5
-rw-r--r--src/lib/elementary/elm_segment_control.eo2
-rw-r--r--src/lib/elementary/elm_separator.c5
-rw-r--r--src/lib/elementary/elm_separator.eo1
-rw-r--r--src/lib/elementary/elm_slider.c5
-rw-r--r--src/lib/elementary/elm_slider.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.c5
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_spinner.c5
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_table.c5
-rw-r--r--src/lib/elementary/elm_table.eo2
-rw-r--r--src/lib/elementary/elm_thumb.c5
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c6
-rw-r--r--src/lib/elementary/elm_toolbar.eo2
-rw-r--r--src/lib/elementary/elm_widget.c5
-rw-r--r--src/lib/elementary/elm_widget.eo2
-rw-r--r--src/lib/emotion/efl_canvas_video.eo2
-rw-r--r--src/lib/emotion/emotion_smart.c6
-rw-r--r--src/lib/evas/Evas_Internal.h7
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_clipped.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c5
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c5
-rw-r--r--src/lib/evas/canvas/evas_object_table.c5
-rw-r--r--src/lib/evas/canvas/evas_table.eo2
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c5
-rw-r--r--src/modules/elementary/web/none/elm_web_none.eo1
164 files changed, 418 insertions, 156 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 2afa596..2149206 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -16787,4 +16787,9 @@ edje_edit_print_internal_status(Evas_Object *obj)
16787 */ 16787 */
16788} 16788}
16789 16789
16790/* Internal EO APIs and hidden overrides */
16791
16792#define EDJE_EDIT_EXTRA_OPS \
16793 EFL_CANVAS_GROUP_DEL_OPS(edje_edit)
16794
16790#include "edje_edit.eo.c" 16795#include "edje_edit.eo.c"
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index 0d87b32..297120e 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -10,7 +10,6 @@ class Edje.Edit (Edje.Object)
10 implements { 10 implements {
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Canvas.Group.group_del;
14 Efl.File.file { set; } 13 Efl.File.file { set; }
15 Efl.File.mmap { set; } 14 Efl.File.mmap { set; }
16 } 15 }
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 0a0fea9..18e2dcf 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -2109,8 +2109,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
2109 Efl.Object.destructor; 2109 Efl.Object.destructor;
2110 Efl.Canvas.Object.no_render { set; } 2110 Efl.Canvas.Object.no_render { set; }
2111 Efl.Canvas.Object.paragraph_direction { set; } 2111 Efl.Canvas.Object.paragraph_direction { set; }
2112 Efl.Canvas.Group.group_add;
2113 Efl.Canvas.Group.group_del;
2114 Efl.Canvas.Group.group_calculate; 2112 Efl.Canvas.Group.group_calculate;
2115 Efl.File.file { get; set; } 2113 Efl.File.file { get; set; }
2116 Efl.File.mmap { get; set; } 2114 Efl.File.mmap { get; set; }
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 94c994a..6b9da86 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -45,6 +45,7 @@
45#include <Eet.h> 45#include <Eet.h>
46#include <Eo.h> 46#include <Eo.h>
47#include <Evas.h> 47#include <Evas.h>
48#include <Evas_Internal.h>
48#include <Ecore.h> 49#include <Ecore.h>
49#include <Ecore_Evas.h> 50#include <Ecore_Evas.h>
50#include <Ecore_File.h> 51#include <Ecore_File.h>
@@ -65,6 +66,7 @@
65#endif 66#endif
66 67
67#include "Edje.h" 68#include "Edje.h"
69
68#ifdef EAPI 70#ifdef EAPI
69# undef EAPI 71# undef EAPI
70#endif 72#endif
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 6c42369..c14aed1 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -546,7 +546,10 @@ _edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs,
546 } 546 }
547} 547}
548 548
549/* Internal EO APIs and hidden overrides */
550
549#define EDJE_OBJECT_EXTRA_OPS \ 551#define EDJE_OBJECT_EXTRA_OPS \
552 EFL_CANVAS_GROUP_ADD_DEL_OPS(edje_object), \
550 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _edje_object_efl_object_dbg_info_get) 553 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _edje_object_efl_object_dbg_info_get)
551 554
552#include "edje_object.eo.c" 555#include "edje_object.eo.c"
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 499d33e..845061a 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -610,4 +610,9 @@ _efl_ui_box_efl_pack_pack_align_get(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd, do
610 if (v) *v = pd->align.v; 610 if (v) *v = pd->align.v;
611} 611}
612 612
613/* Internal EO APIs and hidden overrides */
614
615#define EFL_UI_BOX_EXTRA_OPS \
616 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_box)
617
613#include "efl_ui_box.eo.c" 618#include "efl_ui_box.eo.c"
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index f0b68ba..71d963a 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -4,8 +4,6 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
4 [[Efl UI box class]] 4 [[Efl UI box class]]
5 implements { 5 implements {
6 Efl.Object.constructor; 6 Efl.Object.constructor;
7 Efl.Canvas.Group.group_add;
8 Efl.Canvas.Group.group_del;
9 Efl.Canvas.Group.group_calculate; 7 Efl.Canvas.Group.group_calculate;
10 Elm.Widget.focus_direction; 8 Elm.Widget.focus_direction;
11 Elm.Widget.focus_next_manager_is; 9 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index fbdec4b..b93ed4b 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -1202,4 +1202,9 @@ _efl_ui_clock_class_constructor(Efl_Class *klass)
1202 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1202 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1203} 1203}
1204 1204
1205/* Internal EO APIs and hidden overrides */
1206
1207#define EFL_UI_CLOCK_EXTRA_OPS \
1208 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_clock)
1209
1205#include "efl_ui_clock.eo.c" 1210#include "efl_ui_clock.eo.c"
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index ed7d609..9ac84ad 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -244,8 +244,6 @@ class Efl.Ui.Clock (Elm.Layout)
244 implements { 244 implements {
245 class.constructor; 245 class.constructor;
246 Efl.Object.constructor; 246 Efl.Object.constructor;
247 Efl.Canvas.Group.group_add;
248 Efl.Canvas.Group.group_del;
249 Elm.Widget.theme_apply; 247 Elm.Widget.theme_apply;
250 Elm.Widget.focus_next_manager_is; 248 Elm.Widget.focus_next_manager_is;
251 Elm.Widget.focus_next; 249 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index fc8c3d7..d6d1ac4 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2404,4 +2404,9 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm
2404 2404
2405/* Efl.Part end */ 2405/* Efl.Part end */
2406 2406
2407/* Internal EO APIs and hidden overrides */
2408
2409#define EFL_UI_FLIP_EXTRA_OPS \
2410 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip)
2411
2407#include "efl_ui_flip.eo.c" 2412#include "efl_ui_flip.eo.c"
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index c035081..f7b728b 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -229,8 +229,6 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
229 implements { 229 implements {
230 class.constructor; 230 class.constructor;
231 Efl.Object.constructor; 231 Efl.Object.constructor;
232 Efl.Canvas.Group.group_add;
233 Efl.Canvas.Group.group_del;
234 Elm.Widget.focus_direction; 232 Elm.Widget.focus_direction;
235 Elm.Widget.sub_object_add; 233 Elm.Widget.sub_object_add;
236 Elm.Widget.theme_apply; 234 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index e0568f5..a64673c 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -267,4 +267,9 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
267 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 267 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
268} 268}
269 269
270/* Internal EO APIs and hidden overrides */
271
272#define EFL_UI_FRAME_EXTRA_OPS \
273 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame)
274
270#include "efl_ui_frame.eo.c" 275#include "efl_ui_frame.eo.c"
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 367af5d..7050d48 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -56,7 +56,6 @@ class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable)
56 Efl.Object.constructor; 56 Efl.Object.constructor;
57 class.constructor; 57 class.constructor;
58 Efl.Canvas.Group.group_calculate; 58 Efl.Canvas.Group.group_calculate;
59 Efl.Canvas.Group.group_add;
60 Elm.Widget.focus_direction; 59 Elm.Widget.focus_direction;
61 Elm.Widget.focus_next_manager_is; 60 Elm.Widget.focus_next_manager_is;
62 Elm.Widget.focus_next; 61 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 50299c2..fda6545 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -798,4 +798,9 @@ _efl_ui_grid_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *su
798 return _pack_at(obj, pd, subobj, col, row, 1, 1, EINA_TRUE); 798 return _pack_at(obj, pd, subobj, col, row, 1, 1, EINA_TRUE);
799} 799}
800 800
801/* Internal EO APIs and hidden overrides */
802
803#define EFL_UI_GRID_EXTRA_OPS \
804 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_grid)
805
801#include "efl_ui_grid.eo.c" 806#include "efl_ui_grid.eo.c"
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 746ff45..6e330a4 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -4,8 +4,6 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout,
4 [[Efl UI grid class]] 4 [[Efl UI grid class]]
5 implements { 5 implements {
6 Efl.Object.constructor; 6 Efl.Object.constructor;
7 Efl.Canvas.Group.group_add;
8 Efl.Canvas.Group.group_del;
9 Efl.Canvas.Group.group_calculate; 7 Efl.Canvas.Group.group_calculate;
10 Elm.Widget.focus_direction; 8 Elm.Widget.focus_direction;
11 Elm.Widget.focus_next_manager_is; 9 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 9b59638..a41a835 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2218,4 +2218,9 @@ elm_image_aspect_fixed_get(const Evas_Object *obj)
2218 return sd->aspect_fixed; 2218 return sd->aspect_fixed;
2219} 2219}
2220 2220
2221/* Internal EO APIs and hidden overrides */
2222
2223#define EFL_UI_IMAGE_EXTRA_OPS \
2224 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_image)
2225
2221#include "efl_ui_image.eo.c" 2226#include "efl_ui_image.eo.c"
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index d559f85..f5f5930 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -140,8 +140,6 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
140 Edje.Object.size_min_calc; 140 Edje.Object.size_min_calc;
141 Edje.Object.calc_force; 141 Edje.Object.calc_force;
142 Efl.Canvas.Object.clip { set; } 142 Efl.Canvas.Object.clip { set; }
143 Efl.Canvas.Group.group_add;
144 Efl.Canvas.Group.group_del;
145 Efl.Canvas.Group.group_member_add; 143 Efl.Canvas.Group.group_member_add;
146 Efl.Ui.Draggable.drag_target { get; set; } 144 Efl.Ui.Draggable.drag_target { get; set; }
147 Efl.Ui.Model.Connect.connect; 145 Efl.Ui.Model.Connect.connect;
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index ec47e19..271a4b1 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -186,4 +186,9 @@ _efl_ui_nstate_class_constructor(Efl_Class *klass)
186 evas_smart_legacy_type_register(MY_CLASS_NAME, klass); 186 evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
187} 187}
188 188
189/* Internal EO APIs and hidden overrides */
190
191#define EFL_UI_NSTATE_EXTRA_OPS \
192 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_nstate)
193
189#include "efl_ui_nstate.eo.c" 194#include "efl_ui_nstate.eo.c"
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index 854580a..a3546f6 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -30,8 +30,6 @@ class Efl.Ui.Nstate(Elm.Button)
30 implements { 30 implements {
31 class.constructor; 31 class.constructor;
32 Efl.Object.constructor; 32 Efl.Object.constructor;
33 Efl.Canvas.Group.group_add;
34 Efl.Canvas.Group.group_del;
35 Elm.Widget.theme_apply; 33 Elm.Widget.theme_apply;
36 Elm.Widget.widget_event; 34 Elm.Widget.widget_event;
37 } 35 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 0b7860c..df169d5 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -5629,6 +5629,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
5629/* Efl.Part end */ 5629/* Efl.Part end */
5630#endif 5630#endif
5631 5631
5632/* Internal EO APIs and hidden overrides */
5633
5634#define EFL_UI_TEXT_EXTRA_OPS \
5635 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text)
5636
5632#include "efl_ui_text.eo.c" 5637#include "efl_ui_text.eo.c"
5633 5638
5634#undef MY_CLASS 5639#undef MY_CLASS
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 88e5a50..9a305da 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -404,8 +404,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
404 Efl.Gfx.position { set; } 404 Efl.Gfx.position { set; }
405 Efl.Gfx.size { set; } 405 Efl.Gfx.size { set; }
406 Efl.Canvas.Group.group_member_add; 406 Efl.Canvas.Group.group_member_add;
407 Efl.Canvas.Group.group_add;
408 Efl.Canvas.Group.group_del;
409 Elm.Widget.activate; 407 Elm.Widget.activate;
410 Elm.Widget.focus_direction_manager_is; 408 Elm.Widget.focus_direction_manager_is;
411 Elm.Widget.theme_apply; 409 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 3521310..375ef8b 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -471,4 +471,9 @@ elm_video_play_position_get(const Evas_Object *obj)
471 return efl_player_position_get(obj); 471 return efl_player_position_get(obj);
472} 472}
473 473
474/* Internal EO APIs and hidden overrides */
475
476#define EFL_UI_VIDEO_EXTRA_OPS \
477 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_video)
478
474#include "efl_ui_video.eo.c" 479#include "efl_ui_video.eo.c"
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 88f3ad2..37a0386 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -64,8 +64,6 @@ class Efl.Ui.Video (Elm.Layout, Efl.File,
64 class.constructor; 64 class.constructor;
65 Efl.Object.constructor; 65 Efl.Object.constructor;
66 Efl.File.file { get; set; } 66 Efl.File.file { get; set; }
67 Efl.Canvas.Group.group_add;
68 Efl.Canvas.Group.group_del;
69 Elm.Widget.focus_next_manager_is; 67 Elm.Widget.focus_next_manager_is;
70 Elm.Widget.focus_direction_manager_is; 68 Elm.Widget.focus_direction_manager_is;
71 Elm.Widget.widget_event; 69 Elm.Widget.widget_event;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 05f0559..37f46ff 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -8047,8 +8047,10 @@ elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUS
8047 ERR("Calling deprecrated function '%s'", __FUNCTION__); 8047 ERR("Calling deprecrated function '%s'", __FUNCTION__);
8048} 8048}
8049 8049
8050/* Internal EO APIs */ 8050/* Internal EO APIs and hidden overrides */
8051
8051#define EFL_UI_WIN_EXTRA_OPS \ 8052#define EFL_UI_WIN_EXTRA_OPS \
8053 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_win), \
8052 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_win_efl_canvas_object_legacy_ctor) 8054 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_win_efl_canvas_object_legacy_ctor)
8053 8055
8054#include "efl_ui_win.eo.c" 8056#include "efl_ui_win.eo.c"
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index b99aa75..86a529a 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -930,8 +930,6 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
930 Efl.Gfx.visible { set; } 930 Efl.Gfx.visible { set; }
931 Efl.Gfx.position { set; } 931 Efl.Gfx.position { set; }
932 Efl.Gfx.size { set; } 932 Efl.Gfx.size { set; }
933 Efl.Canvas.Group.group_add;
934 Efl.Canvas.Group.group_del;
935 Elm.Widget.focus_direction; 933 Elm.Widget.focus_direction;
936 Elm.Widget.focus_next_manager_is; 934 Elm.Widget.focus_next_manager_is;
937 Elm.Widget.focus_direction_manager_is; 935 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index fa35008..da41dec 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -559,4 +559,10 @@ _elm_combobox_efl_gfx_size_set(Eo *obj, Elm_Combobox_Data *pd, Evas_Coord w, Eva
559 if (pd->count > 0) _table_resize(obj); 559 if (pd->count > 0) _table_resize(obj);
560 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 560 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h);
561} 561}
562
563/* Internal EO APIs and hidden overrides */
564
565#define ELM_COMBOBOX_EXTRA_OPS \
566 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox)
567
562#include "elm_combobox.eo.c" 568#include "elm_combobox.eo.c"
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index f8f9670..5a3480f 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1568,6 +1568,11 @@ _elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup
1568 return ret; 1568 return ret;
1569} 1569}
1570 1570
1571/* Internal EO APIs and hidden overrides */
1572
1573#define ELM_CTXPOPUP_EXTRA_OPS \
1574 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_ctxpopup)
1575
1571/* Efl.Part begin */ 1576/* Efl.Part begin */
1572 1577
1573ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1578ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 68d5ffe..4f28a99 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -3188,7 +3188,10 @@ _elm_fileselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA
3188 return &atspi_actions[0]; 3188 return &atspi_actions[0];
3189} 3189}
3190 3190
3191/* Internal EO APIs and hidden overrides */
3192
3191#define ELM_FILESELECTOR_EXTRA_OPS \ 3193#define ELM_FILESELECTOR_EXTRA_OPS \
3194 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_fileselector), \
3192 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _elm_fileselector_efl_object_event_callback_legacy_call) 3195 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _elm_fileselector_efl_object_event_callback_legacy_call)
3193 3196
3194#include "elm_fileselector.eo.c" 3197#include "elm_fileselector.eo.c"
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index d098c94..e02691c 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -663,4 +663,9 @@ elm_fileselector_button_inwin_mode_get(const Eo *obj)
663 return sd->inwin_mode; 663 return sd->inwin_mode;
664} 664}
665 665
666/* Internal EO APIs and hidden overrides */
667
668#define ELM_FILESELECTOR_BUTTON_EXTRA_OPS \
669 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_fileselector_button)
670
666#include "elm_fileselector_button.eo.c" 671#include "elm_fileselector_button.eo.c"
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index e5632c1..2f011b7 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -685,4 +685,9 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY,
685 685
686/* Efl.Part end */ 686/* Efl.Part end */
687 687
688/* Internal EO APIs and hidden overrides */
689
690#define ELM_FILESELECTOR_ENTRY_EXTRA_OPS \
691 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_fileselector_entry)
692
688#include "elm_fileselector_entry.eo.c" 693#include "elm_fileselector_entry.eo.c"
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 5606dee..aaedfa5 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -1047,5 +1047,10 @@ _elm_hoversel_auto_update_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
1047 return sd->auto_update; 1047 return sd->auto_update;
1048} 1048}
1049 1049
1050/* Internal EO APIs and hidden overrides */
1051
1052#define ELM_HOVERSEL_EXTRA_OPS \
1053 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hoversel)
1054
1050#include "elm_hoversel_item.eo.c" 1055#include "elm_hoversel_item.eo.c"
1051#include "elm_hoversel.eo.c" 1056#include "elm_hoversel.eo.c"
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 29a4c1e..f3098ea 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -2101,5 +2101,10 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo
2101 return &atspi_actions[0]; 2101 return &atspi_actions[0];
2102} 2102}
2103 2103
2104/* Internal EO APIs and hidden overrides */
2105
2106#define ELM_MULTIBUTTONENTRY_EXTRA_OPS \
2107 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_multibuttonentry)
2108
2104#include "elm_multibuttonentry_item.eo.c" 2109#include "elm_multibuttonentry_item.eo.c"
2105#include "elm_multibuttonentry.eo.c" 2110#include "elm_multibuttonentry.eo.c"
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index fb9f988..dbae4ec 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -2078,5 +2078,10 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Na
2078 2078
2079/* Efl.Part end */ 2079/* Efl.Part end */
2080 2080
2081/* Internal EO APIs and hidden overrides */
2082
2083#define ELM_NAVIFRAME_EXTRA_OPS \
2084 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_naviframe)
2085
2081#include "elm_naviframe_item.eo.c" 2086#include "elm_naviframe_item.eo.c"
2082#include "elm_naviframe.eo.c" 2087#include "elm_naviframe.eo.c"
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index ff0c166..a8725a2 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -713,4 +713,9 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, ELM_LAYOUT, Elm_Player_Dat
713 713
714/* End of Efl.Part */ 714/* End of Efl.Part */
715 715
716/* Internal EO APIs and hidden overrides */
717
718#define ELM_PLAYER_EXTRA_OPS \
719 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_player)
720
716#include "elm_player.eo.c" 721#include "elm_player.eo.c"
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index dcb78a3..9f97205 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1896,5 +1896,10 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data
1896 1896
1897/* Efl.Part end */ 1897/* Efl.Part end */
1898 1898
1899/* Internal EO APIs and hidden overrides */
1900
1901#define ELM_POPUP_EXTRA_OPS \
1902 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup)
1903
1899#include "elm_popup.eo.c" 1904#include "elm_popup.eo.c"
1900#include "elm_popup_item.eo.c" 1905#include "elm_popup_item.eo.c"
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 482ee98..c3c6534 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -1508,4 +1508,9 @@ _elm_access_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
1508 return &atspi_actions[0]; 1508 return &atspi_actions[0];
1509} 1509}
1510 1510
1511/* Internal EO APIs and hidden overrides */
1512
1513#define ELM_ACCESS_EXTRA_OPS \
1514 EFL_CANVAS_GROUP_ADD_OPS(elm_access)
1515
1511#include "elm_access.eo.c" 1516#include "elm_access.eo.c"
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index b92bc65..fac2667 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -7,7 +7,6 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action)
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Efl.Object.constructor; 9 Efl.Object.constructor;
10 Efl.Canvas.Group.group_add;
11 Elm.Widget.activate; 10 Elm.Widget.activate;
12 Elm.Widget.on_focus; 11 Elm.Widget.on_focus;
13 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 12 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 3823965..e3e09db 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -654,4 +654,9 @@ _elm_actionslider_class_constructor(Efl_Class *klass)
654 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 654 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
655} 655}
656 656
657/* Internal EO APIs and hidden overrides */
658
659#define ELM_ACTIONSLIDER_EXTRA_OPS \
660 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
661
657#include "elm_actionslider.eo.c" 662#include "elm_actionslider.eo.c"
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index aec874f..c7d4328 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -71,7 +71,6 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
71 implements { 71 implements {
72 class.constructor; 72 class.constructor;
73 Efl.Object.constructor; 73 Efl.Object.constructor;
74 Efl.Canvas.Group.group_add;
75 Elm.Widget.focus_next_manager_is; 74 Elm.Widget.focus_next_manager_is;
76 Elm.Widget.focus_direction_manager_is; 75 Elm.Widget.focus_direction_manager_is;
77 Elm.Widget.theme_apply; 76 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index b2d5eb9..1d16674 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -286,4 +286,9 @@ elm_bg_file_get(const Eo *obj, const char **file, const char **group)
286 efl_file_get((Eo *) obj, file, group); 286 efl_file_get((Eo *) obj, file, group);
287} 287}
288 288
289/* Internal EO APIs and hidden overrides */
290
291#define ELM_BG_EXTRA_OPS \
292 EFL_CANVAS_GROUP_ADD_OPS(elm_bg)
293
289#include "elm_bg.eo.c" 294#include "elm_bg.eo.c"
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index 3ab8aaf..7bc2f61 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -96,7 +96,6 @@ class Elm.Bg (Elm.Layout, Efl.File)
96 implements { 96 implements {
97 class.constructor; 97 class.constructor;
98 Efl.Object.constructor; 98 Efl.Object.constructor;
99 Efl.Canvas.Group.group_add;
100 Elm.Layout.content_aliases { get; } 99 Elm.Layout.content_aliases { get; }
101 Elm.Layout.sizing_eval; 100 Elm.Layout.sizing_eval;
102 Efl.File.file { get; set; } 101 Efl.File.file { get; set; }
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index f41815b..56759d8 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -726,4 +726,9 @@ _elm_box_elm_widget_focus_register(Eo *obj, Elm_Box_Data *pd, Efl_Ui_Focus_Manag
726 return result; 726 return result;
727} 727}
728 728
729/* Internal EO APIs and hidden overrides */
730
731#define ELM_BOX_EXTRA_OPS \
732 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_box)
733
729#include "elm_box.eo.c" 734#include "elm_box.eo.c"
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 7de0900..fa68f07 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -286,8 +286,6 @@ class Elm.Box (Elm.Widget)
286 implements { 286 implements {
287 class.constructor; 287 class.constructor;
288 Efl.Object.constructor; 288 Efl.Object.constructor;
289 Efl.Canvas.Group.group_add;
290 Efl.Canvas.Group.group_del;
291 Efl.Canvas.Group.group_calculate; 289 Efl.Canvas.Group.group_calculate;
292 Elm.Widget.focus_direction; 290 Elm.Widget.focus_direction;
293 Elm.Widget.focus_next_manager_is; 291 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 5da0b3c..15d67e4 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -288,4 +288,9 @@ _elm_bubble_class_constructor(Efl_Class *klass)
288 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 288 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
289} 289}
290 290
291/* Internal EO APIs and hidden overrides */
292
293#define ELM_BUBBLE_EXTRA_OPS \
294 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
295
291#include "elm_bubble.eo.c" 296#include "elm_bubble.eo.c"
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 5fed65a..2c0efba 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -38,7 +38,6 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
38 implements { 38 implements {
39 class.constructor; 39 class.constructor;
40 Efl.Object.constructor; 40 Efl.Object.constructor;
41 Efl.Canvas.Group.group_add;
42 Elm.Widget.focus_direction; 41 Elm.Widget.focus_direction;
43 Elm.Widget.focus_next_manager_is; 42 Elm.Widget.focus_next_manager_is;
44 Elm.Widget.focus_next; 43 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index f8858fc..2ca0ae8 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -491,4 +491,9 @@ elm_button_autorepeat_get(const Evas_Object *obj)
491 return efl_ui_autorepeat_enabled_get(obj); 491 return efl_ui_autorepeat_enabled_get(obj);
492} 492}
493 493
494/* Internal EO APIs and hidden overrides */
495
496#define ELM_BUTTON_EXTRA_OPS \
497 EFL_CANVAS_GROUP_ADD_OPS(elm_button)
498
494#include "elm_button.eo.c" 499#include "elm_button.eo.c"
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index 85962f1..9489e6c 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -13,7 +13,6 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
13 implements { 13 implements {
14 class.constructor; 14 class.constructor;
15 Efl.Object.constructor; 15 Efl.Object.constructor;
16 Efl.Canvas.Group.group_add;
17 Efl.Ui.Autorepeat.autorepeat_initial_timeout { set; get; } 16 Efl.Ui.Autorepeat.autorepeat_initial_timeout { set; get; }
18 Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; } 17 Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; }
19 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; } 18 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; }
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index aeb5eb1..f2ebc80 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -2334,4 +2334,9 @@ _elm_calendar_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
2334 return &atspi_actions[0]; 2334 return &atspi_actions[0];
2335} 2335}
2336 2336
2337/* Internal EO APIs and hidden overrides */
2338
2339#define ELM_CALENDAR_EXTRA_OPS \
2340 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_calendar)
2341
2337#include "elm_calendar.eo.c" 2342#include "elm_calendar.eo.c"
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 8d200be..0db7e22 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -412,8 +412,6 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
412 class.constructor; 412 class.constructor;
413 Efl.Object.constructor; 413 Efl.Object.constructor;
414 Efl.Canvas.Group.group_calculate; 414 Efl.Canvas.Group.group_calculate;
415 Efl.Canvas.Group.group_add;
416 Efl.Canvas.Group.group_del;
417 Elm.Widget.theme_apply; 415 Elm.Widget.theme_apply;
418 Elm.Widget.focus_next_manager_is; 416 Elm.Widget.focus_next_manager_is;
419 Elm.Widget.focus_direction_manager_is; 417 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index 6aefe55..4e2b746 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -432,4 +432,9 @@ _elm_check_class_constructor(Efl_Class *klass)
432 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 432 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
433} 433}
434 434
435/* Internal EO APIs and hidden overrides */
436
437#define ELM_CHECK_EXTRA_OPS \
438 EFL_CANVAS_GROUP_ADD_OPS(elm_check)
439
435#include "elm_check.eo.c" 440#include "elm_check.eo.c"
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo
index a3a99e3..e67ddf5 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/elm_check.eo
@@ -24,7 +24,6 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
24 implements { 24 implements {
25 class.constructor; 25 class.constructor;
26 Efl.Object.constructor; 26 Efl.Object.constructor;
27 Efl.Canvas.Group.group_add;
28 Elm.Widget.activate; 27 Elm.Widget.activate;
29 Elm.Widget.theme_apply; 28 Elm.Widget.theme_apply;
30 Elm.Widget.sub_object_del; 29 Elm.Widget.sub_object_del;
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 9e815e4..0ca59dd 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -957,4 +957,9 @@ _elm_clock_class_constructor(Efl_Class *klass)
957 _elm_clock_smart_focus_next_enable = EINA_TRUE; 957 _elm_clock_smart_focus_next_enable = EINA_TRUE;
958} 958}
959 959
960/* Internal EO APIs and hidden overrides */
961
962#define ELM_CLOCK_EXTRA_OPS \
963 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_clock)
964
960#include "elm_clock.eo.c" 965#include "elm_clock.eo.c"
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 004eb96..c2f5007 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -163,8 +163,6 @@ class Elm.Clock (Elm.Layout)
163 implements { 163 implements {
164 class.constructor; 164 class.constructor;
165 Efl.Object.constructor; 165 Efl.Object.constructor;
166 Efl.Canvas.Group.group_add;
167 Efl.Canvas.Group.group_del;
168 Elm.Widget.focus_next_manager_is; 166 Elm.Widget.focus_next_manager_is;
169 Elm.Widget.focus_direction_manager_is; 167 Elm.Widget.focus_direction_manager_is;
170 Elm.Widget.access; 168 Elm.Widget.access;
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index ed18da2..144f8b8 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -2222,6 +2222,11 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
2222 efl_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj); 2222 efl_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
2223} 2223}
2224 2224
2225/* Internal EO APIs and hidden overrides */
2226
2227#define ELM_CODE_WIDGET_EXTRA_OPS \
2228 EFL_CANVAS_GROUP_ADD_OPS(elm_code_widget)
2229
2225#include "elm_code_widget_text.c" 2230#include "elm_code_widget_text.c"
2226#include "elm_code_widget_undo.c" 2231#include "elm_code_widget_undo.c"
2227#include "elm_code_widget.eo.c" 2232#include "elm_code_widget.eo.c"
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index f5f5149..6cc219f 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -300,7 +300,6 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
300 class.constructor; 300 class.constructor;
301 Efl.Object.constructor; 301 Efl.Object.constructor;
302 Efl.Object.finalize; 302 Efl.Object.finalize;
303 Efl.Canvas.Group.group_add;
304 Elm.Widget.widget_event; 303 Elm.Widget.widget_event;
305 Elm.Widget.focus_next_manager_is; 304 Elm.Widget.focus_next_manager_is;
306 Elm.Widget.focus_direction_manager_is; 305 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index f3bbfb8..94a288a 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -2623,6 +2623,11 @@ _elm_color_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Color_Item_Data *it)
2623 return EINA_FALSE; 2623 return EINA_FALSE;
2624} 2624}
2625 2625
2626/* Internal EO APIs and hidden overrides */
2627
2628#define ELM_COLORSELECTOR_EXTRA_OPS \
2629 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_colorselector)
2630
2626#include "elm_colorselector.eo.c" 2631#include "elm_colorselector.eo.c"
2627#include "elm_color_item.eo.c" 2632#include "elm_color_item.eo.c"
2628 2633
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 8b4923d..023c1b7 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -108,8 +108,6 @@ class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
108 implements { 108 implements {
109 class.constructor; 109 class.constructor;
110 Efl.Object.constructor; 110 Efl.Object.constructor;
111 Efl.Canvas.Group.group_add;
112 Efl.Canvas.Group.group_del;
113 Elm.Widget.theme_apply; 111 Elm.Widget.theme_apply;
114 Elm.Widget.focus_next_manager_is; 112 Elm.Widget.focus_next_manager_is;
115 Elm.Widget.focus_next; 113 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index fa89ecc..def7430 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -39,8 +39,6 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
39 Efl.Object.constructor; 39 Efl.Object.constructor;
40 Efl.Gfx.visible { set; } 40 Efl.Gfx.visible { set; }
41 Efl.Gfx.size { set; } 41 Efl.Gfx.size { set; }
42 Efl.Canvas.Group.group_add;
43 Efl.Canvas.Group.group_del;
44 Elm.Widget.part_text { get; set; } 42 Elm.Widget.part_text { get; set; }
45 Elm.Widget.theme_apply; 43 Elm.Widget.theme_apply;
46 Elm.Widget.translate; 44 Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 0ca7c86..15b5006 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -1031,4 +1031,9 @@ _elm_conformant_class_constructor(Efl_Class *klass)
1031 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1031 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1032} 1032}
1033 1033
1034/* Internal EO APIs and hidden overrides */
1035
1036#define ELM_CONFORMANT_EXTRA_OPS \
1037 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
1038
1034#include "elm_conformant.eo.c" 1039#include "elm_conformant.eo.c"
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 437a937..142c8f6 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -7,8 +7,6 @@ class Elm.Conformant (Elm.Layout)
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Efl.Object.constructor; 9 Efl.Object.constructor;
10 Efl.Canvas.Group.group_add;
11 Efl.Canvas.Group.group_del;
12 Elm.Widget.widget_parent { set; } 10 Elm.Widget.widget_parent { set; }
13 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
14 Elm.Layout.content_aliases { get; } 12 Elm.Layout.content_aliases { get; }
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index b4f3c1e..bec4e67 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -154,8 +154,6 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
154 implements { 154 implements {
155 class.constructor; 155 class.constructor;
156 Efl.Object.constructor; 156 Efl.Object.constructor;
157 Efl.Canvas.Group.group_del;
158 Efl.Canvas.Group.group_add;
159 Elm.Widget.widget_parent { set; } 157 Elm.Widget.widget_parent { set; }
160 Elm.Widget.focus_direction; 158 Elm.Widget.focus_direction;
161 Elm.Widget.focus_direction_manager_is; 159 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 985a533..6b20371 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -619,6 +619,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, El
619 619
620/* Efl.Part end */ 620/* Efl.Part end */
621 621
622/* Internal EO APIs and hidden overrides */
623
624#define ELM_DAYSELECTOR_EXTRA_OPS \
625 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_dayselector)
626
622#include "elm_dayselector.eo.c" 627#include "elm_dayselector.eo.c"
623#include "elm_dayselector_item.eo.c" 628#include "elm_dayselector_item.eo.c"
624 629
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index cd3c83c..5c74719 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -151,8 +151,6 @@ class Elm.Dayselector (Elm.Layout)
151 implements { 151 implements {
152 class.constructor; 152 class.constructor;
153 Efl.Object.constructor; 153 Efl.Object.constructor;
154 Efl.Canvas.Group.group_add;
155 Efl.Canvas.Group.group_del;
156 Elm.Widget.theme_apply; 154 Elm.Widget.theme_apply;
157 Elm.Widget.focus_direction_manager_is; 155 Elm.Widget.focus_direction_manager_is;
158 Elm.Widget.translate; 156 Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 9294863..24cd265 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1836,5 +1836,10 @@ _elm_diskselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA
1836 return &atspi_actions[0]; 1836 return &atspi_actions[0];
1837} 1837}
1838 1838
1839/* Internal EO APIs and hidden overrides */
1840
1841#define ELM_DISKSELECTOR_EXTRA_OPS \
1842 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_diskselector)
1843
1839#include "elm_diskselector.eo.c" 1844#include "elm_diskselector.eo.c"
1840#include "elm_diskselector_item.eo.c" 1845#include "elm_diskselector_item.eo.c"
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index ae157b1..edc939b 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -201,8 +201,6 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
201 Efl.Gfx.position { set; } 201 Efl.Gfx.position { set; }
202 Efl.Gfx.size { set; } 202 Efl.Gfx.size { set; }
203 Efl.Canvas.Group.group_member_add; 203 Efl.Canvas.Group.group_member_add;
204 Efl.Canvas.Group.group_add;
205 Efl.Canvas.Group.group_del;
206 Elm.Widget.focus_next_manager_is; 204 Elm.Widget.focus_next_manager_is;
207 Elm.Widget.access; 205 Elm.Widget.access;
208 Elm.Widget.focus_next; 206 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 8b89481..1880a03 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -6025,4 +6025,9 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data
6025 6025
6026/* Efl.Part end */ 6026/* Efl.Part end */
6027 6027
6028/* Internal EO APIs and hidden overrides */
6029
6030#define ELM_ENTRY_EXTRA_OPS \
6031 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry)
6032
6028#include "elm_entry.eo.c" 6033#include "elm_entry.eo.c"
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 3b26637..5a208d4 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -945,8 +945,6 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
945 Efl.Gfx.position { set; } 945 Efl.Gfx.position { set; }
946 Efl.Gfx.size { set; } 946 Efl.Gfx.size { set; }
947 Efl.Canvas.Group.group_member_add; 947 Efl.Canvas.Group.group_member_add;
948 Efl.Canvas.Group.group_add;
949 Efl.Canvas.Group.group_del;
950 Elm.Widget.activate; 948 Elm.Widget.activate;
951 Elm.Widget.focus_direction_manager_is; 949 Elm.Widget.focus_direction_manager_is;
952 Elm.Widget.theme_apply; 950 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index befb014..82ec570 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -35,8 +35,6 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
35 class.constructor; 35 class.constructor;
36 class.destructor; 36 class.destructor;
37 Efl.Object.constructor; 37 Efl.Object.constructor;
38 Efl.Canvas.Group.group_add;
39 Efl.Canvas.Group.group_del;
40 Elm.Widget.focus_next; 38 Elm.Widget.focus_next;
41 Elm.Widget.focus_direction_manager_is; 39 Elm.Widget.focus_direction_manager_is;
42 Elm.Widget.focus_direction; 40 Elm.Widget.focus_direction;
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index f452214..977e391 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -4,8 +4,6 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector)
4 event_prefix: elm_fileselector_button; 4 event_prefix: elm_fileselector_button;
5 implements { 5 implements {
6 Efl.Object.constructor; 6 Efl.Object.constructor;
7 Efl.Canvas.Group.group_add;
8 Efl.Canvas.Group.group_del;
9 Elm.Widget.theme_apply; 7 Elm.Widget.theme_apply;
10 Efl.Ui.Autorepeat.autorepeat_supported { get; } 8 Efl.Ui.Autorepeat.autorepeat_supported { get; }
11 Elm.Interface.Fileselector.selected_models { get; } 9 Elm.Interface.Fileselector.selected_models { get; }
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index a08c3b1..e695055 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -6,8 +6,6 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Efl.Object.constructor; 8 Efl.Object.constructor;
9 Efl.Canvas.Group.group_del;
10 Efl.Canvas.Group.group_add;
11 Elm.Widget.theme_apply; 9 Elm.Widget.theme_apply;
12 Elm.Widget.focus_next_manager_is; 10 Elm.Widget.focus_next_manager_is;
13 Elm.Widget.focus_next; 11 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 75544e6..0291977 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -927,5 +927,10 @@ _elm_flipselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA
927 return &atspi_actions[0]; 927 return &atspi_actions[0];
928} 928}
929 929
930/* Internal EO APIs and hidden overrides */
931
932#define ELM_FLIPSELECTOR_EXTRA_OPS \
933 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_flipselector)
934
930#include "elm_flipselector_item.eo.c" 935#include "elm_flipselector_item.eo.c"
931#include "elm_flipselector.eo.c" 936#include "elm_flipselector.eo.c"
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 69f4a8b..1367c04 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -127,8 +127,6 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
127 implements { 127 implements {
128 class.constructor; 128 class.constructor;
129 Efl.Object.constructor; 129 Efl.Object.constructor;
130 Efl.Canvas.Group.group_add;
131 Efl.Canvas.Group.group_del;
132 Elm.Widget.theme_apply; 130 Elm.Widget.theme_apply;
133 Elm.Widget.focus_next_manager_is; 131 Elm.Widget.focus_next_manager_is;
134 Elm.Widget.focus_direction_manager_is; 132 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 9a2c61d..60076cd 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -6115,5 +6115,10 @@ _elm_gengrid_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E
6115 return EINA_FALSE; 6115 return EINA_FALSE;
6116} 6116}
6117 6117
6118/* Internal EO APIs and hidden overrides */
6119
6120#define ELM_GENGRID_EXTRA_OPS \
6121 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_gengrid)
6122
6118#include "elm_gengrid.eo.c" 6123#include "elm_gengrid.eo.c"
6119#include "elm_gengrid_item.eo.c" 6124#include "elm_gengrid_item.eo.c"
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index d80efd8..4f042eb 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -547,8 +547,6 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
547 Efl.Object.constructor; 547 Efl.Object.constructor;
548 Efl.Gfx.position { set; } 548 Efl.Gfx.position { set; }
549 Efl.Gfx.size { set; } 549 Efl.Gfx.size { set; }
550 Efl.Canvas.Group.group_add;
551 Efl.Canvas.Group.group_del;
552 Efl.Canvas.Group.group_member_add; 550 Efl.Canvas.Group.group_member_add;
553 Elm.Widget.theme_apply; 551 Elm.Widget.theme_apply;
554 Elm.Widget.focus_next_manager_is; 552 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index b657e57..c771570 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -2571,8 +2571,6 @@ _elm_genlist_pan_class_constructor(Efl_Class *klass)
2571 evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass); 2571 evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
2572} 2572}
2573 2573
2574#include "elm_genlist_pan.eo.c"
2575
2576static Eina_Bool 2574static Eina_Bool
2577_item_multi_select_up(Elm_Genlist_Data *sd) 2575_item_multi_select_up(Elm_Genlist_Data *sd)
2578{ 2576{
@@ -8699,5 +8697,14 @@ _elm_genlist_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E
8699 return EINA_FALSE; 8697 return EINA_FALSE;
8700} 8698}
8701 8699
8700/* Internal EO APIs and hidden overrides */
8701
8702#define ELM_GENLIST_EXTRA_OPS \
8703 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_genlist)
8704
8705#define ELM_GENLIST_PAN_EXTRA_OPS \
8706 EFL_CANVAS_GROUP_DEL_OPS(elm_genlist_pan)
8707
8702#include "elm_genlist.eo.c" 8708#include "elm_genlist.eo.c"
8709#include "elm_genlist_pan.eo.c"
8703#include "elm_genlist_item.eo.c" 8710#include "elm_genlist_item.eo.c"
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index b01ec46..cad3820 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -534,8 +534,6 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
534 Efl.Gfx.position { set; } 534 Efl.Gfx.position { set; }
535 Efl.Gfx.size { set; } 535 Efl.Gfx.size { set; }
536 Efl.Canvas.Group.group_member_add; 536 Efl.Canvas.Group.group_member_add;
537 Efl.Canvas.Group.group_add;
538 Efl.Canvas.Group.group_del;
539 Elm.Widget.theme_apply; 537 Elm.Widget.theme_apply;
540 Elm.Widget.focus_next_manager_is; 538 Elm.Widget.focus_next_manager_is;
541 Elm.Widget.sub_object_add; 539 Elm.Widget.sub_object_add;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index bf6e242..f7ac810 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -10,7 +10,6 @@ class Elm.Genlist.Pan (Elm.Pan)
10 Efl.Gfx.position { set; } 10 Efl.Gfx.position { set; }
11 Efl.Gfx.size { set; } 11 Efl.Gfx.size { set; }
12 Efl.Canvas.Group.group_calculate; 12 Efl.Canvas.Group.group_calculate;
13 Efl.Canvas.Group.group_del;
14 Elm.Pan.content_size { get; } 13 Elm.Pan.content_size { get; }
15 Elm.Pan.pos { get; set; } 14 Elm.Pan.pos { get; set; }
16 Elm.Pan.pos_min { get; } 15 Elm.Pan.pos_min { get; }
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index cd99a66..ff01a65 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -4156,4 +4156,9 @@ _elm_gesture_layer_class_constructor(Efl_Class *klass)
4156 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 4156 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
4157} 4157}
4158 4158
4159/* Internal EO APIs and hidden overrides */
4160
4161#define ELM_GESTURE_LAYER_EXTRA_OPS \
4162 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_gesture_layer)
4163
4159#include "elm_gesture_layer.eo.c" 4164#include "elm_gesture_layer.eo.c"
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index 29f886a..55d7bcd 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -162,8 +162,6 @@ class Elm.Gesture_Layer (Elm.Widget)
162 implements { 162 implements {
163 class.constructor; 163 class.constructor;
164 Efl.Object.constructor; 164 Efl.Object.constructor;
165 Efl.Canvas.Group.group_add;
166 Efl.Canvas.Group.group_del;
167 Elm.Widget.disable; 165 Elm.Widget.disable;
168 } 166 }
169} 167}
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index a5cf1e0..8915bf8 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -618,4 +618,10 @@ elm_glview_render_func_set(Elm_Glview *obj, Elm_GLView_Func_Cb func)
618 sd->render_func = func; 618 sd->render_func = func;
619 _set_render_policy_callback(obj); 619 _set_render_policy_callback(obj);
620} 620}
621
622/* Internal EO APIs and hidden overrides */
623
624#define ELM_GLVIEW_EXTRA_OPS \
625 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_glview)
626
621#include "elm_glview.eo.c" 627#include "elm_glview.eo.c"
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index 557c6a2..0a5259a 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -190,8 +190,6 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
190 class.constructor; 190 class.constructor;
191 Efl.Object.finalize; 191 Efl.Object.finalize;
192 Efl.Gfx.size { set; } 192 Efl.Gfx.size { set; }
193 Efl.Canvas.Group.group_add;
194 Efl.Canvas.Group.group_del;
195 Elm.Widget.on_focus; 193 Elm.Widget.on_focus;
196 Efl.Gfx.View.view_size { get; set; } 194 Efl.Gfx.View.view_size { get; set; }
197 } 195 }
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index b3e1fa1..c95e464 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -285,4 +285,9 @@ _elm_grid_class_constructor(Efl_Class *klass)
285 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 285 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
286} 286}
287 287
288/* Internal EO APIs and hidden overrides */
289
290#define ELM_GRID_EXTRA_OPS \
291 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_grid)
292
288#include "elm_grid.eo.c" 293#include "elm_grid.eo.c"
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index 1ffe829..f132643 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -55,8 +55,6 @@ class Elm.Grid (Elm.Widget)
55 implements { 55 implements {
56 class.constructor; 56 class.constructor;
57 Efl.Object.constructor; 57 Efl.Object.constructor;
58 Efl.Canvas.Group.group_add;
59 Efl.Canvas.Group.group_del;
60 Elm.Widget.focus_direction; 58 Elm.Widget.focus_direction;
61 Elm.Widget.focus_next_manager_is; 59 Elm.Widget.focus_next_manager_is;
62 Elm.Widget.focus_next; 60 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index d6d1f52..22f40a3 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -879,4 +879,9 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data
879 879
880/* Efl.Part end */ 880/* Efl.Part end */
881 881
882/* Internal EO APIs and hidden overrides */
883
884#define ELM_HOVER_EXTRA_OPS \
885 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover)
886
882#include "elm_hover.eo.c" 887#include "elm_hover.eo.c"
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 49c5568..d8a3635 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -64,8 +64,6 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
64 Efl.Gfx.visible { set; } 64 Efl.Gfx.visible { set; }
65 Efl.Gfx.position { set; } 65 Efl.Gfx.position { set; }
66 Efl.Gfx.size { set; } 66 Efl.Gfx.size { set; }
67 Efl.Canvas.Group.group_del;
68 Efl.Canvas.Group.group_add;
69 Elm.Widget.theme_apply; 67 Elm.Widget.theme_apply;
70 Elm.Widget.sub_object_add; 68 Elm.Widget.sub_object_add;
71 Elm.Widget.widget_parent { get; set; } 69 Elm.Widget.widget_parent { get; set; }
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 52ecfcb..4b5204f 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -95,8 +95,6 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
95 Efl.Object.constructor; 95 Efl.Object.constructor;
96 Efl.Object.destructor; 96 Efl.Object.destructor;
97 Efl.Gfx.visible { set; } 97 Efl.Gfx.visible { set; }
98 Efl.Canvas.Group.group_add;
99 Efl.Canvas.Group.group_del;
100 Elm.Widget.widget_parent { set; } 98 Elm.Widget.widget_parent { set; }
101 Elm.Widget.theme_apply; 99 Elm.Widget.theme_apply;
102 Elm.Widget.translate; 100 Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 303608b..935ad72 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -916,4 +916,9 @@ elm_icon_order_lookup_get(const Evas_Object *obj EINA_UNUSED)
916 return ELM_ICON_LOOKUP_FDO_THEME; 916 return ELM_ICON_LOOKUP_FDO_THEME;
917} 917}
918 918
919/* Internal EO APIs and hidden overrides */
920
921#define ELM_ICON_EXTRA_OPS \
922 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_icon)
923
919#include "elm_icon.eo.c" 924#include "elm_icon.eo.c"
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index b6c7ee0..5297201 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -9,8 +9,6 @@ class Elm.Icon (Efl.Ui.Image)
9 implements { 9 implements {
10 class.constructor; 10 class.constructor;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Canvas.Group.group_add;
13 Efl.Canvas.Group.group_del;
14 Elm.Widget.theme_apply; 12 Elm.Widget.theme_apply;
15 Efl.File.file { set; } 13 Efl.File.file { set; }
16 } 14 }
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 3b60f44..a98e5ca 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1764,5 +1764,10 @@ _elm_index_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA
1764 return &atspi_actions[0]; 1764 return &atspi_actions[0];
1765} 1765}
1766 1766
1767/* Internal EO APIs and hidden overrides */
1768
1769#define ELM_INDEX_EXTRA_OPS \
1770 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_index)
1771
1767#include "elm_index_item.eo.c" 1772#include "elm_index_item.eo.c"
1768#include "elm_index.eo.c" 1773#include "elm_index.eo.c"
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 2c8faab..bbff132 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -221,8 +221,6 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
221 implements { 221 implements {
222 class.constructor; 222 class.constructor;
223 Efl.Object.constructor; 223 Efl.Object.constructor;
224 Efl.Canvas.Group.group_add;
225 Efl.Canvas.Group.group_del;
226 Elm.Widget.theme_apply; 224 Elm.Widget.theme_apply;
227 Elm.Widget.focus_next_manager_is; 225 Elm.Widget.focus_next_manager_is;
228 Elm.Widget.focus_direction_manager_is; 226 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 4c1e4a7..f008d0b 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -4708,5 +4708,13 @@ _elm_interface_scrollable_efl_ui_focus_manager_focus(Eo *obj, Elm_Scrollable_Sma
4708 elm_interface_scrollable_region_bring_in(obj, geom.x, geom.y, geom.w, geom.h); 4708 elm_interface_scrollable_region_bring_in(obj, geom.x, geom.y, geom.w, geom.h);
4709} 4709}
4710 4710
4711/* Internal EO APIs and hidden overrides */
4712
4713#define ELM_PAN_EXTRA_OPS \
4714 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_pan)
4715
4716#define ELM_INTERFACE_SCROLLABLE_EXTRA_OPS \
4717 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_interface_scrollable)
4718
4711#include "elm_interface_scrollable.eo.c" 4719#include "elm_interface_scrollable.eo.c"
4712#include "elm_pan.eo.c" 4720#include "elm_pan.eo.c"
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index 860bd36..6f9520b 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -680,8 +680,6 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
680 implements { 680 implements {
681 class.constructor; 681 class.constructor;
682 Efl.Object.constructor; 682 Efl.Object.constructor;
683 Efl.Canvas.Group.group_add;
684 Efl.Canvas.Group.group_del;
685 Efl.Ui.Focus.Manager.border_elements { get; } 683 Efl.Ui.Focus.Manager.border_elements { get; }
686 Efl.Ui.Focus.Manager.focus; 684 Efl.Ui.Focus.Manager.focus;
687 } 685 }
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 306cd5a..c910b1f 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -164,4 +164,9 @@ _elm_inwin_class_constructor(Efl_Class *klass)
164 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 164 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
165} 165}
166 166
167/* Internal EO APIs and hidden overrides */
168
169#define ELM_INWIN_EXTRA_OPS \
170 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin)
171
167#include "elm_inwin.eo.c" 172#include "elm_inwin.eo.c"
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 595b660..08238be 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -22,7 +22,6 @@ class Elm.Inwin (Elm.Layout)
22 implements { 22 implements {
23 class.constructor; 23 class.constructor;
24 Efl.Object.constructor; 24 Efl.Object.constructor;
25 Efl.Canvas.Group.group_add;
26 Elm.Widget.widget_parent { set; } 25 Elm.Widget.widget_parent { set; }
27 Elm.Widget.focus_next_manager_is; 26 Elm.Widget.focus_next_manager_is;
28 Elm.Widget.focus_next; 27 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 76cb63c..982cd49 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -643,4 +643,9 @@ _elm_label_class_constructor(Efl_Class *klass)
643 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 643 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
644} 644}
645 645
646/* Internal EO APIs and hidden overrides */
647
648#define ELM_LABEL_EXTRA_OPS \
649 EFL_CANVAS_GROUP_ADD_OPS(elm_label)
650
646#include "elm_label.eo.c" 651#include "elm_label.eo.c"
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 6edf366..a8d6f28 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -124,7 +124,6 @@ class Elm.Label (Elm.Layout)
124 implements { 124 implements {
125 class.constructor; 125 class.constructor;
126 Efl.Object.constructor; 126 Efl.Object.constructor;
127 Efl.Canvas.Group.group_add;
128 Elm.Widget.focus_next_manager_is; 127 Elm.Widget.focus_next_manager_is;
129 Elm.Widget.focus_direction_manager_is; 128 Elm.Widget.focus_direction_manager_is;
130 Elm.Widget.theme_apply; 129 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 16e34e1..c11b6f3 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -2358,7 +2358,11 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data,
2358 2358
2359/* Efl.Part end */ 2359/* Efl.Part end */
2360 2360
2361
2362/* Internal EO APIs and hidden overrides */
2363
2361#define ELM_LAYOUT_EXTRA_OPS \ 2364#define ELM_LAYOUT_EXTRA_OPS \
2365 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \
2362 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get) 2366 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get)
2363 2367
2364#include "elm_layout.eo.c" 2368#include "elm_layout.eo.c"
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index d0f7f74..2e83d1d 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -336,8 +336,6 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
336 Efl.Object.constructor; 336 Efl.Object.constructor;
337 Efl.File.file { get; set; } 337 Efl.File.file { get; set; }
338 Efl.File.mmap { get; set; } 338 Efl.File.mmap { get; set; }
339 Efl.Canvas.Group.group_del;
340 Efl.Canvas.Group.group_add;
341 Efl.Canvas.Group.group_calculate; 339 Efl.Canvas.Group.group_calculate;
342 Elm.Widget.focus_direction; 340 Elm.Widget.focus_direction;
343 Elm.Widget.sub_object_add; 341 Elm.Widget.sub_object_add;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index c533f21..adc319f 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -3296,5 +3296,10 @@ _elm_list_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_
3296 return EINA_FALSE; 3296 return EINA_FALSE;
3297} 3297}
3298 3298
3299/* Internal EO APIs and hidden overrides */
3300
3301#define ELM_LIST_EXTRA_OPS \
3302 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_list)
3303
3299#include "elm_list.eo.c" 3304#include "elm_list.eo.c"
3300#include "elm_list_item.eo.c" 3305#include "elm_list_item.eo.c"
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 49c1cbb..27cc281 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -433,8 +433,6 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
433 Efl.Gfx.position { set; } 433 Efl.Gfx.position { set; }
434 Efl.Gfx.size { set; } 434 Efl.Gfx.size { set; }
435 Efl.Canvas.Group.group_member_add; 435 Efl.Canvas.Group.group_member_add;
436 Efl.Canvas.Group.group_add;
437 Efl.Canvas.Group.group_del;
438 Elm.Widget.theme_apply; 436 Elm.Widget.theme_apply;
439 Elm.Widget.focus_next_manager_is; 437 Elm.Widget.focus_next_manager_is;
440 Elm.Widget.focus_direction_manager_is; 438 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index e633adb..f27ffe7 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -5633,4 +5633,9 @@ _elm_map_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED,
5633 return &atspi_actions[0]; 5633 return &atspi_actions[0];
5634} 5634}
5635 5635
5636/* Internal EO APIs and hidden overrides */
5637
5638#define ELM_MAP_EXTRA_OPS \
5639 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_map)
5640
5636#include "elm_map.eo.c" 5641#include "elm_map.eo.c"
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 6fff4ec..4324edd 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -629,8 +629,6 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
629 Efl.Object.constructor; 629 Efl.Object.constructor;
630 Efl.Gfx.position { set; } 630 Efl.Gfx.position { set; }
631 Efl.Gfx.size { set; } 631 Efl.Gfx.size { set; }
632 Efl.Canvas.Group.group_add;
633 Efl.Canvas.Group.group_del;
634 Efl.Canvas.Group.group_member_add; 632 Efl.Canvas.Group.group_member_add;
635 Elm.Widget.theme_apply; 633 Elm.Widget.theme_apply;
636 Elm.Widget.on_focus; 634 Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 371c634..6181276 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -449,4 +449,9 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Pa
449 449
450/* Efl.Part end */ 450/* Efl.Part end */
451 451
452/* Internal EO APIs and hidden overrides */
453
454#define ELM_MAPBUF_EXTRA_OPS \
455 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_mapbuf)
456
452#include "elm_mapbuf.eo.c" 457#include "elm_mapbuf.eo.c"
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index ac36295..7c444bb 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -119,8 +119,6 @@ class Elm.Mapbuf (Elm.Widget, Efl.Container, Efl.Part)
119 Efl.Gfx.visible { set; } 119 Efl.Gfx.visible { set; }
120 Efl.Gfx.position { set; } 120 Efl.Gfx.position { set; }
121 Efl.Gfx.size { set; } 121 Efl.Gfx.size { set; }
122 Efl.Canvas.Group.group_add;
123 Efl.Canvas.Group.group_del;
124 Elm.Widget.theme_apply; 122 Elm.Widget.theme_apply;
125 Elm.Widget.sub_object_del; 123 Elm.Widget.sub_object_del;
126 Efl.Container.content { get; set; } 124 Efl.Container.content { get; set; }
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 9a4824d..8a79866 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -1492,5 +1492,10 @@ _elm_menu_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED,
1492 1492
1493} 1493}
1494 1494
1495/* Internal EO APIs and hidden overrides */
1496
1497#define ELM_MENU_EXTRA_OPS \
1498 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_menu)
1499
1495#include "elm_menu_item.eo.c" 1500#include "elm_menu_item.eo.c"
1496#include "elm_menu.eo.c" 1501#include "elm_menu.eo.c"
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index e6bd973..314b87d 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -51,8 +51,6 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
51 Efl.Object.constructor; 51 Efl.Object.constructor;
52 Efl.Object.destructor; 52 Efl.Object.destructor;
53 Efl.Gfx.visible { set; } 53 Efl.Gfx.visible { set; }
54 Efl.Canvas.Group.group_add;
55 Efl.Canvas.Group.group_del;
56 Elm.Widget.widget_parent { get; set; } 54 Elm.Widget.widget_parent { get; set; }
57 Elm.Widget.theme_apply; 55 Elm.Widget.theme_apply;
58 Elm.Widget.translate; 56 Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 08f765a..51cfc61 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -178,8 +178,6 @@ class Elm.Multibuttonentry (Elm.Layout)
178 implements { 178 implements {
179 class.constructor; 179 class.constructor;
180 Efl.Object.constructor; 180 Efl.Object.constructor;
181 Efl.Canvas.Group.group_add;
182 Efl.Canvas.Group.group_del;
183 Elm.Widget.theme_apply; 181 Elm.Widget.theme_apply;
184 Elm.Widget.focus_next_manager_is; 182 Elm.Widget.focus_next_manager_is;
185 Elm.Widget.focus_direction_manager_is; 183 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index d6477be..2fe7e4a 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -144,8 +144,6 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
144 class.constructor; 144 class.constructor;
145 Efl.Object.constructor; 145 Efl.Object.constructor;
146 Efl.Gfx.visible { set; } 146 Efl.Gfx.visible { set; }
147 Efl.Canvas.Group.group_del;
148 Efl.Canvas.Group.group_add;
149 Elm.Widget.focus_direction; 147 Elm.Widget.focus_direction;
150 Elm.Widget.focus_next_manager_is; 148 Elm.Widget.focus_next_manager_is;
151 Elm.Widget.focus_direction_manager_is; 149 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 4ef5514..436bc3c 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -747,4 +747,9 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Pa
747 747
748/* Efl.Part end */ 748/* Efl.Part end */
749 749
750/* Internal EO APIs and hidden overrides */
751
752#define ELM_NOTIFY_EXTRA_OPS \
753 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_notify)
754
750#include "elm_notify.eo.c" 755#include "elm_notify.eo.c"
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index c2ccbd9..dbf849b 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -83,8 +83,6 @@ class Elm.Notify (Elm.Widget, Efl.Container, Efl.Part)
83 Efl.Gfx.visible { set; } 83 Efl.Gfx.visible { set; }
84 Efl.Gfx.position { set; } 84 Efl.Gfx.position { set; }
85 Efl.Gfx.size { set; } 85 Efl.Gfx.size { set; }
86 Efl.Canvas.Group.group_add;
87 Efl.Canvas.Group.group_del;
88 Elm.Widget.focus_direction; 86 Elm.Widget.focus_direction;
89 Elm.Widget.widget_parent { get; set; } 87 Elm.Widget.widget_parent { get; set; }
90 Elm.Widget.theme_apply; 88 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index f1313dc..648b9f4 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -51,8 +51,6 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
51 Efl.Gfx.visible { set; } 51 Efl.Gfx.visible { set; }
52 Efl.Gfx.position { set; } 52 Efl.Gfx.position { set; }
53 Efl.Gfx.size { set; } 53 Efl.Gfx.size { set; }
54 Efl.Canvas.Group.group_add;
55 Efl.Canvas.Group.group_del;
56 } 54 }
57 events { 55 events {
58 changed; [[Called when pan object changed]] 56 changed; [[Called when pan object changed]]
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 7b118be..c79b460 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1588,4 +1588,9 @@ ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_
1588 1588
1589/* Efl.Part end */ 1589/* Efl.Part end */
1590 1590
1591/* Internal EO APIs and hidden overrides */
1592
1593#define ELM_PANEL_EXTRA_OPS \
1594 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_panel)
1595
1591#include "elm_panel.eo.c" 1596#include "elm_panel.eo.c"
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index c7fe451..7631a02 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -78,9 +78,7 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
78 Efl.Object.constructor; 78 Efl.Object.constructor;
79 Efl.Gfx.position { set; } 79 Efl.Gfx.position { set; }
80 Efl.Gfx.size { set; } 80 Efl.Gfx.size { set; }
81 Efl.Canvas.Group.group_add;
82 Efl.Canvas.Group.group_member_add; 81 Efl.Canvas.Group.group_member_add;
83 Efl.Canvas.Group.group_del;
84 Elm.Widget.theme_apply; 82 Elm.Widget.theme_apply;
85 Elm.Widget.focus_next_manager_is; 83 Elm.Widget.focus_next_manager_is;
86 Elm.Widget.focus_next; 84 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 0de54bd..2f2ce4c 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -570,4 +570,9 @@ _elm_panes_class_constructor(Efl_Class *klass)
570 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 570 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
571} 571}
572 572
573/* Internal EO APIs and hidden overrides */
574
575#define ELM_PANES_EXTRA_OPS \
576 EFL_CANVAS_GROUP_ADD_OPS(elm_panes)
577
573#include "elm_panes.eo.c" 578#include "elm_panes.eo.c"
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index c75e2a6..309140b 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -118,7 +118,6 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
118 implements { 118 implements {
119 class.constructor; 119 class.constructor;
120 Efl.Object.constructor; 120 Efl.Object.constructor;
121 Efl.Canvas.Group.group_add;
122 Elm.Widget.focus_next_manager_is; 121 Elm.Widget.focus_next_manager_is;
123 Elm.Widget.focus_next; 122 Elm.Widget.focus_next;
124 Elm.Widget.theme_apply; 123 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 8c07315..ddfc4c4 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -425,4 +425,9 @@ elm_photo_thumb_set(Evas_Object *obj, const char *file, const char *group)
425 elm_icon_thumb_set(sd->icon, file, group); 425 elm_icon_thumb_set(sd->icon, file, group);
426} 426}
427 427
428/* Internal EO APIs and hidden overrides */
429
430#define ELM_PHOTO_EXTRA_OPS \
431 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_photo)
432
428#include "elm_photo.eo.c" 433#include "elm_photo.eo.c"
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index 0719134..aa68685 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -7,8 +7,6 @@ class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable)
7 class.constructor; 7 class.constructor;
8 Efl.Object.constructor; 8 Efl.Object.constructor;
9 Efl.File.file { set; } 9 Efl.File.file { set; }
10 Efl.Canvas.Group.group_add;
11 Efl.Canvas.Group.group_del;
12 Elm.Widget.theme_apply; 10 Elm.Widget.theme_apply;
13 } 11 }
14} 12}
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index aba5192..34f6d02 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -2451,6 +2451,11 @@ elm_photocam_image_orient_get(const Eo *obj)
2451 return _eo_orient_flip_to_evas_orient(sd->orient, sd->flip); 2451 return _eo_orient_flip_to_evas_orient(sd->orient, sd->flip);
2452} 2452}
2453 2453
2454/* Internal EO APIs and hidden overrides */
2455
2456#define ELM_PHOTOCAM_EXTRA_OPS \
2457 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_photocam)
2458
2454#include "elm_photocam.eo.c" 2459#include "elm_photocam.eo.c"
2455 2460
2456EAPI Evas_Object* 2461EAPI Evas_Object*
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index 610bee9..1f18499 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -56,8 +56,6 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
56 Efl.Ui.Zoom.zoom_animation { set; get; } 56 Efl.Ui.Zoom.zoom_animation { set; get; }
57 Efl.Ui.Zoom.zoom { set; get; } 57 Efl.Ui.Zoom.zoom { set; get; }
58 Efl.Ui.Zoom.zoom_mode { set; get; } 58 Efl.Ui.Zoom.zoom_mode { set; get; }
59 Efl.Canvas.Group.group_add;
60 Efl.Canvas.Group.group_del;
61 Efl.Canvas.Group.group_member_add; 59 Efl.Canvas.Group.group_member_add;
62 Elm.Widget.theme_apply; 60 Elm.Widget.theme_apply;
63 Elm.Widget.on_focus; 61 Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index 37e3f54..8f6d84f 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -7,8 +7,6 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Efl.Object.constructor; 9 Efl.Object.constructor;
10 Efl.Canvas.Group.group_add;
11 Efl.Canvas.Group.group_del;
12 Elm.Widget.theme_apply; 10 Elm.Widget.theme_apply;
13 Elm.Widget.widget_event; 11 Elm.Widget.widget_event;
14 Elm.Layout.sizing_eval; 12 Elm.Layout.sizing_eval;
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index a975acc..1dc4101 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -189,4 +189,9 @@ _elm_plug_class_constructor(Efl_Class *klass)
189 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 189 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
190} 190}
191 191
192/* Internal EO APIs and hidden overrides */
193
194#define ELM_PLUG_EXTRA_OPS \
195 EFL_CANVAS_GROUP_ADD_OPS(elm_plug)
196
192#include "elm_plug.eo.c" 197#include "elm_plug.eo.c"
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 696f34b..b052782 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -33,7 +33,6 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
33 implements { 33 implements {
34 class.constructor; 34 class.constructor;
35 Efl.Object.constructor; 35 Efl.Object.constructor;
36 Efl.Canvas.Group.group_add;
37 Elm.Widget.theme_apply; 36 Elm.Widget.theme_apply;
38 Elm.Widget.on_focus; 37 Elm.Widget.on_focus;
39 } 38 }
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 055b1a8..38f220b 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -168,8 +168,6 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
168 implements { 168 implements {
169 class.constructor; 169 class.constructor;
170 Efl.Object.constructor; 170 Efl.Object.constructor;
171 Efl.Canvas.Group.group_del;
172 Efl.Canvas.Group.group_add;
173 Elm.Widget.focus_direction; 171 Elm.Widget.focus_direction;
174 Elm.Widget.focus_next_manager_is; 172 Elm.Widget.focus_next_manager_is;
175 Elm.Widget.theme_apply; 173 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index 35a8fd5..5d87e40 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -1889,4 +1889,9 @@ elm_prefs_file_get(const Eo *obj, const char **file, const char **page)
1889 return EINA_TRUE; 1889 return EINA_TRUE;
1890} 1890}
1891 1891
1892/* Internal EO APIs and hidden overrides */
1893
1894#define ELM_PREFS_EXTRA_OPS \
1895 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_prefs)
1896
1892#include "elm_prefs.eo.c" 1897#include "elm_prefs.eo.c"
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 1e16a5b..5109163 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -216,8 +216,6 @@ class Elm.Prefs (Elm.Widget, Efl.File)
216 class.constructor; 216 class.constructor;
217 Efl.Object.constructor; 217 Efl.Object.constructor;
218 Efl.File.file { get; set; } 218 Efl.File.file { get; set; }
219 Efl.Canvas.Group.group_del;
220 Efl.Canvas.Group.group_add;
221 Elm.Widget.focus_next; 219 Elm.Widget.focus_next;
222 } 220 }
223 events { 221 events {
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index 59f7670..4f2c6f6 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -665,4 +665,9 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_progressbar, ELM_PROGRESSBAR, ELM_LAYOUT, Elm_
665 665
666/* Efl.Part end */ 666/* Efl.Part end */
667 667
668/* Internal EO APIs and hidden overrides */
669
670#define ELM_PROGRESSBAR_EXTRA_OPS \
671 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_progressbar)
672
668#include "elm_progressbar.eo.c" 673#include "elm_progressbar.eo.c"
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo
index bbdbc83..7c3cf7e 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/elm_progressbar.eo
@@ -65,8 +65,6 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
65 implements { 65 implements {
66 class.constructor; 66 class.constructor;
67 Efl.Object.constructor; 67 Efl.Object.constructor;
68 Efl.Canvas.Group.group_add;
69 Efl.Canvas.Group.group_del;
70 Elm.Widget.theme_apply; 68 Elm.Widget.theme_apply;
71 Elm.Widget.focus_next_manager_is; 69 Elm.Widget.focus_next_manager_is;
72 Elm.Widget.focus_direction_manager_is; 70 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index c0d4bae..752cbbc 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -407,4 +407,9 @@ _elm_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Radio_Data
407 return ret; 407 return ret;
408} 408}
409 409
410/* Internal EO APIs and hidden overrides */
411
412#define ELM_RADIO_EXTRA_OPS \
413 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_radio)
414
410#include "elm_radio.eo.c" 415#include "elm_radio.eo.c"
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index b141b0f..57bb719 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -79,8 +79,6 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
79 implements { 79 implements {
80 class.constructor; 80 class.constructor;
81 Efl.Object.constructor; 81 Efl.Object.constructor;
82 Efl.Canvas.Group.group_add;
83 Efl.Canvas.Group.group_del;
84 Elm.Widget.theme_apply; 82 Elm.Widget.theme_apply;
85 Elm.Widget.activate; 83 Elm.Widget.activate;
86 Elm.Widget.widget_event; 84 Elm.Widget.widget_event;
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index d680440..541291d 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -261,4 +261,9 @@ _elm_route_class_constructor(Efl_Class *klass)
261 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 261 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
262} 262}
263 263
264/* Internal EO APIs and hidden overrides */
265
266#define ELM_ROUTE_EXTRA_OPS \
267 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_route)
268
264#include "elm_route.eo.c" 269#include "elm_route.eo.c"
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index ad2d553..5234005 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -42,8 +42,6 @@ class Elm.Route (Elm.Widget)
42 implements { 42 implements {
43 class.constructor; 43 class.constructor;
44 Efl.Object.constructor; 44 Efl.Object.constructor;
45 Efl.Canvas.Group.group_add;
46 Efl.Canvas.Group.group_del;
47 Elm.Widget.theme_apply; 45 Elm.Widget.theme_apply;
48 } 46 }
49} 47}
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index c085031..4cf261c 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1471,4 +1471,9 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scro
1471 1471
1472/* Efl.Part end */ 1472/* Efl.Part end */
1473 1473
1474/* Internal EO APIs and hidden overrides */
1475
1476#define ELM_SCROLLER_EXTRA_OPS \
1477 EFL_CANVAS_GROUP_ADD_OPS(elm_scroller)
1478
1474#include "elm_scroller.eo.c" 1479#include "elm_scroller.eo.c"
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 1fc41b2..e869a52 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -63,7 +63,6 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
63 Efl.Object.constructor; 63 Efl.Object.constructor;
64 Efl.Gfx.position { set; } 64 Efl.Gfx.position { set; }
65 Efl.Gfx.size { set; } 65 Efl.Gfx.size { set; }
66 Efl.Canvas.Group.group_add;
67 Efl.Canvas.Group.group_member_add; 66 Efl.Canvas.Group.group_member_add;
68 Elm.Widget.theme_apply; 67 Elm.Widget.theme_apply;
69 Elm.Widget.activate; 68 Elm.Widget.activate;
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 08bb419..212593c 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -842,5 +842,10 @@ _elm_segment_control_class_constructor(Efl_Class *klass)
842 _elm_segment_control_smart_focus_next_enable = EINA_TRUE; 842 _elm_segment_control_smart_focus_next_enable = EINA_TRUE;
843} 843}
844 844
845/* Internal EO APIs and hidden overrides */
846
847#define ELM_SEGMENT_CONTROL_EXTRA_OPS \
848 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_segment_control)
849
845#include "elm_segment_control_item.eo.c" 850#include "elm_segment_control_item.eo.c"
846#include "elm_segment_control.eo.c" 851#include "elm_segment_control.eo.c"
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 73a1a40..357fb22 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -136,8 +136,6 @@ class Elm.Segment_Control (Elm.Layout)
136 implements { 136 implements {
137 class.constructor; 137 class.constructor;
138 Efl.Object.constructor; 138 Efl.Object.constructor;
139 Efl.Canvas.Group.group_add;
140 Efl.Canvas.Group.group_del;
141 Elm.Widget.theme_apply; 139 Elm.Widget.theme_apply;
142 Elm.Widget.focus_next_manager_is; 140 Elm.Widget.focus_next_manager_is;
143 Elm.Widget.focus_next; 141 Elm.Widget.focus_next;
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index a961b02..6a8bede 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -143,4 +143,9 @@ _elm_separator_class_constructor(Efl_Class *klass)
143 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 143 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
144} 144}
145 145
146/* Internal EO APIs and hidden overrides */
147
148#define ELM_SEPARATOR_EXTRA_OPS \
149 EFL_CANVAS_GROUP_ADD_OPS(elm_separator)
150
146#include "elm_separator.eo.c" 151#include "elm_separator.eo.c"
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index a168660..545fa87 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -6,7 +6,6 @@ class Elm.Separator (Elm.Layout, Efl.Orientation)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Efl.Object.constructor; 8 Efl.Object.constructor;
9 Efl.Canvas.Group.group_add;
10 Elm.Widget.focus_next_manager_is; 9 Elm.Widget.focus_next_manager_is;
11 Elm.Widget.focus_direction_manager_is; 10 Elm.Widget.focus_direction_manager_is;
12 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index c9ca136..a598a8a 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1683,4 +1683,9 @@ _elm_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
1683 1683
1684// A11Y Accessibility - END 1684// A11Y Accessibility - END
1685 1685
1686/* Internal EO APIs and hidden overrides */
1687
1688#define ELM_SLIDER_EXTRA_OPS \
1689 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_slider)
1690
1686#include "elm_slider.eo.c" 1691#include "elm_slider.eo.c"
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 81b647c..fa57d24 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -173,8 +173,6 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
173 class.constructor; 173 class.constructor;
174 Efl.Object.constructor; 174 Efl.Object.constructor;
175 Efl.Canvas.Group.group_calculate; 175 Efl.Canvas.Group.group_calculate;
176 Efl.Canvas.Group.group_add;
177 Efl.Canvas.Group.group_del;
178 Elm.Widget.theme_apply; 176 Elm.Widget.theme_apply;
179 Elm.Widget.activate; 177 Elm.Widget.activate;
180 Elm.Widget.focus_next_manager_is; 178 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index e437f6d..0be68a1 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -735,5 +735,10 @@ _elm_slideshow_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
735 return &atspi_actions[0]; 735 return &atspi_actions[0];
736} 736}
737 737
738/* Internal EO APIs and hidden overrides */
739
740#define ELM_SLIDESHOW_EXTRA_OPS \
741 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_slideshow)
742
738#include "elm_slideshow_item.eo.c" 743#include "elm_slideshow_item.eo.c"
739#include "elm_slideshow.eo.c" 744#include "elm_slideshow.eo.c"
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 0a27cfd..136fb87 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -304,8 +304,6 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
304 implements { 304 implements {
305 class.constructor; 305 class.constructor;
306 Efl.Object.constructor; 306 Efl.Object.constructor;
307 Efl.Canvas.Group.group_add;
308 Efl.Canvas.Group.group_del;
309 Elm.Widget.focus_next_manager_is; 307 Elm.Widget.focus_next_manager_is;
310 Elm.Widget.focus_direction_manager_is; 308 Elm.Widget.focus_direction_manager_is;
311 Elm.Widget.widget_event; 309 Elm.Widget.widget_event;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ae7c7cd..56513cd 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1746,4 +1746,9 @@ _elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *
1746 1746
1747// A11Y Accessibility - END 1747// A11Y Accessibility - END
1748 1748
1749/* Internal EO APIs and hidden overrides */
1750
1751#define ELM_SPINNER_EXTRA_OPS \
1752 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_spinner)
1753
1749#include "elm_spinner.eo.c" 1754#include "elm_spinner.eo.c"
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 3891ffc..3404205 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -146,8 +146,6 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
146 implements { 146 implements {
147 class.constructor; 147 class.constructor;
148 Efl.Object.constructor; 148 Efl.Object.constructor;
149 Efl.Canvas.Group.group_add;
150 Efl.Canvas.Group.group_del;
151 Elm.Widget.theme_apply; 149 Elm.Widget.theme_apply;
152 Elm.Widget.focus_next_manager_is; 150 Elm.Widget.focus_next_manager_is;
153 Elm.Widget.focus_direction_manager_is; 151 Elm.Widget.focus_direction_manager_is;
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index c4ddacd..8ded9ab 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -429,4 +429,9 @@ _elm_table_elm_widget_focus_register(Eo *obj, void *pd EINA_UNUSED, Efl_Ui_Focus
429} 429}
430 430
431 431
432/* Internal EO APIs and hidden overrides */
433
434#define ELM_TABLE_EXTRA_OPS \
435 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_table)
436
432#include "elm_table.eo.c" 437#include "elm_table.eo.c"
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index 7df00af..775cf92 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -120,8 +120,6 @@ class Elm.Table (Elm.Widget)
120 implements { 120 implements {
121 class.constructor; 121 class.constructor;
122 Efl.Object.constructor; 122 Efl.Object.constructor;
123 Efl.Canvas.Group.group_add;
124 Efl.Canvas.Group.group_del;
125 Efl.Canvas.Group.group_calculate; 123 Efl.Canvas.Group.group_calculate;
126 Elm.Widget.focus_direction; 124 Elm.Widget.focus_direction;
127 Elm.Widget.focus_next_manager_is; 125 Elm.Widget.focus_next_manager_is;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index e6e5084..be9627b 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -907,4 +907,9 @@ elm_thumb_reload(Evas_Object *obj)
907 _thumb_show(sd); 907 _thumb_show(sd);
908} 908}
909 909
910/* Internal EO APIs and hidden overrides */
911
912#define ELM_THUMB_EXTRA_OPS \
913 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_thumb)
914
910#include "elm_thumb.eo.c" 915#include "elm_thumb.eo.c"
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 9b94fd1..e66a079 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -10,8 +10,6 @@ class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
10 Efl.Object.constructor; 10 Efl.Object.constructor;
11 Efl.File.file { get; set; } 11 Efl.File.file { get; set; }
12 Efl.Gfx.visible { set; } 12 Efl.Gfx.visible { set; }
13 Efl.Canvas.Group.group_add;
14 Efl.Canvas.Group.group_del;
15 Efl.Ui.Draggable.drag_target { get; set; } 13 Efl.Ui.Draggable.drag_target { get; set; }
16 } 14 }
17 events { 15 events {
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index eda47f4..95b57e0 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -4176,5 +4176,11 @@ elm_toolbar_icon_order_lookup_get(const Evas_Object *obj EINA_UNUSED)
4176{ 4176{
4177 return ELM_ICON_LOOKUP_FDO_THEME; 4177 return ELM_ICON_LOOKUP_FDO_THEME;
4178} 4178}
4179
4180/* Internal EO APIs and hidden overrides */
4181
4182#define ELM_TOOLBAR_EXTRA_OPS \
4183 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_toolbar)
4184
4179#include "elm_toolbar.eo.c" 4185#include "elm_toolbar.eo.c"
4180#include "elm_toolbar_item.eo.c" 4186#include "elm_toolbar_item.eo.c"
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index af7ee07..dca3526 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -319,8 +319,6 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
319 Efl.Gfx.position { set; } 319 Efl.Gfx.position { set; }
320 Efl.Gfx.size { set; } 320 Efl.Gfx.size { set; }
321 Efl.Canvas.Group.group_calculate; 321 Efl.Canvas.Group.group_calculate;
322 Efl.Canvas.Group.group_add;
323 Efl.Canvas.Group.group_del;
324 Efl.Canvas.Group.group_member_add; 322 Efl.Canvas.Group.group_member_add;
325 Elm.Widget.focus_next_manager_is; 323 Elm.Widget.focus_next_manager_is;
326 Elm.Widget.access; 324 Elm.Widget.access;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 77e02ed..e7fa599 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -6502,8 +6502,13 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
6502 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus); 6502 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
6503} 6503}
6504 6504
6505/* Internal EO APIs and hidden overrides */
6506
6505#define ELM_WIDGET_EXTRA_OPS \ 6507#define ELM_WIDGET_EXTRA_OPS \
6508 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_widget), \
6506 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get) 6509 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get)
6507 6510
6511#define ELM_GENLIST_EXTRA_OPS \
6512
6508#include "elm_widget_item.eo.c" 6513#include "elm_widget_item.eo.c"
6509#include "elm_widget.eo.c" 6514#include "elm_widget.eo.c"
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index f569109..c91db8a 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -823,8 +823,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
823 Efl.Canvas.Object.is_frame_object { set; } 823 Efl.Canvas.Object.is_frame_object { set; }
824 Efl.Canvas.Group.group_calculate; 824 Efl.Canvas.Group.group_calculate;
825 Efl.Canvas.Group.group_member_del; 825 Efl.Canvas.Group.group_member_del;
826 Efl.Canvas.Group.group_add;
827 Efl.Canvas.Group.group_del;
828 Efl.Canvas.Group.group_member_add; 826 Efl.Canvas.Group.group_member_add;
829 Elm.Interface.Atspi_Accessible.name { get; } 827 Elm.Interface.Atspi_Accessible.name { get; }
830 Elm.Interface.Atspi_Accessible.state_set { get; } 828 Elm.Interface.Atspi_Accessible.state_set { get; }
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 5138990..201b94a 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -58,8 +58,6 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
58 Efl.Gfx.position { set; } 58 Efl.Gfx.position { set; }
59 Efl.Gfx.size { set; } 59 Efl.Gfx.size { set; }
60 Efl.Canvas.Object.clip { set; } 60 Efl.Canvas.Object.clip { set; }
61 Efl.Canvas.Group.group_add;
62 Efl.Canvas.Group.group_del;
63 Efl.File.file { get; set; } 61 Efl.File.file { get; set; }
64 Efl.Player.play { get; set; } 62 Efl.Player.play { get; set; }
65 Efl.Player.position { get; set; } 63 Efl.Player.position { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index e7ba4a8..8feb7c0 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -2069,4 +2069,10 @@ _efl_canvas_video_efl_canvas_object_clip_set(Evas_Object *obj, Efl_Canvas_Video_
2069 evas_object_clip_set(sd->bg, clip); 2069 evas_object_clip_set(sd->bg, clip);
2070} 2070}
2071 2071
2072/* Internal EO APIs and hidden overrides */
2073
2074#define EFL_CANVAS_VIDEO_EXTRA_OPS \
2075 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_canvas_video)
2076
2077
2072#include "efl_canvas_video.eo.c" 2078#include "efl_canvas_video.eo.c"
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 5135c1f..be30998 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -50,6 +50,8 @@ EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
50/* Internal EO APIs */ 50/* Internal EO APIs */
51EOAPI void efl_canvas_object_legacy_ctor(Eo *obj); 51EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
52EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type); 52EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
53EOAPI void efl_canvas_group_add(Eo *obj);
54EOAPI void efl_canvas_group_del(Eo *obj);
53 55
54EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; 56EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
55#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) 57#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE))
@@ -63,6 +65,11 @@ EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE;
63EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE; 65EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE;
64#define EVAS_CANVAS_EVENT_VIEWPORT_RESIZE (&(_EVAS_CANVAS_EVENT_VIEWPORT_RESIZE)) 66#define EVAS_CANVAS_EVENT_VIEWPORT_RESIZE (&(_EVAS_CANVAS_EVENT_VIEWPORT_RESIZE))
65 67
68#define EFL_CANVAS_GROUP_DEL_OPS(kls) EFL_OBJECT_OP_FUNC(efl_canvas_group_del, _##kls##_efl_canvas_group_group_del)
69#define EFL_CANVAS_GROUP_ADD_OPS(kls) EFL_OBJECT_OP_FUNC(efl_canvas_group_add, _##kls##_efl_canvas_group_group_add)
70#define EFL_CANVAS_GROUP_ADD_DEL_OPS(kls) EFL_CANVAS_GROUP_ADD_OPS(kls), EFL_CANVAS_GROUP_DEL_OPS(kls)
71
72
66#ifdef __cplusplus 73#ifdef __cplusplus
67} 74}
68#endif 75#endif
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 2eda28e..356ad5e 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -96,14 +96,6 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
96 } 96 }
97 legacy: null; 97 legacy: null;
98 } 98 }
99 group_add @protected @beta /* @internal */ {
100 [[Internal constructor function.]]
101 legacy: null;
102 }
103 group_del @protected @beta /* @internal */ {
104 [[Internal destructor function.]]
105 legacy: null;
106 }
107 } 99 }
108 implements { 100 implements {
109 class.constructor; 101 class.constructor;
diff --git a/src/lib/evas/canvas/efl_canvas_group_clipped.eo b/src/lib/evas/canvas/efl_canvas_group_clipped.eo
index e096da2..39f669c 100644
--- a/src/lib/evas/canvas/efl_canvas_group_clipped.eo
+++ b/src/lib/evas/canvas/efl_canvas_group_clipped.eo
@@ -9,8 +9,6 @@ abstract Efl.Canvas.Group.Clipped (Efl.Canvas.Group)
9 Efl.Canvas.Object.clip { set; } 9 Efl.Canvas.Object.clip { set; }
10 Efl.Canvas.Object.no_render { set; } 10 Efl.Canvas.Object.no_render { set; }
11 Efl.Canvas.Group.group_member_del; 11 Efl.Canvas.Group.group_member_del;
12 Efl.Canvas.Group.group_add;
13 Efl.Canvas.Group.group_del;
14 Efl.Canvas.Group.group_member_add; 12 Efl.Canvas.Group.group_member_add;
15 } 13 }
16} 14}
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 0e0d308..36fca8a 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -661,8 +661,6 @@ class Evas.Box (Efl.Canvas.Group.Clipped)
661 Efl.Gfx.size { set; } 661 Efl.Gfx.size { set; }
662 Efl.Gfx.position { set; } 662 Efl.Gfx.position { set; }
663 Efl.Canvas.Group.group_calculate; 663 Efl.Canvas.Group.group_calculate;
664 Efl.Canvas.Group.group_add;
665 Efl.Canvas.Group.group_del;
666 } 664 }
667 events { 665 events {
668 child,added; [[Called when a child object was added to the box]] 666 child,added; [[Called when a child object was added to the box]]
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 3ec1e3d..1f581f3 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1997,4 +1997,9 @@ _evas_box_class_constructor(Efl_Class *klass)
1997 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1997 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1998} 1998}
1999 1999
2000/* Internal EO APIs and hidden overrides */
2001
2002#define EVAS_BOX_EXTRA_OPS \
2003 EFL_CANVAS_GROUP_ADD_DEL_OPS(evas_box)
2004
2000#include "canvas/evas_box.eo.c" 2005#include "canvas/evas_box.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 84188ae..0e3fcd9 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1670,4 +1670,14 @@ _efl_canvas_group_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUS
1670 return o->paragraph_direction; 1670 return o->paragraph_direction;
1671} 1671}
1672 1672
1673/* Internal EO APIs */
1674
1675EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_add)
1676EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_del)
1677
1678#define EFL_CANVAS_GROUP_EXTRA_OPS \
1679 EFL_OBJECT_OP_FUNC(efl_canvas_group_add, _efl_canvas_group_group_add), \
1680 EFL_OBJECT_OP_FUNC(efl_canvas_group_del, _efl_canvas_group_group_del)
1681
1682
1673#include "canvas/efl_canvas_group.eo.c" 1683#include "canvas/efl_canvas_group.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 6275ef6..23345df 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -242,5 +242,10 @@ evas_object_smart_clipped_class_get(void)
242 return class; 242 return class;
243} 243}
244 244
245/* Internal EO APIs and hidden overrides */
246
247#define EFL_CANVAS_GROUP_CLIPPED_EXTRA_OPS \
248 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_canvas_group_clipped)
249
245#include "canvas/efl_canvas_group_clipped.eo.c" 250#include "canvas/efl_canvas_group_clipped.eo.c"
246 251
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 103d3a8..fc3c64d 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1439,4 +1439,9 @@ _evas_table_class_constructor(Efl_Class *klass)
1439 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1439 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1440} 1440}
1441 1441
1442/* Internal EO APIs and hidden overrides */
1443
1444#define EVAS_TABLE_EXTRA_OPS \
1445 EFL_CANVAS_GROUP_ADD_DEL_OPS(evas_table)
1446
1442#include "canvas/evas_table.eo.c" 1447#include "canvas/evas_table.eo.c"
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 15a582f..768e2bc 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -219,8 +219,6 @@ class Evas.Table (Efl.Canvas.Group.Clipped)
219 Efl.Object.constructor; 219 Efl.Object.constructor;
220 Efl.Gfx.size { set; } 220 Efl.Gfx.size { set; }
221 Efl.Gfx.position { set; } 221 Efl.Gfx.position { set; }
222 Efl.Canvas.Group.group_add;
223 Efl.Canvas.Group.group_del;
224 Efl.Canvas.Group.group_calculate; 222 Efl.Canvas.Group.group_calculate;
225 } 223 }
226} 224}
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index 13851a7..5d38908 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -356,4 +356,9 @@ ewm_class_get(void)
356#undef ELM_WEB_CLASS 356#undef ELM_WEB_CLASS
357#define ELM_WEB_CLASS elm_web_class_get() 357#define ELM_WEB_CLASS elm_web_class_get()
358 358
359/* Internal EO APIs and hidden overrides */
360
361#define ELM_WEB_NONE_EXTRA_OPS \
362 EFL_CANVAS_GROUP_ADD_OPS(elm_web_none)
363
359#include "elm_web_none.eo.c" 364#include "elm_web_none.eo.c"
diff --git a/src/modules/elementary/web/none/elm_web_none.eo b/src/modules/elementary/web/none/elm_web_none.eo
index 35b3120..a3aa49f 100644
--- a/src/modules/elementary/web/none/elm_web_none.eo
+++ b/src/modules/elementary/web/none/elm_web_none.eo
@@ -2,7 +2,6 @@ class Elm.Web.None (Elm.Web)
2{ 2{
3 [[Elementary web module class]] 3 [[Elementary web module class]]
4 implements { 4 implements {
5 Efl.Canvas.Group.group_add;
6 Elm.Web.tab_propagate { get; set; } 5 Elm.Web.tab_propagate { get; set; }
7 Elm.Web.webkit_view { get; } 6 Elm.Web.webkit_view { get; }
8 Elm.Web.window_create_hook { set; } 7 Elm.Web.window_create_hook { set; }