From d372445a1b457906fafb75d07164207f268e8588 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 26 Jun 2013 17:42:50 +0900 Subject: [PATCH] examples: refactoring. use elm_win_util_standard_add() for normal cases. season 3. --- legacy/elementary/src/examples/layout_example_03.c | 11 +++-------- legacy/elementary/src/examples/list_example_01.c | 10 ++-------- legacy/elementary/src/examples/list_example_02.c | 10 ++-------- legacy/elementary/src/examples/list_example_03.c | 10 ++-------- legacy/elementary/src/examples/location_example_01.c | 9 ++------- legacy/elementary/src/examples/map_example_01.c | 10 ++-------- legacy/elementary/src/examples/map_example_02.c | 10 ++-------- legacy/elementary/src/examples/map_example_03.c | 10 ++-------- legacy/elementary/src/examples/mapbuf_example.c | 10 ++-------- legacy/elementary/src/examples/menu_example_01.c | 9 ++------- legacy/elementary/src/examples/panel_example_01.c | 10 +++------- legacy/elementary/src/examples/panes_example.c | 10 ++-------- legacy/elementary/src/examples/photocam_example_01.c | 11 +++-------- legacy/elementary/src/examples/popup_example_01.c | 11 ++--------- legacy/elementary/src/examples/popup_example_02.c | 11 +++-------- legacy/elementary/src/examples/popup_example_03.c | 11 +++-------- legacy/elementary/src/examples/prefs_example_03.c | 12 +++--------- legacy/elementary/src/examples/progressbar_example.c | 11 +++-------- legacy/elementary/src/examples/radio_example_01.c | 10 +++------- 19 files changed, 46 insertions(+), 150 deletions(-) diff --git a/legacy/elementary/src/examples/layout_example_03.c b/legacy/elementary/src/examples/layout_example_03.c index 568409a895..99a076b970 100644 --- a/legacy/elementary/src/examples/layout_example_03.c +++ b/legacy/elementary/src/examples/layout_example_03.c @@ -42,19 +42,14 @@ _size_changed_cb(void *data, Evas_Object *layout, const char *emission, const ch EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *btn, *layout; + Evas_Object *win, *btn, *layout; char buf[PATH_MAX]; elm_app_info_set(elm_main, "elementary", "examples/layout_example.edj"); - win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 255,255 ,255); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("layout", "Layout Example"); + elm_win_autodel_set(win, EINA_TRUE); // Adding layout layout = elm_layout_add(win); diff --git a/legacy/elementary/src/examples/list_example_01.c b/legacy/elementary/src/examples/list_example_01.c index b44b279479..d0a9182ab1 100644 --- a/legacy/elementary/src/examples/list_example_01.c +++ b/legacy/elementary/src/examples/list_example_01.c @@ -14,7 +14,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *li; + Evas_Object *win, *bx, *li; unsigned int i; static const char *lbl[] = { @@ -29,15 +29,9 @@ elm_main(int argc, char **argv) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "list", ELM_WIN_BASIC); - elm_win_title_set(win, "List Example"); + win = elm_win_util_standard_add("list", "List Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/legacy/elementary/src/examples/list_example_02.c b/legacy/elementary/src/examples/list_example_02.c index e6a430d104..9524dadfcd 100644 --- a/legacy/elementary/src/examples/list_example_02.c +++ b/legacy/elementary/src/examples/list_example_02.c @@ -14,7 +14,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *li; + Evas_Object *win, *li; unsigned int i; static const char *lbl[] = { @@ -29,15 +29,9 @@ elm_main(int argc, char **argv) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "list", ELM_WIN_BASIC); - elm_win_title_set(win, "List Example"); + win = elm_win_util_standard_add("list", "List Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - /* default */ li = elm_list_add(win); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/list_example_03.c b/legacy/elementary/src/examples/list_example_03.c index 05b4b3a75d..05bd9f582c 100644 --- a/legacy/elementary/src/examples/list_example_03.c +++ b/legacy/elementary/src/examples/list_example_03.c @@ -245,19 +245,13 @@ _disable_cb(void *data, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *hbx, *li, *bt; + Evas_Object *win, *bx, *hbx, *li, *bt; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "list", ELM_WIN_BASIC); - elm_win_title_set(win, "List Items Example"); + win = elm_win_util_standard_add("list", "List Items Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); diff --git a/legacy/elementary/src/examples/location_example_01.c b/legacy/elementary/src/examples/location_example_01.c index 90d1781382..e42253c9be 100644 --- a/legacy/elementary/src/examples/location_example_01.c +++ b/legacy/elementary/src/examples/location_example_01.c @@ -6,7 +6,7 @@ #include #endif -static Evas_Object *bg, *label, *win; +static Evas_Object *label, *win; #ifdef ELM_ELOCATION static void @@ -54,16 +54,11 @@ elm_main(int argc, char *argv[]) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "Elocation example", ELM_WIN_BASIC); + win = elm_win_util_standard_add("elocation", "Elocation example"); elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 600, 480); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - label = elm_label_add(win); elm_label_line_wrap_set(label, ELM_WRAP_CHAR); elm_object_text_set(label, "Getting location ..."); diff --git a/legacy/elementary/src/examples/map_example_01.c b/legacy/elementary/src/examples/map_example_01.c index 7ba11b2759..ea720ecfcb 100644 --- a/legacy/elementary/src/examples/map_example_01.c +++ b/legacy/elementary/src/examples/map_example_01.c @@ -57,19 +57,13 @@ _nasty_hack(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *map, *box, *bt; + Evas_Object *win, *map, *box, *bt; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "map", ELM_WIN_BASIC); - elm_win_title_set(win, "Map Creation Example"); + win = elm_win_util_standard_add("map", "Map Creation Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - map = elm_map_add(win); elm_win_resize_object_add(win, map); evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/map_example_02.c b/legacy/elementary/src/examples/map_example_02.c index 1f55058e74..4c954afa57 100644 --- a/legacy/elementary/src/examples/map_example_02.c +++ b/legacy/elementary/src/examples/map_example_02.c @@ -156,7 +156,7 @@ _nasty_hack(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *map, *box, *bt; + Evas_Object *win, *map, *box, *bt; Eina_List *ovls = NULL; Elm_Map_Overlay *ovl, *city_clas, *country_clas; char buf[255]; @@ -177,15 +177,9 @@ elm_main(int argc, char **argv) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "map", ELM_WIN_BASIC); - elm_win_title_set(win, "Map Overlay Example"); + win = elm_win_util_standard_add("map", "Map Overlay Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - map = elm_map_add(win); elm_win_resize_object_add(win, map); evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/map_example_03.c b/legacy/elementary/src/examples/map_example_03.c index f1735eacc7..57c82ef61c 100644 --- a/legacy/elementary/src/examples/map_example_03.c +++ b/legacy/elementary/src/examples/map_example_03.c @@ -112,19 +112,13 @@ _nasty_hack(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *map, *box, *bt, *entry; + Evas_Object *win, *map, *box, *bt, *entry; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "map", ELM_WIN_BASIC); - elm_win_title_set(win, "Map Route Example"); + win = elm_win_util_standard_add("map", "Map Route Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - map = elm_map_add(win); elm_win_resize_object_add(win, map); evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/mapbuf_example.c b/legacy/elementary/src/examples/mapbuf_example.c index e7d4c4e5e9..42b892be74 100644 --- a/legacy/elementary/src/examples/mapbuf_example.c +++ b/legacy/elementary/src/examples/mapbuf_example.c @@ -34,20 +34,14 @@ _smooth_cb(void *data, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *hbx, *tg, *ck, *mb, *tb, *ic; + Evas_Object *win, *bx, *hbx, *tg, *ck, *mb, *tb, *ic; unsigned int i, j; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); - elm_win_title_set(win, "Mapbuf Example"); + win = elm_win_util_standard_add("mapbuf", "Mapbuf Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/legacy/elementary/src/examples/menu_example_01.c b/legacy/elementary/src/examples/menu_example_01.c index bb64f29b83..2fdec953df 100644 --- a/legacy/elementary/src/examples/menu_example_01.c +++ b/legacy/elementary/src/examples/menu_example_01.c @@ -24,18 +24,13 @@ _show(void *data, Evas *e, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *menu, *button, *rect; + Evas_Object *win, *menu, *button, *rect; Elm_Object_Item *menu_it, *menu_it1; - win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); - elm_win_title_set(win, "Menu"); + win = elm_win_util_standard_add("menu", "Menu"); elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - rect = evas_object_rectangle_add(evas_object_evas_get(win)); elm_win_resize_object_add(win, rect); evas_object_color_set(rect, 0, 0, 0, 0); diff --git a/legacy/elementary/src/examples/panel_example_01.c b/legacy/elementary/src/examples/panel_example_01.c index c2c5affece..fef021f0cd 100644 --- a/legacy/elementary/src/examples/panel_example_01.c +++ b/legacy/elementary/src/examples/panel_example_01.c @@ -6,16 +6,12 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *panel, *content; + Evas_Object *win, *bx, *panel, *content; - win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); - elm_win_title_set(win, "Panel"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("panel", "Panel"); + elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); elm_box_horizontal_set(bx, EINA_FALSE); diff --git a/legacy/elementary/src/examples/panes_example.c b/legacy/elementary/src/examples/panes_example.c index a73b5abc7e..ef447f978a 100644 --- a/legacy/elementary/src/examples/panes_example.c +++ b/legacy/elementary/src/examples/panes_example.c @@ -52,19 +52,13 @@ _clicked_double(void *data, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *panes, *panes_h, *bt; + Evas_Object *win, *panes, *panes_h, *bt; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); - elm_win_title_set(win, "Panes Example"); + win = elm_win_util_standard_add("panes", "Panes Example"); elm_win_autodel_set(win, EINA_TRUE); - - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); - evas_object_show(bg); panes = elm_panes_add(win); elm_win_resize_object_add(win, panes); diff --git a/legacy/elementary/src/examples/photocam_example_01.c b/legacy/elementary/src/examples/photocam_example_01.c index 65e59c3e0d..4c913337ad 100644 --- a/legacy/elementary/src/examples/photocam_example_01.c +++ b/legacy/elementary/src/examples/photocam_example_01.c @@ -12,19 +12,14 @@ static void _bring_in(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *obj, *photocam; + Evas_Object *win, *obj, *photocam; char buf[PATH_MAX]; elm_app_info_set(elm_main, "elementary", "images/insanely_huge_test_image.jpg"); - win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); - elm_win_title_set(win, "Photocam"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("photocam", "Photocam"); + elm_win_autodel_set(win, EINA_TRUE); photocam = elm_photocam_add(win); snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get()); diff --git a/legacy/elementary/src/examples/popup_example_01.c b/legacy/elementary/src/examples/popup_example_01.c index ee987267da..e86e197cd4 100644 --- a/legacy/elementary/src/examples/popup_example_01.c +++ b/legacy/elementary/src/examples/popup_example_01.c @@ -9,19 +9,12 @@ static void _timeout(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *popup, *content; + Evas_Object *win, *popup, *content; - win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); - elm_win_title_set(win, "Popup"); + win = elm_win_util_standard_add("popup", "Popup"); elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 128, 128, 128); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - content = elm_label_add(win); elm_object_text_set(content, "Content"); diff --git a/legacy/elementary/src/examples/popup_example_02.c b/legacy/elementary/src/examples/popup_example_02.c index 56d5afaa84..9b409a2b1c 100644 --- a/legacy/elementary/src/examples/popup_example_02.c +++ b/legacy/elementary/src/examples/popup_example_02.c @@ -8,19 +8,14 @@ static void _response_cb(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *popup, *btn1, *btn2, *btn3, *icon1; + Evas_Object *win, *popup, *btn1, *btn2, *btn3, *icon1; char buf[256]; elm_app_info_set(elm_main, "elementary", "images/logo_small.png"); - win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); - elm_win_title_set(win, "Popup"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("popup", "Popup"); + elm_win_autodel_set(win, EINA_TRUE); popup = elm_popup_add(win); diff --git a/legacy/elementary/src/examples/popup_example_03.c b/legacy/elementary/src/examples/popup_example_03.c index 729df63863..4d898a915f 100644 --- a/legacy/elementary/src/examples/popup_example_03.c +++ b/legacy/elementary/src/examples/popup_example_03.c @@ -9,20 +9,15 @@ static void _response_cb(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *popup, *btn1, *btn2, *icon1; + Evas_Object *win, *popup, *btn1, *btn2, *icon1; Elm_Object_Item *popup_it1; char buf[256]; elm_app_info_set(elm_main, "elementary", "images/logo_small.png"); - win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); - elm_win_title_set(win, "Popup"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("popup", "Popup"); + elm_win_autodel_set(win, EINA_TRUE); popup = elm_popup_add(win); diff --git a/legacy/elementary/src/examples/prefs_example_03.c b/legacy/elementary/src/examples/prefs_example_03.c index 6c214da2d5..a55e7f1120 100644 --- a/legacy/elementary/src/examples/prefs_example_03.c +++ b/legacy/elementary/src/examples/prefs_example_03.c @@ -65,19 +65,13 @@ _item_changed_cb(void *data, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *prefs, *layout; + Evas_Object *win, *prefs, *layout; Elm_Prefs_Data *prefs_data; - win = elm_win_add(NULL, "Prefs", ELM_WIN_BASIC); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_title_set(win, "Prefs Example 03"); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_min_set(bg, WIDTH, HEIGHT); - evas_object_size_hint_max_set(bg, WIDTH, HEIGHT); - evas_object_show(bg); + win = elm_win_util_standard_add("Prefs", "Prefs Example 03"); + elm_win_autodel_set(win, EINA_TRUE); layout = elm_layout_add(win); elm_layout_file_set(layout, "prefs_example_03.edj", "prefs_edje"); diff --git a/legacy/elementary/src/examples/progressbar_example.c b/legacy/elementary/src/examples/progressbar_example.c index 0aa8bd60a2..d28560d649 100644 --- a/legacy/elementary/src/examples/progressbar_example.c +++ b/legacy/elementary/src/examples/progressbar_example.c @@ -150,18 +150,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2, *label; + Evas_Object *win, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2, *label; char buf[PATH_MAX]; elm_app_info_set(elm_main, "elementary", "images/logo_small.png"); - win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); - elm_win_title_set(win, "Progress bar example"); - evas_object_smart_callback_add(win, "delete,request", _on_done, NULL); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); + win = elm_win_util_standard_add("progressbar", "Progress bar example"); + evas_object_smart_callback_add(win, "delete,request", _on_done, NULL); bx = elm_box_add(win); elm_win_resize_object_add(win, bx); diff --git a/legacy/elementary/src/examples/radio_example_01.c b/legacy/elementary/src/examples/radio_example_01.c index 0d6b276a72..25efaa2568 100644 --- a/legacy/elementary/src/examples/radio_example_01.c +++ b/legacy/elementary/src/examples/radio_example_01.c @@ -10,16 +10,12 @@ static void _cb(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *radio, *group, *ic; + Evas_Object *win, *bx, *radio, *group, *ic; - win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); - elm_win_title_set(win, "Radio"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("radio", "Radio"); + elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); elm_box_horizontal_set(bx, EINA_TRUE);