summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-04-12 05:38:00 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-18 11:01:19 +0200
commit41136db8e8adb02ce7f99c929e25b56cda2caf9e (patch)
tree6e4802ff30e68cbc0fd80e2da5c87be9e21a7ce0
parent80ffed5d85638279340862ccff91c86f49b986af (diff)
ui.widget: remove elm_widget_sub_object_parent_add from each of widgets
since commit a1addad60e, To add myself as a sub object of parent object will be done in Efl.Ui.Widget constructor. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8280
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_anchor_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_bg.c1
-rw-r--r--src/lib/elementary/efl_ui_box.c1
-rw-r--r--src/lib/elementary/efl_ui_button.c1
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_clock.c1
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c1
-rw-r--r--src/lib/elementary/efl_ui_frame.c1
-rw-r--r--src/lib/elementary/efl_ui_image.c1
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view.c1
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c1
-rw-r--r--src/lib/elementary/efl_ui_pager.c2
-rw-r--r--src/lib/elementary/efl_ui_panel.c1
-rw-r--r--src/lib/elementary/efl_ui_panes.c1
-rw-r--r--src/lib/elementary/efl_ui_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c1
-rw-r--r--src/lib/elementary/efl_ui_relative_layout.c1
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_slider.c1
-rw-r--r--src/lib/elementary/efl_ui_spin.c2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c1
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c3
-rw-r--r--src/lib/elementary/efl_ui_tab_page.c3
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c1
-rw-r--r--src/lib/elementary/efl_ui_table.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.c1
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_text_alert_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_textpath.c1
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c2
-rw-r--r--src/lib/elementary/efl_ui_video.c1
-rw-r--r--src/lib/elementary/efl_ui_widget.c10
-rw-r--r--src/lib/elementary/elc_combobox.c1
-rw-r--r--src/lib/elementary/elc_ctxpopup.c1
-rw-r--r--src/lib/elementary/elc_fileselector.c1
-rw-r--r--src/lib/elementary/elc_fileselector_button.c1
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c1
-rw-r--r--src/lib/elementary/elc_hoversel.c1
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c1
-rw-r--r--src/lib/elementary/elc_naviframe.c1
-rw-r--r--src/lib/elementary/elc_player.c1
-rw-r--r--src/lib/elementary/elc_popup.c1
-rw-r--r--src/lib/elementary/elm_access.c1
-rw-r--r--src/lib/elementary/elm_actionslider.c1
-rw-r--r--src/lib/elementary/elm_box.c1
-rw-r--r--src/lib/elementary/elm_bubble.c1
-rw-r--r--src/lib/elementary/elm_calendar.c1
-rw-r--r--src/lib/elementary/elm_clock.c1
-rw-r--r--src/lib/elementary/elm_colorselector.c1
-rw-r--r--src/lib/elementary/elm_conform.c1
-rw-r--r--src/lib/elementary/elm_dayselector.c1
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_entry.c1
-rw-r--r--src/lib/elementary/elm_flipselector.c1
-rw-r--r--src/lib/elementary/elm_gengrid.c1
-rw-r--r--src/lib/elementary/elm_genlist.c1
-rw-r--r--src/lib/elementary/elm_gesture_layer.c1
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_grid.c2
-rw-r--r--src/lib/elementary/elm_hover.c1
-rw-r--r--src/lib/elementary/elm_icon.c1
-rw-r--r--src/lib/elementary/elm_index.c1
-rw-r--r--src/lib/elementary/elm_inwin.c1
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_list.c1
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_mapbuf.c1
-rw-r--r--src/lib/elementary/elm_menu.c1
-rw-r--r--src/lib/elementary/elm_notify.c1
-rw-r--r--src/lib/elementary/elm_panel.c1
-rw-r--r--src/lib/elementary/elm_photo.c1
-rw-r--r--src/lib/elementary/elm_plug.c1
-rw-r--r--src/lib/elementary/elm_prefs.c1
-rw-r--r--src/lib/elementary/elm_route.c1
-rw-r--r--src/lib/elementary/elm_scroller.c1
-rw-r--r--src/lib/elementary/elm_segment_control.c1
-rw-r--r--src/lib/elementary/elm_separator.c1
-rw-r--r--src/lib/elementary/elm_slideshow.c1
-rw-r--r--src/lib/elementary/elm_spinner.c1
-rw-r--r--src/lib/elementary/elm_table.c2
-rw-r--r--src/lib/elementary/elm_thumb.c1
-rw-r--r--src/lib/elementary/elm_toolbar.c2
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c1
89 files changed, 9 insertions, 116 deletions
diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c
index 1fe6f55..e7eac4a 100644
--- a/src/lib/elementary/efl_ui_alert_popup.c
+++ b/src/lib/elementary/efl_ui_alert_popup.c
@@ -242,8 +242,6 @@ _efl_ui_alert_popup_efl_object_constructor(Eo *obj,
242 obj = efl_constructor(efl_super(obj, MY_CLASS)); 242 obj = efl_constructor(efl_super(obj, MY_CLASS));
243 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 243 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
244 244
245 elm_widget_sub_object_parent_add(obj);
246
247 return obj; 245 return obj;
248} 246}
249 247
diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c
index a02e6a8..ec0573b 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.c
+++ b/src/lib/elementary/efl_ui_anchor_popup.c
@@ -330,8 +330,6 @@ _efl_ui_anchor_popup_efl_object_constructor(Eo *obj,
330 obj = efl_constructor(efl_super(obj, MY_CLASS)); 330 obj = efl_constructor(efl_super(obj, MY_CLASS));
331 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 331 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
332 332
333 elm_widget_sub_object_parent_add(obj);
334
335 pd->priority[0] = EFL_UI_POPUP_ALIGN_TOP; 333 pd->priority[0] = EFL_UI_POPUP_ALIGN_TOP;
336 pd->priority[1] = EFL_UI_POPUP_ALIGN_LEFT; 334 pd->priority[1] = EFL_UI_POPUP_ALIGN_LEFT;
337 pd->priority[2] = EFL_UI_POPUP_ALIGN_RIGHT; 335 pd->priority[2] = EFL_UI_POPUP_ALIGN_RIGHT;
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index aea33a0..88d5ef7 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -29,7 +29,6 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
29 elm_widget_theme_klass_set(obj, "bg"); 29 elm_widget_theme_klass_set(obj, "bg");
30 30
31 obj = efl_constructor(efl_super(obj, MY_CLASS)); 31 obj = efl_constructor(efl_super(obj, MY_CLASS));
32 elm_widget_sub_object_parent_add(obj);
33 elm_widget_can_focus_set(obj, EINA_FALSE); 32 elm_widget_can_focus_set(obj, EINA_FALSE);
34 33
35 if (elm_widget_theme_object_set(obj, wd->resize_obj, 34 if (elm_widget_theme_object_set(obj, wd->resize_obj,
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index dbe9991..ce33041 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -148,7 +148,6 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *pd)
148 efl_ui_widget_sub_object_add(obj, pd->clipper); 148 efl_ui_widget_sub_object_add(obj, pd->clipper);
149 149
150 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 150 efl_canvas_group_add(efl_super(obj, MY_CLASS));
151 elm_widget_sub_object_parent_add(obj);
152 151
153 efl_ui_widget_focus_allow_set(obj, EINA_FALSE); 152 efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
154 elm_widget_highlight_ignore_set(obj, EINA_TRUE); 153 elm_widget_highlight_ignore_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 1bff2c9..a3c1c4d 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -218,7 +218,6 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
218 if (!elm_widget_theme_klass_get(obj)) 218 if (!elm_widget_theme_klass_get(obj))
219 elm_widget_theme_klass_set(obj, "button"); 219 elm_widget_theme_klass_set(obj, "button");
220 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 220 efl_canvas_group_add(efl_super(obj, MY_CLASS));
221 elm_widget_sub_object_parent_add(obj);
222 221
223 if (elm_widget_is_legacy(obj)) 222 if (elm_widget_is_legacy(obj))
224 { 223 {
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index a4df182..eb3918d 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -910,8 +910,6 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
910 910
911 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 911 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
912 912
913 elm_widget_sub_object_parent_add(obj);
914
915 priv->date_min.tm_year = 2; 913 priv->date_min.tm_year = 2;
916 priv->date_min.tm_mon = 0; 914 priv->date_min.tm_mon = 0;
917 priv->date_min.tm_mday = 1; 915 priv->date_min.tm_mday = 1;
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 5c83d83..e580d3c 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -855,7 +855,6 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
855 if (!elm_widget_theme_klass_get(obj)) 855 if (!elm_widget_theme_klass_get(obj))
856 elm_widget_theme_klass_set(obj, "uiclock"); 856 elm_widget_theme_klass_set(obj, "uiclock");
857 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 857 efl_canvas_group_add(efl_super(obj, MY_CLASS));
858 elm_widget_sub_object_parent_add(obj);
859 858
860 if (elm_widget_theme_object_set(obj, wd->resize_obj, 859 if (elm_widget_theme_object_set(obj, wd->resize_obj,
861 elm_widget_theme_klass_get(obj), 860 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index b7978b1..06a1878 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -255,8 +255,6 @@ _efl_ui_datepicker_efl_object_constructor(Eo *obj, Efl_Ui_Datepicker_Data *pd)
255 255
256 _fields_init(obj); 256 _fields_init(obj);
257 257
258 elm_widget_sub_object_parent_add(obj);
259
260 elm_widget_can_focus_set(obj, EINA_TRUE); 258 elm_widget_can_focus_set(obj, EINA_TRUE);
261 259
262 return obj; 260 return obj;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 7f3da3c..71dc20e 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1812,7 +1812,6 @@ EOLIAN static void
1812_efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv) 1812_efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv)
1813{ 1813{
1814 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1814 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1815 elm_widget_sub_object_parent_add(obj);
1816 1815
1817 priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj)); 1816 priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
1818 evas_object_static_clip_set(priv->clip, EINA_TRUE); 1817 evas_object_static_clip_set(priv->clip, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 649a532..664a542 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -113,7 +113,6 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
113 if (!elm_widget_theme_klass_get(obj)) 113 if (!elm_widget_theme_klass_get(obj))
114 elm_widget_theme_klass_set(obj, "frame"); 114 elm_widget_theme_klass_set(obj, "frame");
115 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 115 efl_canvas_group_add(efl_super(obj, MY_CLASS));
116 elm_widget_sub_object_parent_add(obj);
117 116
118 if (elm_widget_is_legacy(obj)) 117 if (elm_widget_is_legacy(obj))
119 { 118 {
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 92a2ce2..166db8d 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -566,7 +566,6 @@ EOLIAN static void
566_efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv) 566_efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv)
567{ 567{
568 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 568 efl_canvas_group_add(efl_super(obj, MY_CLASS));
569 elm_widget_sub_object_parent_add(obj);
570 569
571 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 570 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
572 evas_object_smart_member_add(priv->hit_rect, obj); 571 evas_object_smart_member_add(priv->hit_rect, obj);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index b7ff98a..0fe2bd8 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1833,8 +1833,6 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable
1833 Evas_Object *edje; 1833 Evas_Object *edje;
1834 Evas_Coord minw, minh; 1834 Evas_Coord minw, minh;
1835 1835
1836 elm_widget_sub_object_parent_add(obj);
1837
1838 edje = edje_object_add(evas_object_evas_get(obj)); 1836 edje = edje_object_add(evas_object_evas_get(obj));
1839 elm_widget_resize_object_set(obj, edje); 1837 elm_widget_resize_object_set(obj, edje);
1840 1838
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 6677ccb..63f9491 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -740,8 +740,6 @@ _efl_ui_layout_base_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd
740{ 740{
741 Evas_Object *edje; 741 Evas_Object *edje;
742 742
743 elm_widget_sub_object_parent_add(obj);
744
745 /* has to be there *before* parent's smart_add() */ 743 /* has to be there *before* parent's smart_add() */
746 edje = edje_object_add(evas_object_evas_get(obj)); 744 edje = edje_object_add(evas_object_evas_get(obj));
747 elm_widget_resize_object_set(obj, edje); 745 elm_widget_resize_object_set(obj, edje);
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index b0300db..219d2aa 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -588,7 +588,6 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd)
588 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 588 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
589 589
590 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 590 efl_canvas_group_add(efl_super(obj, MY_CLASS));
591 elm_widget_sub_object_parent_add(obj);
592 591
593 elm_widget_can_focus_set(obj, EINA_TRUE); 592 elm_widget_can_focus_set(obj, EINA_TRUE);
594 593
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index e8102ba..d693a52 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -39,8 +39,6 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
39 obj = efl_constructor(efl_super(obj, MY_CLASS)); 39 obj = efl_constructor(efl_super(obj, MY_CLASS));
40 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 40 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
41 41
42 elm_widget_sub_object_parent_add(obj);
43
44 elm_widget_can_focus_set(obj, EINA_TRUE); 42 elm_widget_can_focus_set(obj, EINA_TRUE);
45 if (elm_widget_theme_object_set(obj, wd->resize_obj, 43 if (elm_widget_theme_object_set(obj, wd->resize_obj,
46 elm_widget_theme_klass_get(obj), 44 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index 0b59884..2f535e1 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -37,8 +37,6 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
37 obj = efl_constructor(efl_super(obj, MY_CLASS)); 37 obj = efl_constructor(efl_super(obj, MY_CLASS));
38 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 38 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
39 39
40 elm_widget_sub_object_parent_add(obj);
41
42 elm_widget_can_focus_set(obj, EINA_TRUE); 40 elm_widget_can_focus_set(obj, EINA_TRUE);
43 if (elm_widget_theme_object_set(obj, wd->resize_obj, 41 if (elm_widget_theme_object_set(obj, wd->resize_obj,
44 elm_widget_theme_klass_get(obj), 42 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index a435c54..b44ea3b 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -37,7 +37,6 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd)
37 elm_widget_theme_klass_set(obj, "nstate"); 37 elm_widget_theme_klass_set(obj, "nstate");
38 obj = efl_constructor(efl_super(obj, MY_CLASS)); 38 obj = efl_constructor(efl_super(obj, MY_CLASS));
39 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 39 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
40 elm_widget_sub_object_parent_add(obj);
41 40
42 pd->state = 0; 41 pd->state = 0;
43 // Default: 2 states 42 // Default: 2 states
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index a37d0fd..efa77f8 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -336,8 +336,6 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
336 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 336 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
337 CRI("Failed to set layout!"); 337 CRI("Failed to set layout!");
338 338
339 elm_widget_sub_object_parent_add(obj);
340
341 pd->cnt = 0; 339 pd->cnt = 0;
342 pd->loop = EFL_UI_PAGER_LOOP_DISABLED; 340 pd->loop = EFL_UI_PAGER_LOOP_DISABLED;
343 341
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index 9e8e4c5..84aa6f0 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -838,7 +838,6 @@ _efl_ui_panel_efl_object_constructor(Eo *obj, Efl_Ui_Panel_Data *_pd)
838 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 838 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
839 839
840 obj = efl_constructor(efl_super(obj, MY_CLASS)); 840 obj = efl_constructor(efl_super(obj, MY_CLASS));
841 elm_widget_sub_object_parent_add(obj);
842 elm_widget_can_focus_set(obj, EINA_TRUE); 841 elm_widget_can_focus_set(obj, EINA_TRUE);
843 842
844 _pd->panel_edje = wd->resize_obj; 843 _pd->panel_edje = wd->resize_obj;
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index a221193..d42b3eb 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -408,7 +408,6 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
408 if (!elm_widget_theme_klass_get(obj)) 408 if (!elm_widget_theme_klass_get(obj))
409 elm_widget_theme_klass_set(obj, "panes"); 409 elm_widget_theme_klass_set(obj, "panes");
410 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 410 efl_canvas_group_add(efl_super(obj, MY_CLASS));
411 elm_widget_sub_object_parent_add(obj);
412 411
413 group = _efl_ui_panes_theme_group_get(obj, sd); 412 group = _efl_ui_panes_theme_group_get(obj, sd);
414 if (elm_widget_theme_object_set(obj, wd->resize_obj, 413 if (elm_widget_theme_object_set(obj, wd->resize_obj,
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index cc8772d..47ef65b 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -215,8 +215,6 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
215 obj = efl_constructor(efl_super(obj, MY_CLASS)); 215 obj = efl_constructor(efl_super(obj, MY_CLASS));
216 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 216 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
217 217
218 elm_widget_sub_object_parent_add(obj);
219
220 elm_widget_can_focus_set(obj, EINA_TRUE); 218 elm_widget_can_focus_set(obj, EINA_TRUE);
221 if (elm_widget_theme_object_set(obj, wd->resize_obj, 219 if (elm_widget_theme_object_set(obj, wd->resize_obj,
222 elm_widget_theme_klass_get(obj), 220 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 2d1ecfc..c65d9bd 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -359,7 +359,6 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
359 if (!elm_widget_theme_klass_get(obj)) 359 if (!elm_widget_theme_klass_get(obj))
360 elm_widget_theme_klass_set(obj, "progressbar"); 360 elm_widget_theme_klass_set(obj, "progressbar");
361 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 361 efl_canvas_group_add(efl_super(obj, MY_CLASS));
362 elm_widget_sub_object_parent_add(obj);
363 362
364 priv->dir = EFL_UI_DIR_RIGHT; 363 priv->dir = EFL_UI_DIR_RIGHT;
365 priv->val = MIN_RATIO_LVL; 364 priv->val = MIN_RATIO_LVL;
diff --git a/src/lib/elementary/efl_ui_relative_layout.c b/src/lib/elementary/efl_ui_relative_layout.c
index c5651fa..fa47d75 100644
--- a/src/lib/elementary/efl_ui_relative_layout.c
+++ b/src/lib/elementary/efl_ui_relative_layout.c
@@ -492,7 +492,6 @@ _efl_ui_relative_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Relative_Layo
492{ 492{
493 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL); 493 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL);
494 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 494 efl_canvas_group_add(efl_super(obj, MY_CLASS));
495 elm_widget_sub_object_parent_add(obj);
496 495
497 elm_widget_highlight_ignore_set(obj, EINA_TRUE); 496 elm_widget_highlight_ignore_set(obj, EINA_TRUE);
498} 497}
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 1d4295e..54e28c5 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -266,8 +266,6 @@ _efl_ui_scroll_alert_popup_efl_object_constructor(Eo *obj,
266 obj = efl_constructor(efl_super(obj, MY_CLASS)); 266 obj = efl_constructor(efl_super(obj, MY_CLASS));
267 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 267 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
268 268
269 elm_widget_sub_object_parent_add(obj);
270
271 pd->scroller = elm_scroller_add(obj); 269 pd->scroller = elm_scroller_add(obj);
272 elm_object_style_set(pd->scroller, "popup/no_inset_shadow"); 270 elm_object_style_set(pd->scroller, "popup/no_inset_shadow");
273 elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_AUTO, 271 elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_AUTO,
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 23f4797..6a5798d 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -655,7 +655,6 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
655 655
656 if (!elm_widget_theme_klass_get(obj)) 656 if (!elm_widget_theme_klass_get(obj))
657 elm_widget_theme_klass_set(obj, "slider"); 657 elm_widget_theme_klass_set(obj, "slider");
658 elm_widget_sub_object_parent_add(obj);
659 658
660 group = _efl_ui_slider_theme_group_get(obj, priv); 659 group = _efl_ui_slider_theme_group_get(obj, priv);
661 if (elm_widget_theme_object_set(obj, wd->resize_obj, 660 if (elm_widget_theme_object_set(obj, wd->resize_obj,
diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c
index 70cbfee..f446bab 100644
--- a/src/lib/elementary/efl_ui_spin.c
+++ b/src/lib/elementary/efl_ui_spin.c
@@ -239,8 +239,6 @@ _efl_ui_spin_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Data *sd)
239 elm_widget_theme_klass_set(obj, "spin"); 239 elm_widget_theme_klass_set(obj, "spin");
240 obj = efl_constructor(efl_super(obj, MY_CLASS)); 240 obj = efl_constructor(efl_super(obj, MY_CLASS));
241 241
242 elm_widget_sub_object_parent_add(obj);
243
244 sd->val_max = 100.0; 242 sd->val_max = 100.0;
245 sd->step = 1.0; 243 sd->step = 1.0;
246 sd->special_values = eina_array_new(sizeof(Efl_Ui_Spin_Special_Value)); 244 sd->special_values = eina_array_new(sizeof(Efl_Ui_Spin_Special_Value));
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 0194921..4941b41 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -830,7 +830,6 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
830 char *group; 830 char *group;
831 831
832 obj = efl_constructor(efl_super(obj, MY_CLASS)); 832 obj = efl_constructor(efl_super(obj, MY_CLASS));
833 elm_widget_sub_object_parent_add(obj);
834 elm_widget_theme_klass_set(obj, "spin_button"); 833 elm_widget_theme_klass_set(obj, "spin_button");
835 834
836 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 835 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index e5fb341..0129121 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -376,9 +376,6 @@ _efl_ui_tab_bar_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Bar_Data *sd)
376 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 376 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
377 CRI("Failed to set layout!"); 377 CRI("Failed to set layout!");
378 378
379
380 elm_widget_sub_object_parent_add(obj);
381
382 sd->dir = EFL_UI_DIR_HORIZONTAL; 379 sd->dir = EFL_UI_DIR_HORIZONTAL;
383 sd->bx = evas_object_box_add(evas_object_evas_get(obj)); 380 sd->bx = evas_object_box_add(evas_object_evas_get(obj));
384 evas_object_box_align_set(sd->bx, 0.5, 0.5); 381 evas_object_box_align_set(sd->bx, 0.5, 0.5);
diff --git a/src/lib/elementary/efl_ui_tab_page.c b/src/lib/elementary/efl_ui_tab_page.c
index 1f7fc2f..a0bd26e 100644
--- a/src/lib/elementary/efl_ui_tab_page.c
+++ b/src/lib/elementary/efl_ui_tab_page.c
@@ -55,9 +55,6 @@ _efl_ui_tab_page_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Page_Data *sd)
55 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 55 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
56 CRI("Failed to set layout!"); 56 CRI("Failed to set layout!");
57 57
58
59 elm_widget_sub_object_parent_add(obj);
60
61 efl_ui_widget_focus_allow_set(obj, EINA_TRUE); 58 efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
62 59
63 sd->content = NULL; 60 sd->content = NULL;
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index 4187f31..2b43aa8 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -99,7 +99,6 @@ _efl_ui_tab_pager_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd)
99 elm_widget_theme_klass_set(obj, "tab_pager"); 99 elm_widget_theme_klass_set(obj, "tab_pager");
100 100
101 obj = efl_constructor(efl_super(obj, MY_CLASS)); 101 obj = efl_constructor(efl_super(obj, MY_CLASS));
102 elm_widget_sub_object_parent_add(obj);
103 102
104 efl_ui_widget_focus_allow_set(obj, EINA_TRUE); 103 efl_ui_widget_focus_allow_set(obj, EINA_TRUE);
105 104
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index f88a793..7a11f2f 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -161,8 +161,6 @@ _efl_ui_table_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Table_Data *pd)
161 Custom_Table_Data *custom; 161 Custom_Table_Data *custom;
162 Evas_Object *table; 162 Evas_Object *table;
163 163
164 elm_widget_sub_object_parent_add(obj);
165
166 table = efl_add(CUSTOM_TABLE_CLASS, obj); 164 table = efl_add(CUSTOM_TABLE_CLASS, obj);
167 custom = efl_data_scope_get(table, CUSTOM_TABLE_CLASS); 165 custom = efl_data_scope_get(table, CUSTOM_TABLE_CLASS);
168 custom->gd = pd; 166 custom->gd = pd;
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 00748a7..12b56c1 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -1009,7 +1009,6 @@ _efl_ui_tags_efl_object_constructor(Eo *obj, Efl_Ui_Tags_Data *sd)
1009 elm_widget_theme_klass_set(obj, "tags"); 1009 elm_widget_theme_klass_set(obj, "tags");
1010 1010
1011 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1011 obj = efl_constructor(efl_super(obj, MY_CLASS));
1012 elm_widget_sub_object_parent_add(obj);
1013 1012
1014 if (elm_widget_theme_object_set(obj, wd->resize_obj, 1013 if (elm_widget_theme_object_set(obj, wd->resize_obj,
1015 elm_widget_theme_klass_get(obj), 1014 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index cae523b..ebb2dd5 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -2126,8 +2126,6 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
2126 elm_widget_theme_klass_set(obj, "text"); 2126 elm_widget_theme_klass_set(obj, "text");
2127 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2127 obj = efl_constructor(efl_super(obj, MY_CLASS));
2128 2128
2129 elm_widget_sub_object_parent_add(obj);
2130
2131 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); 2129 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
2132 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj); 2130 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj);
2133 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj); 2131 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj);
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c
index dd19e6a..355b8c2 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.c
+++ b/src/lib/elementary/efl_ui_text_alert_popup.c
@@ -274,8 +274,6 @@ _efl_ui_text_alert_popup_efl_object_constructor(Eo *obj,
274 obj = efl_constructor(efl_super(obj, MY_CLASS)); 274 obj = efl_constructor(efl_super(obj, MY_CLASS));
275 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 275 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
276 276
277 elm_widget_sub_object_parent_add(obj);
278
279 pd->scroller = elm_scroller_add(obj); 277 pd->scroller = elm_scroller_add(obj);
280 elm_object_style_set(pd->scroller, "popup/no_inset_shadow"); 278 elm_object_style_set(pd->scroller, "popup/no_inset_shadow");
281 elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_OFF, 279 elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_OFF,
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index b602f6c..679a68a 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -584,7 +584,6 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv)
584 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 584 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
585 585
586 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 586 efl_canvas_group_add(efl_super(obj, MY_CLASS));
587 elm_widget_sub_object_parent_add(obj);
588 587
589 priv->text_obj = edje_object_add(evas_object_evas_get(obj)); 588 priv->text_obj = edje_object_add(evas_object_evas_get(obj));
590 elm_widget_theme_object_set(obj, priv->text_obj, "textpath", "base", 589 elm_widget_theme_object_set(obj, priv->text_obj, "textpath", "base",
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index a77238b..732f8ae 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -226,8 +226,6 @@ _efl_ui_timepicker_efl_object_constructor(Eo *obj, Efl_Ui_Timepicker_Data *pd EI
226 226
227 _fields_init(obj); 227 _fields_init(obj);
228 228
229 elm_widget_sub_object_parent_add(obj);
230
231 elm_widget_can_focus_set(obj, EINA_TRUE); 229 elm_widget_can_focus_set(obj, EINA_TRUE);
232 230
233 return obj; 231 return obj;
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index dd0d6f1..75b6b15 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -242,7 +242,6 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
242 if (!elm_widget_theme_klass_get(obj)) 242 if (!elm_widget_theme_klass_get(obj))
243 elm_widget_theme_klass_set(obj, "video"); 243 elm_widget_theme_klass_set(obj, "video");
244 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 244 efl_canvas_group_add(efl_super(obj, MY_CLASS));
245 elm_widget_sub_object_parent_add(obj);
246 elm_widget_can_focus_set(obj, EINA_TRUE); 245 elm_widget_can_focus_set(obj, EINA_TRUE);
247 246
248 priv->emotion = emotion_object_add(evas_object_evas_get(obj)); 247 priv->emotion = emotion_object_add(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 6ab2d8a..872e32a 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -5059,7 +5059,15 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
5059 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 5059 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
5060 if (!efl_isa(obj, EFL_UI_WIN_CLASS)) 5060 if (!efl_isa(obj, EFL_UI_WIN_CLASS))
5061 { 5061 {
5062 efl_ui_widget_sub_object_add(efl_parent_get(obj), obj); 5062 Eo *parent = efl_parent_get(obj);
5063 if (!efl_isa(parent, EFL_UI_WIDGET_CLASS))
5064 {
5065 ERR("You passed a wrong parent parameter (%p %s). "
5066 "Elementary widget's parent should be an elementary widget.",
5067 parent, evas_object_type_get(parent));
5068 }
5069
5070 efl_ui_widget_sub_object_add(parent, obj);
5063 } 5071 }
5064 5072
5065 sd->on_create = EINA_FALSE; 5073 sd->on_create = EINA_FALSE;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 3c17d46..71e581f 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -331,7 +331,6 @@ EOLIAN static void
331_elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) 331_elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
332{ 332{
333 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 333 efl_canvas_group_add(efl_super(obj, MY_CLASS));
334 elm_widget_sub_object_parent_add(obj);
335 334
336 efl_ui_mirrored_automatic_set(obj, EINA_FALSE); 335 efl_ui_mirrored_automatic_set(obj, EINA_FALSE);
337 336
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index ac5a9190..08817ba 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1033,7 +1033,6 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1033 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1033 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1034 1034
1035 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1035 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1036 elm_widget_sub_object_parent_add(obj);
1037 1036
1038 if (!elm_layout_theme_set 1037 if (!elm_layout_theme_set
1039 (obj, "ctxpopup", "base", elm_widget_style_get(obj))) 1038 (obj, "ctxpopup", "base", elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index b718924..6f52cf6 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1677,7 +1677,6 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
1677 char buf[1024]; 1677 char buf[1024];
1678 1678
1679 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1679 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1680 elm_widget_sub_object_parent_add(obj);
1681 elm_widget_can_focus_set(obj, EINA_FALSE); 1680 elm_widget_can_focus_set(obj, EINA_FALSE);
1682 1681
1683 priv->expand = !!_elm_config->fileselector_expand_enable; 1682 priv->expand = !!_elm_config->fileselector_expand_enable;
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 8dfe7ab..1a64453 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -216,7 +216,6 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
216 const char *path; 216 const char *path;
217 217
218 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 218 efl_canvas_group_add(efl_super(obj, MY_CLASS));
219 elm_widget_sub_object_parent_add(obj);
220 219
221 priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); 220 priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
222 path = eina_environment_home_get(); 221 path = eina_environment_home_get();
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index f06862e..df9ac79 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -222,7 +222,6 @@ EOLIAN static void
222_elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) 222_elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
223{ 223{
224 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 224 efl_canvas_group_add(efl_super(obj, MY_CLASS));
225 elm_widget_sub_object_parent_add(obj);
226 225
227 priv->button = elm_fileselector_button_add(obj); 226 priv->button = elm_fileselector_button_add(obj);
228 efl_ui_mirrored_automatic_set(priv->button, EINA_FALSE); 227 efl_ui_mirrored_automatic_set(priv->button, EINA_FALSE);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 3986b2a..a7b5685 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -638,7 +638,6 @@ EOLIAN static void
638_elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd) 638_elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd)
639{ 639{
640 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 640 efl_canvas_group_add(efl_super(obj, MY_CLASS));
641 elm_widget_sub_object_parent_add(obj);
642 641
643 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); 642 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
644 643
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 0032ad0..452d7e0 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1562,7 +1562,6 @@ _elm_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Elm_Multibuttonentry_D
1562 if (!elm_widget_theme_klass_get(obj)) 1562 if (!elm_widget_theme_klass_get(obj))
1563 elm_widget_theme_klass_set(obj, "multibuttonentry"); 1563 elm_widget_theme_klass_set(obj, "multibuttonentry");
1564 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1564 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1565 elm_widget_sub_object_parent_add(obj);
1566 1565
1567 if (elm_widget_theme_object_set(obj, wd->resize_obj, 1566 if (elm_widget_theme_object_set(obj, wd->resize_obj,
1568 elm_widget_theme_klass_get(obj), 1567 elm_widget_theme_klass_get(obj),
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 251b3eb..fa22902 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1392,7 +1392,6 @@ _elm_naviframe_efl_canvas_group_group_add(Eo *obj, Elm_Naviframe_Data *priv)
1392 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1392 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1393 1393
1394 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1394 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1395 elm_widget_sub_object_parent_add(obj);
1396 1395
1397 priv->dummy_edje = wd->resize_obj; 1396 priv->dummy_edje = wd->resize_obj;
1398 evas_object_smart_member_add(priv->dummy_edje, obj); 1397 evas_object_smart_member_add(priv->dummy_edje, obj);
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 8a386fc..275599c 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -592,7 +592,6 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
592 char buf[256]; 592 char buf[256];
593 593
594 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 594 efl_canvas_group_add(efl_super(obj, MY_CLASS));
595 elm_widget_sub_object_parent_add(obj);
596 595
597 if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj))) 596 if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
598 CRI("Failed to set layout!"); 597 CRI("Failed to set layout!");
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index a967661..7cdf1ed 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1417,7 +1417,6 @@ _elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
1417 char style[1024]; 1417 char style[1024];
1418 1418
1419 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1419 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1420 elm_widget_sub_object_parent_add(obj);
1421 1420
1422 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); 1421 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
1423 1422
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 3380979..9b33f4d 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -48,7 +48,6 @@ EOLIAN static void
48_elm_access_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED) 48_elm_access_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
49{ 49{
50 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 50 efl_canvas_group_add(efl_super(obj, MY_CLASS));
51 elm_widget_sub_object_parent_add(obj);
52} 51}
53 52
54static Eina_Bool 53static Eina_Bool
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 07fc630..d4e3ca1 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -483,7 +483,6 @@ _elm_actionslider_efl_canvas_group_group_add(Eo *obj, Elm_Actionslider_Data *pri
483 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 483 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
484 484
485 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 485 efl_canvas_group_add(efl_super(obj, MY_CLASS));
486 elm_widget_sub_object_parent_add(obj);
487 486
488 priv->enabled_position = ELM_ACTIONSLIDER_ALL; 487 priv->enabled_position = ELM_ACTIONSLIDER_ALL;
489 488
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index bd6a00d..68e5996 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -323,7 +323,6 @@ _elm_box_efl_canvas_group_group_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
323 _on_size_hints_changed, obj); 323 _on_size_hints_changed, obj);
324 324
325 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 325 efl_canvas_group_add(efl_super(obj, MY_CLASS));
326 elm_widget_sub_object_parent_add(obj);
327 326
328 efl_event_callback_add 327 efl_event_callback_add
329 (wd->resize_obj, ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj); 328 (wd->resize_obj, ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index f6f4a97..559ba53 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -147,7 +147,6 @@ _elm_bubble_efl_canvas_group_group_add(Eo *obj, Elm_Bubble_Data *priv)
147 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 147 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
148 148
149 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 149 efl_canvas_group_add(efl_super(obj, MY_CLASS));
150 elm_widget_sub_object_parent_add(obj);
151 150
152 priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default 151 priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
153 152
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index b3c7838..b249fd4 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1337,7 +1337,6 @@ _elm_calendar_efl_canvas_group_group_add(Eo *obj, Elm_Calendar_Data *priv)
1337 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1337 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1338 1338
1339 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1339 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1340 elm_widget_sub_object_parent_add(obj);
1341 1340
1342 priv->first_interval = 0.85; 1341 priv->first_interval = 0.85;
1343 priv->date_min.tm_year = 2; 1342 priv->date_min.tm_year = 2;
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 948ec7c..9b6caa1 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -722,7 +722,6 @@ _elm_clock_efl_canvas_group_group_add(Eo *obj, Elm_Clock_Data *priv)
722 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 722 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
723 723
724 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 724 efl_canvas_group_add(efl_super(obj, MY_CLASS));
725 elm_widget_sub_object_parent_add(obj);
726 725
727 priv->cur.ampm = -1; 726 priv->cur.ampm = -1;
728 priv->cur.seconds = EINA_TRUE; 727 priv->cur.seconds = EINA_TRUE;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 9ac78ee..831ff3b 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1954,7 +1954,6 @@ _elm_colorselector_efl_canvas_group_group_add(Eo *obj, Elm_Colorselector_Data *p
1954 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1954 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1955 1955
1956 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1956 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1957 elm_widget_sub_object_parent_add(obj);
1958 1957
1959 if (!elm_layout_theme_set 1958 if (!elm_layout_theme_set
1960 (obj, "colorselector", "palette", elm_object_style_get(obj))) 1959 (obj, "colorselector", "palette", elm_object_style_get(obj)))
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index a72c08e..55c6bc8 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -927,7 +927,6 @@ EOLIAN static void
927_elm_conformant_efl_canvas_group_group_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 927_elm_conformant_efl_canvas_group_group_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
928{ 928{
929 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 929 efl_canvas_group_add(efl_super(obj, MY_CLASS));
930 elm_widget_sub_object_parent_add(obj);
931 elm_widget_can_focus_set(obj, EINA_FALSE); 930 elm_widget_can_focus_set(obj, EINA_FALSE);
932 931
933 if (!elm_layout_theme_set 932 if (!elm_layout_theme_set
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 78536bb..781ee0c 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -445,7 +445,6 @@ EOLIAN static void
445_elm_dayselector_efl_canvas_group_group_add(Eo *obj, Elm_Dayselector_Data *priv) 445_elm_dayselector_efl_canvas_group_group_add(Eo *obj, Elm_Dayselector_Data *priv)
446{ 446{
447 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 447 efl_canvas_group_add(efl_super(obj, MY_CLASS));
448 elm_widget_sub_object_parent_add(obj);
449 448
450 if (!elm_layout_theme_set(obj, "dayselector", "base", 449 if (!elm_layout_theme_set(obj, "dayselector", "base",
451 elm_widget_style_get(obj))) 450 elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index b6c49ec..fd2494f 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1221,8 +1221,6 @@ _elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *pri
1221 Evas *evas; 1221 Evas *evas;
1222 Evas_Object *blank, *edje; 1222 Evas_Object *blank, *edje;
1223 1223
1224 elm_widget_sub_object_parent_add(obj);
1225
1226 evas = evas_object_evas_get(obj); 1224 evas = evas_object_evas_get(obj);
1227 evas_event_freeze(evas); 1225 evas_event_freeze(evas);
1228 1226
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index b229596..7478a40 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3785,7 +3785,6 @@ _elm_entry_efl_canvas_group_group_add(Eo *obj, Elm_Entry_Data *priv)
3785 if (!elm_widget_theme_klass_get(obj)) 3785 if (!elm_widget_theme_klass_get(obj))
3786 elm_widget_theme_klass_set(obj, "entry"); 3786 elm_widget_theme_klass_set(obj, "entry");
3787 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 3787 efl_canvas_group_add(efl_super(obj, MY_CLASS));
3788 elm_widget_sub_object_parent_add(obj);
3789 3788
3790 priv->entry_edje = wd->resize_obj; 3789 priv->entry_edje = wd->resize_obj;
3791 3790
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 8085325..f9ba061 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -616,7 +616,6 @@ EOLIAN static void
616_elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *priv) 616_elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *priv)
617{ 617{
618 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 618 efl_canvas_group_add(efl_super(obj, MY_CLASS));
619 elm_widget_sub_object_parent_add(obj);
620 619
621 if (!elm_layout_theme_set 620 if (!elm_layout_theme_set
622 (obj, "flipselector", "base", elm_widget_style_get(obj))) 621 (obj, "flipselector", "base", elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index cefa035..76e540a 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4092,7 +4092,6 @@ _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
4092 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 4092 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
4093 4093
4094 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 4094 efl_canvas_group_add(efl_super(obj, MY_CLASS));
4095 elm_widget_sub_object_parent_add(obj);
4096 4095
4097 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 4096 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
4098 evas_object_smart_member_add(priv->hit_rect, obj); 4097 evas_object_smart_member_add(priv->hit_rect, obj);
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 0cdec22..0a893b7 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5782,7 +5782,6 @@ _elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
5782 int i; 5782 int i;
5783 5783
5784 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 5784 efl_canvas_group_add(efl_super(obj, MY_CLASS));
5785 elm_widget_sub_object_parent_add(obj);
5786 5785
5787 priv->size_caches = eina_hash_pointer_new(_size_cache_free); 5786 priv->size_caches = eina_hash_pointer_new(_size_cache_free);
5788 priv->hit_rect = evas_object_rectangle_add(e); 5787 priv->hit_rect = evas_object_rectangle_add(e);
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index 667a271..de1fe79 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -3748,7 +3748,6 @@ EOLIAN static void
3748_elm_gesture_layer_efl_canvas_group_group_add(Eo *obj, Elm_Gesture_Layer_Data *priv) 3748_elm_gesture_layer_efl_canvas_group_group_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
3749{ 3749{
3750 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 3750 efl_canvas_group_add(efl_super(obj, MY_CLASS));
3751 elm_widget_sub_object_parent_add(obj);
3752 3751
3753 priv->line_min_length = 3752 priv->line_min_length =
3754 _elm_config->glayer_line_min_length * elm_config_finger_size_get(); 3753 _elm_config->glayer_line_min_length * elm_config_finger_size_get();
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 1210416..51e3cb6 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -224,8 +224,6 @@ _elm_glview_efl_canvas_group_group_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSE
224{ 224{
225 Evas_Object *img; 225 Evas_Object *img;
226 226
227 elm_widget_sub_object_parent_add(obj);
228
229 // Create image to render Evas_GL Surface 227 // Create image to render Evas_GL Surface
230 img = evas_object_image_filled_add(evas_object_evas_get(obj)); 228 img = evas_object_image_filled_add(evas_object_evas_get(obj));
231 elm_widget_resize_object_set(obj, img); 229 elm_widget_resize_object_set(obj, img);
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 40b636e..6548f21 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -59,8 +59,6 @@ _elm_grid_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
59 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 59 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
60 Evas_Object *grid; 60 Evas_Object *grid;
61 61
62 elm_widget_sub_object_parent_add(obj);
63
64 grid = evas_object_grid_add(evas_object_evas_get(obj)); 62 grid = evas_object_grid_add(evas_object_evas_get(obj));
65 elm_widget_resize_object_set(obj, grid); 63 elm_widget_resize_object_set(obj, grid);
66 evas_object_grid_size_set(wd->resize_obj, 100, 100); 64 evas_object_grid_size_set(wd->resize_obj, 100, 100);
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index e5019fe..271436f 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -582,7 +582,6 @@ EOLIAN static void
582_elm_hover_efl_canvas_group_group_add(Eo *obj, Elm_Hover_Data *sd) 582_elm_hover_efl_canvas_group_group_add(Eo *obj, Elm_Hover_Data *sd)
583{ 583{
584 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 584 efl_canvas_group_add(efl_super(obj, MY_CLASS));
585 elm_widget_sub_object_parent_add(obj);
586 585
587 ELM_HOVER_PARTS_FOREACH 586 ELM_HOVER_PARTS_FOREACH
588 sd->subs[i].swallow = _content_aliases[i].alias; 587 sd->subs[i].swallow = _content_aliases[i].alias;
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 819f549..3011a4d 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -493,7 +493,6 @@ EOLIAN static void
493_elm_icon_efl_canvas_group_group_add(Eo *obj, Elm_Icon_Data *priv) 493_elm_icon_efl_canvas_group_group_add(Eo *obj, Elm_Icon_Data *priv)
494{ 494{
495 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 495 efl_canvas_group_add(efl_super(obj, MY_CLASS));
496 elm_widget_sub_object_parent_add(obj);
497 496
498 priv->thumb.request = NULL; 497 priv->thumb.request = NULL;
499} 498}
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 49fa531..c046080 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1045,7 +1045,6 @@ _elm_index_efl_canvas_group_group_add(Eo *obj, Elm_Index_Data *priv)
1045 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1045 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1046 1046
1047 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1047 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1048 elm_widget_sub_object_parent_add(obj);
1049 1048
1050 if (!elm_layout_theme_set 1049 if (!elm_layout_theme_set
1051 (obj, "index", "base/vertical", elm_widget_style_get(obj))) 1050 (obj, "index", "base/vertical", elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 54d2c4d..e501280 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -46,7 +46,6 @@ EOLIAN static void
46_elm_inwin_efl_canvas_group_group_add(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) 46_elm_inwin_efl_canvas_group_group_add(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED)
47{ 47{
48 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 48 efl_canvas_group_add(efl_super(obj, MY_CLASS));
49 elm_widget_sub_object_parent_add(obj);
50 49
51 elm_widget_can_focus_set(obj, EINA_FALSE); 50 elm_widget_can_focus_set(obj, EINA_FALSE);
52 elm_widget_highlight_ignore_set(obj, EINA_TRUE); 51 elm_widget_highlight_ignore_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 9e31e5a..4468b72 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -380,8 +380,6 @@ _elm_label_efl_canvas_group_group_add(Eo *obj, Elm_Label_Data *priv)
380 380
381 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 381 efl_canvas_group_add(efl_super(obj, MY_CLASS));
382 382
383 elm_widget_sub_object_parent_add(obj);
384
385 priv->linewrap = ELM_WRAP_NONE; 383 priv->linewrap = ELM_WRAP_NONE;
386 priv->wrap_w = -1; 384 priv->wrap_w = -1;
387 priv->slide_duration = 10; 385 priv->slide_duration = 10;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 891e585..da40668 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2352,7 +2352,6 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
2352 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 2352 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
2353 2353
2354 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 2354 efl_canvas_group_add(efl_super(obj, MY_CLASS));
2355 elm_widget_sub_object_parent_add(obj);
2356 2355
2357 elm_widget_can_focus_set(obj, EINA_TRUE); 2356 elm_widget_can_focus_set(obj, EINA_TRUE);
2358 2357
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 2e14abf..71deea0 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4092,8 +4092,6 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
4092 Elm_Map_Pan_Data *pan_data; 4092 Elm_Map_Pan_Data *pan_data;
4093 Evas_Object *edje; 4093 Evas_Object *edje;
4094 4094
4095 elm_widget_sub_object_parent_add(obj);
4096
4097 edje = edje_object_add(evas_object_evas_get(obj)); 4095 edje = edje_object_add(evas_object_evas_get(obj));
4098 elm_widget_resize_object_set(obj, edje); 4096 elm_widget_resize_object_set(obj, edje);
4099 4097
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 46796c1..5706743 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -284,7 +284,6 @@ _elm_mapbuf_efl_canvas_group_group_add(Eo *obj, Elm_Mapbuf_Data *priv)
284 elm_widget_resize_object_set(obj, rect); 284 elm_widget_resize_object_set(obj, rect);
285 285
286 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 286 efl_canvas_group_add(efl_super(obj, MY_CLASS));
287 elm_widget_sub_object_parent_add(obj);
288 287
289 evas_object_static_clip_set(rect, EINA_TRUE); 288 evas_object_static_clip_set(rect, EINA_TRUE);
290 evas_object_pass_events_set(rect, EINA_TRUE); 289 evas_object_pass_events_set(rect, EINA_TRUE);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index df38939..236d859 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -690,7 +690,6 @@ EOLIAN static void
690_elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) 690_elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
691{ 691{
692 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 692 efl_canvas_group_add(efl_super(obj, MY_CLASS));
693 elm_widget_sub_object_parent_add(obj);
694 693
695 elm_widget_can_focus_set(obj, EINA_FALSE); 694 elm_widget_can_focus_set(obj, EINA_FALSE);
696 695
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index df98997..0f1bbd3 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -449,7 +449,6 @@ EOLIAN static void
449_elm_notify_efl_canvas_group_group_add(Eo *obj, Elm_Notify_Data *priv) 449_elm_notify_efl_canvas_group_group_add(Eo *obj, Elm_Notify_Data *priv)
450{ 450{
451 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 451 efl_canvas_group_add(efl_super(obj, MY_CLASS));
452 elm_widget_sub_object_parent_add(obj);
453 452
454 priv->allow_events = EINA_TRUE; 453 priv->allow_events = EINA_TRUE;
455 454
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index a0b4ccd..7d9e800 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -830,7 +830,6 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
830 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 830 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
831 831
832 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 832 efl_canvas_group_add(efl_super(obj, MY_CLASS));
833 elm_widget_sub_object_parent_add(obj);
834 elm_widget_can_focus_set(obj, EINA_TRUE); 833 elm_widget_can_focus_set(obj, EINA_TRUE);
835 834
836 priv->panel_edje = wd->resize_obj; 835 priv->panel_edje = wd->resize_obj;
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 1af5e2b..92d9aed 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -262,7 +262,6 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
262 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 262 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
263 263
264 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 264 efl_canvas_group_add(efl_super(obj, MY_CLASS));
265 elm_widget_sub_object_parent_add(obj);
266 265
267 elm_widget_can_focus_set(obj, EINA_FALSE); 266 elm_widget_can_focus_set(obj, EINA_FALSE);
268 267
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index f55c616..4b1f005 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -114,7 +114,6 @@ _elm_plug_efl_canvas_group_group_add(Eo *obj, void *sd EINA_UNUSED)
114 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 114 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
115 115
116 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 116 efl_canvas_group_add(efl_super(obj, MY_CLASS));
117 elm_widget_sub_object_parent_add(obj);
118 117
119 ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); 118 ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
120 if (!ee) return; 119 if (!ee) return;
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index edd2213..a320563 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -48,7 +48,6 @@ EOLIAN static void
48_elm_prefs_efl_canvas_group_group_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) 48_elm_prefs_efl_canvas_group_group_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
49{ 49{
50 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 50 efl_canvas_group_add(efl_super(obj, MY_CLASS));
51 elm_widget_sub_object_parent_add(obj);
52} 51}
53 52
54static void _item_free(Elm_Prefs_Item_Node *it); 53static void _item_free(Elm_Prefs_Item_Node *it);
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 3b9d3ec..be51b20 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -138,7 +138,6 @@ _elm_route_efl_canvas_group_group_add(Eo *obj, Elm_Route_Data *priv)
138{ 138{
139 139
140 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 140 efl_canvas_group_add(efl_super(obj, MY_CLASS));
141 elm_widget_sub_object_parent_add(obj);
142 elm_widget_can_focus_set(obj, EINA_FALSE); 141 elm_widget_can_focus_set(obj, EINA_FALSE);
143 142
144 evas_object_event_callback_add 143 evas_object_event_callback_add
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index f70ec39..6a1e329 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -778,7 +778,6 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
778 Evas_Coord minw, minh; 778 Evas_Coord minw, minh;
779 779
780 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 780 efl_canvas_group_add(efl_super(obj, MY_CLASS));
781 elm_widget_sub_object_parent_add(obj);
782 elm_widget_can_focus_set(obj, EINA_TRUE); 781 elm_widget_can_focus_set(obj, EINA_TRUE);
783 782
784 if (!elm_layout_theme_set 783 if (!elm_layout_theme_set
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 96d7558..0a6a3d1 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -611,7 +611,6 @@ _elm_segment_control_efl_canvas_group_group_add(Eo *obj, Elm_Segment_Control_Dat
611{ 611{
612 sd->obj = obj; 612 sd->obj = obj;
613 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 613 efl_canvas_group_add(efl_super(obj, MY_CLASS));
614 elm_widget_sub_object_parent_add(obj);
615 614
616 if (!elm_layout_theme_set 615 if (!elm_layout_theme_set
617 (obj, "segment_control", "base", elm_widget_style_get(obj))) 616 (obj, "segment_control", "base", elm_widget_style_get(obj)))
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 2c73da1..792a742 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -48,7 +48,6 @@ EOLIAN static void
48_elm_separator_efl_canvas_group_group_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 48_elm_separator_efl_canvas_group_group_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
49{ 49{
50 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 50 efl_canvas_group_add(efl_super(obj, MY_CLASS));
51 elm_widget_sub_object_parent_add(obj);
52 elm_widget_can_focus_set(obj, EINA_FALSE); 51 elm_widget_can_focus_set(obj, EINA_FALSE);
53 52
54 if (!elm_layout_theme_set 53 if (!elm_layout_theme_set
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index 741be9e..da88874 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -310,7 +310,6 @@ _elm_slideshow_efl_canvas_group_group_add(Eo *obj, Elm_Slideshow_Data *priv)
310 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 310 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
311 311
312 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 312 efl_canvas_group_add(efl_super(obj, MY_CLASS));
313 elm_widget_sub_object_parent_add(obj);
314 313
315 priv->count_item_pre_before = 2; 314 priv->count_item_pre_before = 2;
316 priv->count_item_pre_after = 2; 315 priv->count_item_pre_after = 2;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 001dd3b..3c35f0e 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1187,7 +1187,6 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
1187 ELM_SPINNER_DATA_GET(obj, sd); 1187 ELM_SPINNER_DATA_GET(obj, sd);
1188 1188
1189 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 1189 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1190 elm_widget_sub_object_parent_add(obj);
1191 1190
1192 priv->val_max = 100.0; 1191 priv->val_max = 100.0;
1193 priv->step = 1.0; 1192 priv->step = 1.0;
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 14a287f..fa07e59 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -92,8 +92,6 @@ _elm_table_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
92{ 92{
93 Evas_Object *table; 93 Evas_Object *table;
94 94
95 elm_widget_sub_object_parent_add(obj);
96
97 table = evas_object_table_add(evas_object_evas_get(obj)); 95 table = evas_object_table_add(evas_object_evas_get(obj));
98 elm_widget_resize_object_set(obj, table); 96 elm_widget_resize_object_set(obj, table);
99 97
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index df6244e..67ac441 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -532,7 +532,6 @@ _elm_thumb_efl_canvas_group_group_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
532 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 532 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
533 533
534 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 534 efl_canvas_group_add(efl_super(obj, MY_CLASS));
535 elm_widget_sub_object_parent_add(obj);
536 535
537 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj))) 536 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
538 CRI("Failed to set layout!"); 537 CRI("Failed to set layout!");
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index b64f4d9..0efcacb 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2740,8 +2740,6 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
2740{ 2740{
2741 Evas_Object *edje; 2741 Evas_Object *edje;
2742 2742
2743 elm_widget_sub_object_parent_add(obj);
2744
2745 edje = edje_object_add(evas_object_evas_get(obj)); 2743 edje = edje_object_add(evas_object_evas_get(obj));
2746 elm_widget_resize_object_set(obj, edje); 2744 elm_widget_resize_object_set(obj, edje);
2747 2745
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index d601460..8821846 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -59,7 +59,6 @@ _elm_web_none_efl_canvas_group_group_add(Eo *obj, Elm_Web_None_Data *_pd EINA_UN
59 elm_widget_resize_object_set(obj, resize_obj); 59 elm_widget_resize_object_set(obj, resize_obj);
60 60
61 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 61 efl_canvas_group_add(efl_super(obj, MY_CLASS));
62 elm_widget_sub_object_parent_add(obj);
63} 62}
64 63
65EOLIAN static Evas_Object* 64EOLIAN static Evas_Object*