From f74c18a02eb09746b810a61eaf0e3d643b5a2765 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 1 Apr 2011 06:08:02 +0000 Subject: [PATCH] make all widgets use a standard setup macro. cuts code down and handles null parent errors, null wd alloc, null obj create errors etc. SVN revision: 58242 --- legacy/elementary/src/lib/elc_anchorblock.c | 8 ++---- legacy/elementary/src/lib/elc_anchorview.c | 8 ++---- legacy/elementary/src/lib/elc_ctxpopup.c | 8 ++---- legacy/elementary/src/lib/elc_fileselector.c | 13 ++++------ .../src/lib/elc_fileselector_button.c | 25 ++++++++----------- .../src/lib/elc_fileselector_entry.c | 10 +++----- legacy/elementary/src/lib/elc_hoversel.c | 8 ++---- .../elementary/src/lib/elc_scrolled_entry.c | 8 ++---- legacy/elementary/src/lib/elm_actionslider.c | 8 ++---- legacy/elementary/src/lib/elm_bg.c | 8 ++---- legacy/elementary/src/lib/elm_box.c | 8 ++---- legacy/elementary/src/lib/elm_bubble.c | 8 ++---- legacy/elementary/src/lib/elm_button.c | 8 ++---- legacy/elementary/src/lib/elm_calendar.c | 8 ++---- legacy/elementary/src/lib/elm_check.c | 8 ++---- legacy/elementary/src/lib/elm_clock.c | 8 ++---- legacy/elementary/src/lib/elm_colorselector.c | 8 ++---- legacy/elementary/src/lib/elm_conform.c | 18 +++++-------- legacy/elementary/src/lib/elm_diskselector.c | 10 ++++---- legacy/elementary/src/lib/elm_entry.c | 8 ++---- legacy/elementary/src/lib/elm_flip.c | 8 ++---- legacy/elementary/src/lib/elm_flipselector.c | 9 ++----- legacy/elementary/src/lib/elm_frame.c | 8 ++---- legacy/elementary/src/lib/elm_gengrid.c | 8 ++---- legacy/elementary/src/lib/elm_genlist.c | 9 +++---- legacy/elementary/src/lib/elm_hover.c | 15 ++++------- legacy/elementary/src/lib/elm_icon.c | 8 ++---- legacy/elementary/src/lib/elm_image.c | 8 ++---- legacy/elementary/src/lib/elm_index.c | 8 ++---- legacy/elementary/src/lib/elm_label.c | 15 +++++------ legacy/elementary/src/lib/elm_layout.c | 9 +++---- legacy/elementary/src/lib/elm_list.c | 8 ++---- legacy/elementary/src/lib/elm_map.c | 20 ++++++--------- legacy/elementary/src/lib/elm_mapbuf.c | 8 ++---- legacy/elementary/src/lib/elm_menu.c | 8 ++---- legacy/elementary/src/lib/elm_notify.c | 8 ++---- legacy/elementary/src/lib/elm_pager.c | 8 ++---- legacy/elementary/src/lib/elm_panel.c | 14 ++++------- legacy/elementary/src/lib/elm_panes.c | 8 ++---- legacy/elementary/src/lib/elm_photo.c | 8 ++---- legacy/elementary/src/lib/elm_photocam.c | 8 ++---- legacy/elementary/src/lib/elm_progressbar.c | 8 ++---- legacy/elementary/src/lib/elm_radio.c | 8 ++---- legacy/elementary/src/lib/elm_scroller.c | 8 ++---- legacy/elementary/src/lib/elm_separator.c | 8 ++---- legacy/elementary/src/lib/elm_slider.c | 8 ++---- legacy/elementary/src/lib/elm_slideshow.c | 8 ++---- legacy/elementary/src/lib/elm_spinner.c | 8 ++---- legacy/elementary/src/lib/elm_table.c | 8 ++---- legacy/elementary/src/lib/elm_thumb.c | 12 +++------ legacy/elementary/src/lib/elm_toggle.c | 8 ++---- legacy/elementary/src/lib/elm_toolbar.c | 8 ++---- legacy/elementary/src/lib/elm_widget.h | 15 +++++++---- 53 files changed, 154 insertions(+), 352 deletions(-) diff --git a/legacy/elementary/src/lib/elc_anchorblock.c b/legacy/elementary/src/lib/elc_anchorblock.c index a22a8a53ff..e32ae0af2a 100644 --- a/legacy/elementary/src/lib/elc_anchorblock.c +++ b/legacy/elementary/src/lib/elc_anchorblock.c @@ -210,12 +210,8 @@ elm_anchorblock_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "anchorblock"); elm_widget_type_set(obj, "anchorblock"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elc_anchorview.c b/legacy/elementary/src/lib/elc_anchorview.c index a35bc23a37..e89a2e015a 100644 --- a/legacy/elementary/src/lib/elc_anchorview.c +++ b/legacy/elementary/src/lib/elc_anchorview.c @@ -201,12 +201,8 @@ elm_anchorview_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "anchorview"); elm_widget_type_set(obj, "anchorview"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 73fcd9e42a..27afd7fccc 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -926,12 +926,8 @@ elm_ctxpopup_add(Evas_Object *parent) Widget_Data *wd; Evas_Coord x, y, w, h; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "ctxpopup"); elm_widget_type_set(obj, "ctxpopup"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 03d18daf6d..1bcd4300c8 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -564,18 +564,13 @@ _populate(Evas_Object *obj, EAPI Evas_Object * elm_fileselector_add(Evas_Object *parent) { - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - Evas *e = evas_object_evas_get(parent); - if (!e) return NULL; + Evas *e; Evas_Object *obj, *ic, *bt, *li, *en, *grid; Widget_Data *wd; int s; - // Elementary Widget - wd = ELM_NEW(Widget_Data); - wd->expand = !!_elm_config->fileselector_expand_enable; - obj = elm_widget_add(evas_object_evas_get(parent)); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "fileselector"); elm_widget_type_set(obj, "fileselector"); elm_widget_sub_object_add(parent, obj); @@ -584,6 +579,8 @@ elm_fileselector_add(Evas_Object *parent) elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); + wd->expand = !!_elm_config->fileselector_expand_enable; + wd->edje = edje_object_add(e); _elm_theme_object_set(obj, wd->edje, "fileselector", "base", "default"); elm_widget_resize_object_set(obj, wd->edje); diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 1639dc393b..f08a823d91 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -263,23 +263,11 @@ elm_fileselector_button_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - wd->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); - wd->fsd.path = eina_stringshare_add(getenv("HOME")); - wd->fsd.expandable = _elm_config->fileselector_expand_enable; - wd->inwin_mode = _elm_config->inwin_dialogs_enable; - wd->w = 400; - wd->h = 400; - - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "fileselector_button"); elm_widget_type_set(obj, "fileselector_button"); elm_widget_sub_object_add(parent, obj); - wd->self = obj; elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); @@ -288,6 +276,15 @@ elm_fileselector_button_add(Evas_Object *parent) elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_activate_hook_set(obj, _activate_hook); + wd->self = obj; + wd->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); + if (getenv("HOME")) wd->fsd.path = eina_stringshare_add(getenv("HOME")); + else wd->fsd.path = eina_stringshare_add("/"); + wd->fsd.expandable = _elm_config->fileselector_expand_enable; + wd->inwin_mode = _elm_config->inwin_dialogs_enable; + wd->w = 400; + wd->h = 400; + wd->btn = elm_button_add(parent); elm_widget_mirrored_automatic_set(wd->btn, EINA_FALSE); elm_widget_resize_object_set(obj, wd->btn); diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index d86c9539e7..b79ad635db 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -224,15 +224,11 @@ EAPI Evas_Object * elm_fileselector_entry_add(Evas_Object *parent) { Evas_Object *obj; - Evas *e = evas_object_evas_get(parent); - if (!e) return NULL; + Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "fileselector_entry"); elm_widget_type_set(obj, "fileselector_entry"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 8f8f4f2748..c4cb27e11f 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -274,12 +274,8 @@ elm_hoversel_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "hoversel"); elm_widget_type_set(obj, "hoversel"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elc_scrolled_entry.c b/legacy/elementary/src/lib/elc_scrolled_entry.c index f8bbc74683..d6e5e052a4 100644 --- a/legacy/elementary/src/lib/elc_scrolled_entry.c +++ b/legacy/elementary/src/lib/elc_scrolled_entry.c @@ -363,12 +363,8 @@ elm_scrolled_entry_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "scrolled_entry"); elm_widget_type_set(obj, "scrolled_entry"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 8e77b9588a..65eaf18dd8 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -341,12 +341,8 @@ elm_actionslider_add(Evas_Object *parent) Widget_Data *wd; Evas *e; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "actionslider"); elm_widget_type_set(obj, "actionslider"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c index b9a9454630..d35f495ee3 100644 --- a/legacy/elementary/src/lib/elm_bg.c +++ b/legacy/elementary/src/lib/elm_bg.c @@ -135,12 +135,8 @@ elm_bg_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "bg"); elm_widget_type_set(obj, "bg"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c index 789e096c28..ae2f61df83 100644 --- a/legacy/elementary/src/lib/elm_box.c +++ b/legacy/elementary/src/lib/elm_box.c @@ -351,12 +351,8 @@ elm_box_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "box"); elm_widget_type_set(obj, "box"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index 603c783aa6..4564ffd8d4 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -163,12 +163,8 @@ elm_bubble_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "bubble"); elm_widget_type_set(obj, "bubble"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index 34e44a6d4e..88ca7dba0e 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -306,12 +306,8 @@ elm_button_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "button"); elm_widget_type_set(obj, "button"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index b66ff80564..79941bd26c 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -728,12 +728,8 @@ elm_calendar_add(Evas_Object *parent) int i, t; Evas *e; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "calendar"); elm_widget_type_set(obj, "calendar"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index 1cc043bb9c..bc57cacacf 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -246,12 +246,8 @@ elm_check_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "check"); elm_widget_type_set(obj, "check"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index f00dfea11e..6331db723b 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -530,12 +530,8 @@ elm_clock_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "clock"); elm_widget_type_set(obj, "clock"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index da4d0131b5..bd58cc4806 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -804,12 +804,8 @@ elm_colorselector_add(Evas_Object *parent) Widget_Data *wd = NULL; Evas *e; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "colorselector"); elm_widget_type_set(obj, "colorselector"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index 8705b30189..c10763ac7d 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -223,17 +223,11 @@ EAPI Evas_Object * elm_conformant_add(Evas_Object *parent) { Evas_Object *obj; - Evas *evas; + Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - - evas = evas_object_evas_get(parent); - if (!evas) return NULL; - - obj = elm_widget_add(evas); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "conformant"); elm_widget_type_set(obj, "conformant"); elm_widget_sub_object_add(parent, obj); @@ -242,7 +236,7 @@ elm_conformant_add(Evas_Object *parent) elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); - wd->base = edje_object_add(evas); + wd->base = edje_object_add(e); _elm_theme_object_set(obj, wd->base, "conformant", "base", "default"); elm_widget_resize_object_set(obj, wd->base); @@ -255,7 +249,7 @@ elm_conformant_add(Evas_Object *parent) ecore_x_e_illume_indicator_geometry_get(zone, NULL, NULL, NULL, &sh); if (sh < 0) sh = 0; - wd->shelf = evas_object_rectangle_add(evas); + wd->shelf = evas_object_rectangle_add(e); evas_object_color_set(wd->shelf, 0, 0, 0, 0); evas_object_size_hint_min_set(wd->shelf, -1, sh); evas_object_size_hint_max_set(wd->shelf, -1, sh); @@ -264,7 +258,7 @@ elm_conformant_add(Evas_Object *parent) sh = -1; ecore_x_e_illume_softkey_geometry_get(zone, NULL, NULL, NULL, &sh); if (sh < 0) sh = 0; - wd->panel = evas_object_rectangle_add(evas); + wd->panel = evas_object_rectangle_add(e); evas_object_color_set(wd->panel, 0, 0, 0, 0); evas_object_size_hint_min_set(wd->panel, -1, sh); evas_object_size_hint_max_set(wd->panel, -1, sh); diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index e5300afc8c..9de3a88e13 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -621,13 +621,12 @@ _round_items_add(Widget_Data *wd) EAPI Evas_Object * elm_diskselector_add(Evas_Object *parent) { + Evas *e; Evas_Object *obj; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - wd->self = obj = elm_widget_add(evas_object_evas_get(parent)); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "diskselector"); elm_widget_type_set(obj, "diskselector"); elm_widget_sub_object_add(parent, obj); @@ -639,12 +638,13 @@ elm_diskselector_add(Evas_Object *parent) elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_event_hook_set(obj, _event_hook); + wd->self = obj; wd->item_count = 0; wd->round = EINA_FALSE; wd->init = EINA_FALSE; wd->len_side = 3; - wd->scroller = elm_smart_scroller_add(evas_object_evas_get(parent)); + wd->scroller = elm_smart_scroller_add(e); elm_smart_scroller_widget_set(wd->scroller, obj); _theme_hook(obj); elm_widget_resize_object_set(obj, wd->scroller); diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 1eae79c702..15203396f3 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -1489,12 +1489,8 @@ elm_entry_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "entry"); elm_widget_type_set(obj, "entry"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index 7375984ed7..9c3f2b819f 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -405,12 +405,8 @@ elm_flip_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "flip"); elm_widget_type_set(obj, "flip"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index 3b783e8c56..8dd31421d5 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -568,13 +568,8 @@ elm_flipselector_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); - wd->self = obj; + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "flipselector"); elm_widget_type_set(obj, "flipselector"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index 13ee3e95af..61cdb8c80a 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -124,12 +124,8 @@ elm_frame_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "frame"); elm_widget_type_set(obj, "frame"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 1c430b4264..2a262bed76 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -1545,12 +1545,8 @@ elm_gengrid_add(Evas_Object *parent) static Evas_Smart *smart = NULL; Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "gengrid"); elm_widget_type_set(obj, "gengrid"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index f7362bbbb6..868aaf0e0e 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2608,8 +2608,6 @@ elm_genlist_add(Evas_Object *parent) Evas_Coord minw, minh; static Evas_Smart *smart = NULL; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - if (!smart) { static Evas_Smart_Class sc; @@ -2625,10 +2623,9 @@ elm_genlist_add(Evas_Object *parent) sc.calculate = _pan_calculate; if (!(smart = evas_smart_class_new(&sc))) return NULL; } - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "genlist"); elm_widget_type_set(obj, "genlist"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 70cb3bf562..ec51c4c2ee 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -493,16 +493,8 @@ elm_hover_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - - ELM_HOVER_PARTS_FOREACH - wd->subs[i].swallow = _directions[i]; - - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "hover"); elm_widget_type_set(obj, "hover"); elm_widget_sub_object_add(parent, obj); @@ -516,6 +508,9 @@ elm_hover_add(Evas_Object *parent) elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook); elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); + ELM_HOVER_PARTS_FOREACH + wd->subs[i].swallow = _directions[i]; + wd->hov = evas_object_rectangle_add(e); evas_object_pass_events_set(wd->hov, EINA_TRUE); evas_object_color_set(wd->hov, 0, 0, 0, 0); diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index c0fad61294..2b1c0d3a31 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -186,12 +186,8 @@ elm_icon_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "icon"); elm_widget_type_set(obj, "icon"); elm_widget_can_focus_set(obj, EINA_FALSE); diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index a71fe11117..d3a05a8f2e 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -114,12 +114,8 @@ elm_image_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "image"); elm_widget_type_set(obj, "image"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index ac10417f91..90fec400f1 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -512,12 +512,8 @@ elm_index_add(Evas_Object *parent) Widget_Data *wd; Evas_Coord minw, minh; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "index"); elm_widget_type_set(obj, "index"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index c8a9fe1dfa..8a67969479 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -653,15 +653,8 @@ elm_label_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - wd->bgcolor = EINA_FALSE; - wd->bg = evas_object_rectangle_add(e); - evas_object_color_set(wd->bg, 0, 0, 0, 0); - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "label"); elm_widget_type_set(obj, "label"); elm_widget_sub_object_add(parent, obj); @@ -670,6 +663,10 @@ elm_label_add(Evas_Object *parent) elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); + wd->bgcolor = EINA_FALSE; + wd->bg = evas_object_rectangle_add(e); + evas_object_color_set(wd->bg, 0, 0, 0, 0); + wd->linewrap = EINA_FALSE; wd->ellipsis = EINA_FALSE; wd->slidingmode = EINA_FALSE; diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 65b0dd43c1..1952bd561f 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -321,12 +321,8 @@ elm_layout_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - wd->obj = obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "layout"); elm_widget_type_set(obj, "layout"); elm_widget_sub_object_add(parent, obj); @@ -340,6 +336,7 @@ elm_layout_add(Evas_Object *parent) elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook); elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); + wd->obj = obj; wd->lay = edje_object_add(e); elm_widget_resize_object_set(obj, wd->lay); edje_object_signal_callback_add(wd->lay, "size,eval", "elm", diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 72497ebd38..b4bb5fd98d 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -1272,12 +1272,8 @@ elm_list_add(Evas_Object *parent) Widget_Data *wd; Evas_Coord minw, minh; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - wd->self = obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "list"); elm_widget_type_set(obj, "list"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index 5be6def624..a8817c9889 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -2100,18 +2100,8 @@ elm_map_add(Evas_Object *parent) static Evas_Smart *smart = NULL; Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - if (!ecore_file_download_protocol_available("http://")) - { - ERR("Ecore must be built with the support of HTTP for the widget map !"); - return NULL; - } - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "map"); elm_widget_type_set(obj, "map"); elm_widget_sub_object_add(parent, obj); @@ -2223,6 +2213,12 @@ elm_map_add(Evas_Object *parent) // TODO: convert Elementary to subclassing of Evas_Smart_Class // TODO: and save some bytes, making descriptions per-class and not instance! evas_object_smart_callbacks_descriptions_set(obj, _signals); + + if (!ecore_file_download_protocol_available("http://")) + { + ERR("Ecore must be built with curl support for the map widget!"); + } + return obj; } diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index fc4d6ac266..1c52ba823c 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -167,12 +167,8 @@ elm_mapbuf_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "mapbuf"); elm_widget_type_set(obj, "mapbuf"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index c470ad487b..7b271efd74 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -444,12 +444,8 @@ elm_menu_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "menu"); elm_widget_type_set(obj, "menu"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c index 410ea9ed21..e310e0198c 100644 --- a/legacy/elementary/src/lib/elm_notify.c +++ b/legacy/elementary/src/lib/elm_notify.c @@ -427,12 +427,8 @@ elm_notify_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "notify"); elm_widget_type_set(obj, "notify"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_pager.c b/legacy/elementary/src/lib/elm_pager.c index 037bd22d65..788de5c9e3 100644 --- a/legacy/elementary/src/lib/elm_pager.c +++ b/legacy/elementary/src/lib/elm_pager.c @@ -256,12 +256,8 @@ elm_pager_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "pager"); elm_widget_type_set(obj, "pager"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index aacc2504d1..4be2a921c2 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -252,15 +252,11 @@ EAPI Evas_Object * elm_panel_add(Evas_Object *parent) { Evas_Object *obj; - Evas *evas; + Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - evas = evas_object_evas_get(parent); - if (!evas) return NULL; - obj = elm_widget_add(evas); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "panel"); elm_widget_type_set(obj, "panel"); elm_widget_sub_object_add(parent, obj); @@ -275,7 +271,7 @@ elm_panel_add(Evas_Object *parent) elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_event_hook_set(obj, _event_hook); - wd->scr = elm_smart_scroller_add(evas); + wd->scr = elm_smart_scroller_add(e); elm_smart_scroller_widget_set(wd->scr, obj); _theme_hook(obj); elm_smart_scroller_bounce_allow_set(wd->scr, EINA_FALSE, EINA_FALSE); @@ -286,7 +282,7 @@ elm_panel_add(Evas_Object *parent) wd->hidden = EINA_FALSE; wd->orient = ELM_PANEL_ORIENT_LEFT; - wd->bx = evas_object_box_add(evas); + wd->bx = evas_object_box_add(e); evas_object_size_hint_align_set(wd->bx, 0.5, 0.5); evas_object_box_layout_set(wd->bx, _layout, wd, NULL); elm_widget_sub_object_add(obj, wd->bx); diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index f00006419d..c9a504b429 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -210,12 +210,8 @@ elm_panes_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "panes"); elm_widget_type_set(obj, "panes"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c index ffe57ba667..4e273316e0 100644 --- a/legacy/elementary/src/lib/elm_photo.c +++ b/legacy/elementary/src/lib/elm_photo.c @@ -217,12 +217,8 @@ elm_photo_add(Evas_Object *parent) Widget_Data *wd; Evas_Object *icon; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "photo"); elm_widget_type_set(obj, "photo"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 15014e2455..7bed1a8e1f 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -1062,12 +1062,8 @@ elm_photocam_add(Evas_Object *parent) static Evas_Smart *smart = NULL; Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "photocam"); elm_widget_type_set(obj, "photocam"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index a30a02ced4..50415bcc75 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -202,12 +202,8 @@ elm_progressbar_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "progressbar"); elm_widget_type_set(obj, "progressbar"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index aa1c43fbe4..4f98add6f2 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -283,12 +283,8 @@ elm_radio_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "radio"); elm_widget_type_set(obj, "radio"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index e4157f3a23..d3b5347ee5 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -457,12 +457,8 @@ elm_scroller_add(Evas_Object *parent) Widget_Data *wd; Evas_Coord minw, minh; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "scroller"); elm_widget_type_set(obj, "scroller"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c index 36eca3a1a4..58084a126f 100644 --- a/legacy/elementary/src/lib/elm_separator.c +++ b/legacy/elementary/src/lib/elm_separator.c @@ -81,12 +81,8 @@ elm_separator_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "separator"); wd->horizontal = EINA_FALSE; elm_widget_type_set(obj, "separator"); diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index a36b4a7f81..3e2b9754f2 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -498,12 +498,8 @@ elm_slider_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "slider"); elm_widget_type_set(obj, "slider"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index 8d628508e6..8d32121031 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -309,12 +309,8 @@ elm_slideshow_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "slideshow"); elm_widget_type_set(obj, "slideshow"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index 1a3db09190..d7e8defde6 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -575,12 +575,8 @@ elm_spinner_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "spinner"); elm_widget_type_set(obj, "spinner"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index d3181ba8d0..158a3ac124 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -140,12 +140,8 @@ elm_table_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "table"); elm_widget_type_set(obj, "table"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c index ecda6466b2..b7026332d4 100644 --- a/legacy/elementary/src/lib/elm_thumb.c +++ b/legacy/elementary/src/lib/elm_thumb.c @@ -420,17 +420,13 @@ elm_need_ethumb(void) EAPI Evas_Object * elm_thumb_add(Evas_Object *parent) { - Evas *evas; + Evas *e; Widget_Data *wd; Evas_Object *obj; Evas_Coord minw, minh; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - evas = evas_object_evas_get(parent); - if (!evas) return NULL; - obj = elm_widget_add(evas); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "thumb"); elm_widget_type_set(obj, "thumb"); elm_widget_sub_object_add(parent, obj); @@ -439,7 +435,7 @@ elm_thumb_add(Evas_Object *parent) elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); - wd->frame = edje_object_add(evas); + wd->frame = edje_object_add(e); _elm_theme_object_set(obj, wd->frame, "thumb", "base", "default"); elm_widget_resize_object_set(obj, wd->frame); diff --git a/legacy/elementary/src/lib/elm_toggle.c b/legacy/elementary/src/lib/elm_toggle.c index eb2d2394b3..80b2fc1631 100644 --- a/legacy/elementary/src/lib/elm_toggle.c +++ b/legacy/elementary/src/lib/elm_toggle.c @@ -217,12 +217,8 @@ elm_toggle_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "toggle"); elm_widget_type_set(obj, "toggle"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index feb2f5727f..a50b4bce5b 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -701,12 +701,8 @@ elm_toolbar_add(Evas_Object *parent) Evas *e; Widget_Data *wd; - EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - - wd = ELM_NEW(Widget_Data); - e = evas_object_evas_get(parent); - if (!e) return NULL; - obj = elm_widget_add(e); + ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + ELM_SET_WIDTYPE(widtype, "toolbar"); elm_widget_type_set(obj, "toolbar"); elm_widget_sub_object_add(parent, obj); diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index 4b7c477c87..47e428b8e2 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -108,12 +108,10 @@ * // elementary and that the api hasn't broken. if it has this returns * // false and you need to handle this error gracefully * if (!elm_widget_api_check(ELM_INTERNAL_API_VERSION)) return NULL; + * + * // standard widget setup and allocate wd, create obj given parent etc. + * ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); * - * // basic - allocate data for widget and fill it - * wd = ELM_NEW(Widget_Data); - * e = evas_object_evas_get(parent); - * if (!e) return NULL; - * obj = elm_widget_add(e); * // give it a type name and set up a mywidget type string if needed * ELM_SET_WIDTYPE(widtype, "mywidget"); * elm_widget_type_set(obj, "mywidget"); @@ -497,6 +495,13 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ if (!elm_widget_type_check((it->base.widget), (widtype))) goto label; +#define ELM_WIDGET_STANDARD_SETUP(wdat, wdtype, par, evas, ob, ret) \ + do { \ + EINA_SAFETY_ON_NULL_RETURN_VAL((par), (ret)); \ + evas = evas_object_evas_get(par); if (!(evas)) return (ret); \ + wdat = ELM_NEW(wdtype); if (!(wdat)) return (ret); \ + ob = elm_widget_add(evas); if (!(ob)) { free(wdat); return (ret); } \ + } while (0); /** * The drag and drop API.