zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=7947cbddebbcb734d08eff099ad8dba4885d6b87
commit 7947cbddebbcb734d08eff099ad8dba4885d6b87 Author: Yeongjong Lee <[email protected]> Date: Fri Apr 12 05:38:00 2019 +0000 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 <[email protected]> Differential Revision: https://phab.enlightenment.org/D8280 --- src/lib/elementary/efl_ui_alert_popup.c | 2 -- src/lib/elementary/efl_ui_anchor_popup.c | 2 -- src/lib/elementary/efl_ui_bg.c | 1 - src/lib/elementary/efl_ui_box.c | 1 - src/lib/elementary/efl_ui_button.c | 1 - src/lib/elementary/efl_ui_calendar.c | 2 -- src/lib/elementary/efl_ui_clock.c | 1 - src/lib/elementary/efl_ui_datepicker.c | 2 -- src/lib/elementary/efl_ui_flip.c | 1 - src/lib/elementary/efl_ui_frame.c | 1 - src/lib/elementary/efl_ui_image.c | 1 - src/lib/elementary/efl_ui_image_zoomable.c | 2 -- src/lib/elementary/efl_ui_layout.c | 2 -- src/lib/elementary/efl_ui_list_view.c | 1 - src/lib/elementary/efl_ui_navigation_bar.c | 2 -- src/lib/elementary/efl_ui_navigation_layout.c | 2 -- src/lib/elementary/efl_ui_nstate.c | 1 - src/lib/elementary/efl_ui_pager.c | 2 -- src/lib/elementary/efl_ui_panel.c | 1 - src/lib/elementary/efl_ui_panes.c | 1 - src/lib/elementary/efl_ui_popup.c | 2 -- src/lib/elementary/efl_ui_progressbar.c | 1 - src/lib/elementary/efl_ui_relative_layout.c | 1 - src/lib/elementary/efl_ui_scroll_alert_popup.c | 2 -- src/lib/elementary/efl_ui_slider.c | 1 - src/lib/elementary/efl_ui_spin.c | 2 -- src/lib/elementary/efl_ui_spin_button.c | 1 - src/lib/elementary/efl_ui_tab_bar.c | 3 --- src/lib/elementary/efl_ui_tab_page.c | 3 --- src/lib/elementary/efl_ui_tab_pager.c | 1 - src/lib/elementary/efl_ui_table.c | 2 -- src/lib/elementary/efl_ui_tags.c | 1 - src/lib/elementary/efl_ui_text.c | 2 -- src/lib/elementary/efl_ui_text_alert_popup.c | 2 -- src/lib/elementary/efl_ui_textpath.c | 1 - src/lib/elementary/efl_ui_timepicker.c | 2 -- src/lib/elementary/efl_ui_video.c | 1 - src/lib/elementary/efl_ui_widget.c | 10 +++++++++- src/lib/elementary/elc_combobox.c | 1 - src/lib/elementary/elc_ctxpopup.c | 1 - src/lib/elementary/elc_fileselector.c | 1 - src/lib/elementary/elc_fileselector_button.c | 1 - src/lib/elementary/elc_fileselector_entry.c | 1 - src/lib/elementary/elc_hoversel.c | 1 - src/lib/elementary/elc_multibuttonentry.c | 1 - src/lib/elementary/elc_naviframe.c | 1 - src/lib/elementary/elc_player.c | 1 - src/lib/elementary/elc_popup.c | 1 - src/lib/elementary/elm_access.c | 1 - src/lib/elementary/elm_actionslider.c | 1 - src/lib/elementary/elm_box.c | 1 - src/lib/elementary/elm_bubble.c | 1 - src/lib/elementary/elm_calendar.c | 1 - src/lib/elementary/elm_clock.c | 1 - src/lib/elementary/elm_colorselector.c | 1 - src/lib/elementary/elm_conform.c | 1 - src/lib/elementary/elm_dayselector.c | 1 - src/lib/elementary/elm_diskselector.c | 2 -- src/lib/elementary/elm_entry.c | 1 - src/lib/elementary/elm_flipselector.c | 1 - src/lib/elementary/elm_gengrid.c | 1 - src/lib/elementary/elm_genlist.c | 1 - src/lib/elementary/elm_gesture_layer.c | 1 - src/lib/elementary/elm_glview.c | 2 -- src/lib/elementary/elm_grid.c | 2 -- src/lib/elementary/elm_hover.c | 1 - src/lib/elementary/elm_icon.c | 1 - src/lib/elementary/elm_index.c | 1 - src/lib/elementary/elm_inwin.c | 1 - src/lib/elementary/elm_label.c | 2 -- src/lib/elementary/elm_list.c | 1 - src/lib/elementary/elm_map.c | 2 -- src/lib/elementary/elm_mapbuf.c | 1 - src/lib/elementary/elm_menu.c | 1 - src/lib/elementary/elm_notify.c | 1 - src/lib/elementary/elm_panel.c | 1 - src/lib/elementary/elm_photo.c | 1 - src/lib/elementary/elm_plug.c | 1 - src/lib/elementary/elm_prefs.c | 1 - src/lib/elementary/elm_route.c | 1 - src/lib/elementary/elm_scroller.c | 1 - src/lib/elementary/elm_segment_control.c | 1 - src/lib/elementary/elm_separator.c | 1 - src/lib/elementary/elm_slideshow.c | 1 - src/lib/elementary/elm_spinner.c | 1 - src/lib/elementary/elm_table.c | 2 -- src/lib/elementary/elm_thumb.c | 1 - src/lib/elementary/elm_toolbar.c | 2 -- src/modules/elementary/web/none/elm_web_none.c | 1 - 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 1fe6f55a34..e7eac4a955 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, obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - return obj; } diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c index a02e6a8b2b..ec0573be4c 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, obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - pd->priority[0] = EFL_UI_POPUP_ALIGN_TOP; pd->priority[1] = EFL_UI_POPUP_ALIGN_LEFT; 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 aea33a086a..88d5ef7eb1 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) elm_widget_theme_klass_set(obj, "bg"); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); 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 eec5a645d8..71d60a6b8a 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -132,7 +132,6 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj); efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj); diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 1bff2c930b..a3c1c4dbfc 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_ if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "button"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (elm_widget_is_legacy(obj)) { diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index a4df1829a8..eb3918d7ac 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); - elm_widget_sub_object_parent_add(obj); - priv->date_min.tm_year = 2; priv->date_min.tm_mon = 0; 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 5c83d83774..e580d3cf06 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) if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "uiclock"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (elm_widget_theme_object_set(obj, wd->resize_obj, 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 b7978b15c4..06a18780e3 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) _fields_init(obj); - elm_widget_sub_object_parent_add(obj); - elm_widget_can_focus_set(obj, EINA_TRUE); return obj; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 7f3da3c31a..71dc20e076 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1812,7 +1812,6 @@ EOLIAN static void _efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj)); 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 649a532bea..664a542a46 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 if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "frame"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (elm_widget_is_legacy(obj)) { diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 92a2ce29fb..166db8dc27 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -566,7 +566,6 @@ EOLIAN static void _efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 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 b7ff98a22c..0fe2bd864a 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 Evas_Object *edje; Evas_Coord minw, minh; - elm_widget_sub_object_parent_add(obj); - edje = edje_object_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, edje); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 6677ccb01c..63f9491467 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 { Evas_Object *edje; - elm_widget_sub_object_parent_add(obj); - /* has to be there *before* parent's smart_add() */ edje = edje_object_add(evas_object_evas_get(obj)); 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 b0300db7c9..219d2aa151 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c index e8102ba2cf..d693a52838 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 obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - elm_widget_can_focus_set(obj, EINA_TRUE); if (elm_widget_theme_object_set(obj, wd->resize_obj, 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 0b5988450e..2f535e1a76 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 obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - elm_widget_can_focus_set(obj, EINA_TRUE); if (elm_widget_theme_object_set(obj, wd->resize_obj, 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 a435c543e4..b44ea3b5d4 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) elm_widget_theme_klass_set(obj, "nstate"); obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); pd->state = 0; // Default: 2 states diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c index 3e87b62226..935e1a3653 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, elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Failed to set layout!"); - elm_widget_sub_object_parent_add(obj); - pd->cnt = 0; pd->loop = EFL_UI_PAGER_LOOP_DISABLED; diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c index 9e8e4c5027..84aa6f08d9 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); _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 a221193803..d42b3ebb3b 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 if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "panes"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); group = _efl_ui_panes_theme_group_get(obj, sd); 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 cc8772d8d2..47ef65b4a9 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) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - elm_widget_can_focus_set(obj, EINA_TRUE); if (elm_widget_theme_object_set(obj, wd->resize_obj, 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 2d1ecfc230..c65d9bdcff 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 if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "progressbar"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->dir = EFL_UI_DIR_RIGHT; 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 c5651fa793..fa47d7591c 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 { evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_highlight_ignore_set(obj, EINA_TRUE); } diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c index 1d4295e183..54e28c5643 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, obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - pd->scroller = elm_scroller_add(obj); elm_object_style_set(pd->scroller, "popup/no_inset_shadow"); 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 23f4797419..6a5798d44b 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) if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "slider"); - elm_widget_sub_object_parent_add(obj); group = _efl_ui_slider_theme_group_get(obj, priv); 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 70cbfeea53..f446bab9f3 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) elm_widget_theme_klass_set(obj, "spin"); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); - sd->val_max = 100.0; sd->step = 1.0; 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 0194921308..4941b41bde 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) char *group; obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_theme_klass_set(obj, "spin_button"); 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 e5fb3414df..0129121d7a 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) elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Failed to set layout!"); - - elm_widget_sub_object_parent_add(obj); - sd->dir = EFL_UI_DIR_HORIZONTAL; sd->bx = evas_object_box_add(evas_object_evas_get(obj)); 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 1f7fc2ff89..a0bd26ef70 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) elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Failed to set layout!"); - - elm_widget_sub_object_parent_add(obj); - efl_ui_widget_focus_allow_set(obj, EINA_TRUE); sd->content = NULL; diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c index 4187f31174..2b43aa8939 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) elm_widget_theme_klass_set(obj, "tab_pager"); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); efl_ui_widget_focus_allow_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c index cfb9fd07b1..8cfef194a2 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) Custom_Table_Data *custom; Evas_Object *table; - elm_widget_sub_object_parent_add(obj); - table = efl_add(CUSTOM_TABLE_CLASS, obj); custom = efl_data_scope_get(table, CUSTOM_TABLE_CLASS); custom->gd = pd; diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c index 00748a7986..12b56c15c5 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) elm_widget_theme_klass_set(obj, "tags"); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (elm_widget_theme_object_set(obj, wd->resize_obj, 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 cae523bcdd..ebb2dd539e 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) elm_widget_theme_klass_set(obj, "text"); obj = efl_constructor(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); - text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj); 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 dd19e6a0d8..355b8c21f3 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, obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_widget_sub_object_parent_add(obj); - pd->scroller = elm_scroller_add(obj); elm_object_style_set(pd->scroller, "popup/no_inset_shadow"); 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 483c8ffdeb..9c045876b8 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -583,7 +583,6 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->text_obj = edje_object_add(evas_object_evas_get(obj)); 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 a77238bafa..732f8aefdc 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 _fields_init(obj); - elm_widget_sub_object_parent_add(obj); - elm_widget_can_focus_set(obj, EINA_TRUE); return obj; diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index dd0d6f11ae..75b6b155dc 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) if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "video"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); 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 6ab2d8a026..872e32a744 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 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); if (!efl_isa(obj, EFL_UI_WIN_CLASS)) { - efl_ui_widget_sub_object_add(efl_parent_get(obj), obj); + Eo *parent = efl_parent_get(obj); + if (!efl_isa(parent, EFL_UI_WIDGET_CLASS)) + { + ERR("You passed a wrong parent parameter (%p %s). " + "Elementary widget's parent should be an elementary widget.", + parent, evas_object_type_get(parent)); + } + + efl_ui_widget_sub_object_add(parent, obj); } sd->on_create = EINA_FALSE; diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 3c17d46061..71e581f18b 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -331,7 +331,6 @@ EOLIAN static void _elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); efl_ui_mirrored_automatic_set(obj, EINA_FALSE); diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index ac5a91905a..08817bac70 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set (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 b718924429..6f52cf6e87 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 char buf[1024]; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); 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 8dfe7ab54f..1a644534f1 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 const char *path; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); path = eina_environment_home_get(); diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index f06862e911..df9ac79d2c 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -222,7 +222,6 @@ EOLIAN static void _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->button = elm_fileselector_button_add(obj); 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 3986b2a14f..a7b5685f21 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -638,7 +638,6 @@ EOLIAN static void _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 0032ad02ff..452d7e0849 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 if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "multibuttonentry"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (elm_widget_theme_object_set(obj, wd->resize_obj, elm_widget_theme_klass_get(obj), diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 251b3eb44f..fa22902d90 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->dummy_edje = wd->resize_obj; 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 8a386fc9c4..275599c30f 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) char buf[256]; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index a967661e61..7cdf1edf0e 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) char style[1024]; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 33809795fc..9b33f4de40 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -48,7 +48,6 @@ EOLIAN static void _elm_access_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); } static Eina_Bool diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 07fc630811..d4e3ca129b 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->enabled_position = ELM_ACTIONSLIDER_ALL; diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index bd6a00d26b..68e5996c78 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) _on_size_hints_changed, obj); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); efl_event_callback_add (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 f6f4a97c6d..559ba53d55 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index b3c7838408..b249fd44fe 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->first_interval = 0.85; priv->date_min.tm_year = 2; diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 948ec7cb4b..9b6caa147a 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->cur.ampm = -1; priv->cur.seconds = EINA_TRUE; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 9ac78ee517..831ff3be78 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set (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 a72c08eafc..55c6bc8488 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -927,7 +927,6 @@ EOLIAN static void _elm_conformant_efl_canvas_group_group_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); if (!elm_layout_theme_set diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 78536bb3fd..781ee0c868 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -445,7 +445,6 @@ EOLIAN static void _elm_dayselector_efl_canvas_group_group_add(Eo *obj, Elm_Dayselector_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set(obj, "dayselector", "base", elm_widget_style_get(obj))) diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index b6c49ecc74..fd2494f00c 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 Evas *evas; Evas_Object *blank, *edje; - elm_widget_sub_object_parent_add(obj); - evas = evas_object_evas_get(obj); evas_event_freeze(evas); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index b229596c4a..7478a40fd8 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) if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "entry"); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->entry_edje = wd->resize_obj; diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 8085325c84..f9ba061f75 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -616,7 +616,6 @@ EOLIAN static void _elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set (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 cefa035264..76e540a9db 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 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 0cdec229b9..0a893b72d0 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) int i; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->size_caches = eina_hash_pointer_new(_size_cache_free); 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 667a2716a0..de1fe793e3 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -3748,7 +3748,6 @@ EOLIAN static void _elm_gesture_layer_efl_canvas_group_group_add(Eo *obj, Elm_Gesture_Layer_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->line_min_length = _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 1210416253..51e3cb6da6 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 { Evas_Object *img; - elm_widget_sub_object_parent_add(obj); - // Create image to render Evas_GL Surface img = evas_object_image_filled_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, img); diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 40b636eb07..6548f21e16 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Object *grid; - elm_widget_sub_object_parent_add(obj); - grid = evas_object_grid_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, grid); 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 e5019fed78..271436f707 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -582,7 +582,6 @@ EOLIAN static void _elm_hover_efl_canvas_group_group_add(Eo *obj, Elm_Hover_Data *sd) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); ELM_HOVER_PARTS_FOREACH 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 819f549e63..3011a4d252 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -493,7 +493,6 @@ EOLIAN static void _elm_icon_efl_canvas_group_group_add(Eo *obj, Elm_Icon_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->thumb.request = NULL; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 49fa53192b..c046080a6e 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set (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 54d2c4d775..e50128027e 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -46,7 +46,6 @@ EOLIAN static void _elm_inwin_efl_canvas_group_group_add(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); 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 9e31e5a5b1..4468b72bd0 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) efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); - priv->linewrap = ELM_WRAP_NONE; priv->wrap_w = -1; priv->slide_duration = 10; diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 891e58536f..da40668a02 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 2e14abf2b8..71deea0b58 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) Elm_Map_Pan_Data *pan_data; Evas_Object *edje; - elm_widget_sub_object_parent_add(obj); - edje = edje_object_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, edje); diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 46796c1d6e..5706743243 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) elm_widget_resize_object_set(obj, rect); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); evas_object_static_clip_set(rect, EINA_TRUE); 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 df38939c1c..236d859399 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -690,7 +690,6 @@ EOLIAN static void _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index df9899722d..0f1bbd37f4 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -449,7 +449,6 @@ EOLIAN static void _elm_notify_efl_canvas_group_group_add(Eo *obj, Elm_Notify_Data *priv) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->allow_events = EINA_TRUE; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index a0b4ccd47e..7d9e800149 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); priv->panel_edje = wd->resize_obj; diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 1af5e2b872..92d9aed828 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index f55c616ec7..4b1f005ff0 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); if (!ee) return; diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index edd2213b4a..a320563661 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -48,7 +48,6 @@ EOLIAN static void _elm_prefs_efl_canvas_group_group_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); } static 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 3b9d3ecee3..be51b20704 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) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); evas_object_event_callback_add diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index f70ec39adc..6a1e3291b7 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) Evas_Coord minw, minh; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); if (!elm_layout_theme_set diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 96d7558f8e..0a6a3d1a19 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 { sd->obj = obj; efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set (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 2c73da13b0..792a74294f 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -48,7 +48,6 @@ EOLIAN static void _elm_separator_efl_canvas_group_group_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_FALSE); if (!elm_layout_theme_set diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 741be9eeb5..da8887413d 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->count_item_pre_before = 2; priv->count_item_pre_after = 2; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 001dd3b152..3c35f0e2ce 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) ELM_SPINNER_DATA_GET(obj, sd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); priv->val_max = 100.0; priv->step = 1.0; diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 14a287f911..fa07e5912b 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) { Evas_Object *table; - elm_widget_sub_object_parent_add(obj); - table = evas_object_table_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, table); diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index df6244e32e..67ac441d6f 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index b64f4d91bb..0efcacb8c0 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) { Evas_Object *edje; - elm_widget_sub_object_parent_add(obj); - edje = edje_object_add(evas_object_evas_get(obj)); elm_widget_resize_object_set(obj, edje); diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c index d601460bda..88218462dc 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 elm_widget_resize_object_set(obj, resize_obj); efl_canvas_group_add(efl_super(obj, MY_CLASS)); - elm_widget_sub_object_parent_add(obj); } EOLIAN static Evas_Object* --
