kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Carsten Haitzler 2011-04-01 06:08:02 +00:00
parent fc74c7867c
commit f74c18a02e
53 changed files with 154 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/lib/elc_anchorblock.c
View File

@ -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);

8
legacy/elementary/src/lib/elc_anchorview.c
View File

@ -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);

8
legacy/elementary/src/lib/elc_ctxpopup.c
View File

@ -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);

13
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -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);

25
legacy/elementary/src/lib/elc_fileselector_button.c
View File

@ -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);

10
legacy/elementary/src/lib/elc_fileselector_entry.c
View File

@ -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);

8
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -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);

8
legacy/elementary/src/lib/elc_scrolled_entry.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_actionslider.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_bg.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_box.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_bubble.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_button.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_calendar.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_check.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_clock.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_colorselector.c
View File

@ -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);

18
legacy/elementary/src/lib/elm_conform.c
View File

@ -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);

10
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_entry.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_flip.c
View File

@ -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);

9
legacy/elementary/src/lib/elm_flipselector.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_frame.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -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);

9
legacy/elementary/src/lib/elm_genlist.c
View File

@ -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);

15
legacy/elementary/src/lib/elm_hover.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_icon.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_image.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_index.c
View File

@ -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);

15
legacy/elementary/src/lib/elm_label.c
View File

@ -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;

9
legacy/elementary/src/lib/elm_layout.c
View File

@ -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",

8
legacy/elementary/src/lib/elm_list.c
View File

@ -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);

20
legacy/elementary/src/lib/elm_map.c
View File

@ -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;
}

8
legacy/elementary/src/lib/elm_mapbuf.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_menu.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_notify.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_pager.c
View File

@ -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);

14
legacy/elementary/src/lib/elm_panel.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_panes.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_photo.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_photocam.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_radio.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_scroller.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_separator.c
View File

@ -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");

8
legacy/elementary/src/lib/elm_slider.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_spinner.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_table.c
View File

@ -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);

12
legacy/elementary/src/lib/elm_thumb.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_toggle.c
View File

@ -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);

8
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -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);

15
legacy/elementary/src/lib/elm_widget.h
View File

@ -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.