summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-04-02 06:20:22 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-04-02 06:20:22 +0000
commitf309fe2e6286e44e62b272ba25726bf32053be68 (patch)
tree36ec5acf89e4fc361bf1034a9840e67465a6d0ff /src/bin
parent267624866764cdf3de86c22e0e27d6945e692445 (diff)
Revert a wrong commit. Un-wanted files are committed together.
Revert "elm bin: Use convenient utility function elm_win_util_standard_add() instead of elm_win_add() + elm_bg_add(). This is for normal style (ELM_WIN_BASIC) window." This reverts commit 31b24a0edb0028528d7c859070e03236ba42867b. SVN revision: 69847
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/config.c18
-rw-r--r--src/bin/test.c6
-rw-r--r--src/bin/test_3d.c10
-rw-r--r--src/bin/test_actionslider.c10
-rw-r--r--src/bin/test_box.c39
-rw-r--r--src/bin/test_bubble.c10
-rw-r--r--src/bin/test_button.c10
-rw-r--r--src/bin/test_calendar.c20
-rw-r--r--src/bin/test_clock.c30
-rw-r--r--src/bin/test_cnp.c10
-rw-r--r--src/bin/test_colorselector.c10
-rw-r--r--src/bin/test_conform.c20
-rw-r--r--src/bin/test_ctxpopup.c10
-rw-r--r--src/bin/test_cursor.c30
-rw-r--r--src/bin/test_datetime.c10
-rw-r--r--src/bin/test_dayselector.c11
-rw-r--r--src/bin/test_diskselector.c11
-rw-r--r--src/bin/test_eio.c10
-rw-r--r--src/bin/test_entry.c70
-rw-r--r--src/bin/test_entry_anchor2.c10
-rw-r--r--src/bin/test_factory.c10
-rw-r--r--src/bin/test_fileselector.c10
-rw-r--r--src/bin/test_fileselector_button.c10
-rw-r--r--src/bin/test_fileselector_entry.c10
-rw-r--r--src/bin/test_flip.c30
-rw-r--r--src/bin/test_flip_page.c10
-rw-r--r--src/bin/test_flipselector.c10
-rw-r--r--src/bin/test_floating.c10
-rw-r--r--src/bin/test_focus.c12
-rw-r--r--src/bin/test_focus2.c10
-rw-r--r--src/bin/test_focus3.c10
-rw-r--r--src/bin/test_gengrid.c30
-rw-r--r--src/bin/test_gesture_layer2.c10
-rw-r--r--src/bin/test_glview.c13
-rw-r--r--src/bin/test_glview_simple.c12
-rw-r--r--src/bin/test_grid.c9
-rw-r--r--src/bin/test_hoversel.c10
-rw-r--r--src/bin/test_icon_desktops.c10
-rw-r--r--src/bin/test_index.c20
-rw-r--r--src/bin/test_inwin.c20
-rw-r--r--src/bin/test_label.c10
-rw-r--r--src/bin/test_layout.c10
-rw-r--r--src/bin/test_map.c20
-rw-r--r--src/bin/test_menu.c11
-rw-r--r--src/bin/test_multibuttonentry.c10
-rw-r--r--src/bin/test_notify.c10
-rw-r--r--src/bin/test_panel.c10
-rw-r--r--src/bin/test_panes.c2
-rw-r--r--src/bin/test_photo.c10
-rw-r--r--src/bin/test_photocam.c10
-rw-r--r--src/bin/test_popup.c10
-rw-r--r--src/bin/test_progressbar.c10
-rw-r--r--src/bin/test_radio.c10
-rw-r--r--src/bin/test_scaling.c10
-rw-r--r--src/bin/test_scroller.c20
-rw-r--r--src/bin/test_segment_control.c10
-rw-r--r--src/bin/test_separator.c10
-rw-r--r--src/bin/test_slider.c10
-rw-r--r--src/bin/test_slideshow.c10
-rw-r--r--src/bin/test_spinner.c10
-rw-r--r--src/bin/test_store.c11
-rw-r--r--src/bin/test_table.c70
-rw-r--r--src/bin/test_thumb.c10
-rw-r--r--src/bin/test_toolbar.c80
-rw-r--r--src/bin/test_tooltip.c22
-rw-r--r--src/bin/test_transit.c90
-rw-r--r--src/bin/test_weather.c10
-rw-r--r--src/bin/test_web.c34
-rw-r--r--src/bin/test_win_socket.c10
69 files changed, 928 insertions, 243 deletions
diff --git a/src/bin/config.c b/src/bin/config.c
index fdf6be54c..6334c36a5 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -86,6 +86,8 @@ struct _Fonts_Data
86 } \ 86 } \
87 while (0) 87 while (0)
88 88
89static Evas_Object *main_win = NULL;
90
89static int quiet = 0; 91static int quiet = 0;
90static int interactive = 1; 92static int interactive = 1;
91 93
@@ -3020,14 +3022,22 @@ _status_config_full(Evas_Object *win,
3020} 3022}
3021 3023
3022static void 3024static void
3023win_create(void) 3025status_win(void)
3024{ 3026{
3025 Evas_Object *win, *bx0; 3027 Evas_Object *win, *bg, *bx0;
3028
3029 win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
3030 main_win = win;
3031 elm_win_title_set(win, "Elementary Config");
3026 3032
3027 win = elm_win_util_standard_add("main", "Elementary Config");
3028 ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed, 3033 ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed,
3029 win); 3034 win);
3035
3030 evas_object_smart_callback_add(win, "delete,request", config_exit, NULL); 3036 evas_object_smart_callback_add(win, "delete,request", config_exit, NULL);
3037 bg = elm_bg_add(win);
3038 evas_object_size_hint_weight_set(bg, 1.0, 1.0);
3039 elm_win_resize_object_add(win, bg);
3040 evas_object_show(bg);
3031 3041
3032 bx0 = elm_box_add(win); 3042 bx0 = elm_box_add(win);
3033 evas_object_size_hint_weight_set(bx0, 1.0, 1.0); 3043 evas_object_size_hint_weight_set(bx0, 1.0, 1.0);
@@ -3105,7 +3115,7 @@ elm_main(int argc,
3105#ifdef ELM_EFREET 3115#ifdef ELM_EFREET
3106 elm_need_efreet(); 3116 elm_need_efreet();
3107#endif 3117#endif
3108 win_create(); /* create main window */ 3118 status_win(); /* create main window */
3109 if (!interactive) 3119 if (!interactive)
3110 ecore_timer_add(2.0, _exit_timer, NULL); 3120 ecore_timer_add(2.0, _exit_timer, NULL);
3111 } 3121 }
diff --git a/src/bin/test.c b/src/bin/test.c
index c6f6199d3..6653b57e8 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -252,11 +252,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only)
252 * is no parent. "main" is the name of the window - used by the window 252 * is no parent. "main" is the name of the window - used by the window
253 * manager for identifying the window uniquely amongst all the windows 253 * manager for identifying the window uniquely amongst all the windows
254 * within this application (and all instances of the application). The 254 * within this application (and all instances of the application). The
255 * type is a basic window (the final parameter). 255 * type is a basic window (the final parameter) */
256 * You can call elm_win_util_standard_add() instead. This is a convenient API
257 * for window and bg creation. You don't need to create bg object manually.
258 * You can also set the title of the window at the same time.
259 * ex) win = elm_win_util_standard_add("main", "Elementary Tests"); */
260 win = elm_win_add(NULL, "main", ELM_WIN_BASIC); 256 win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
261 /* Set the title of the window - This is in the titlebar. */ 257 /* Set the title of the window - This is in the titlebar. */
262 elm_win_title_set(win, "Elementary Tests"); 258 elm_win_title_set(win, "Elementary Tests");
diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c
index 6a960fbaa..8c11e9526 100644
--- a/src/bin/test_3d.c
+++ b/src/bin/test_3d.c
@@ -240,11 +240,17 @@ _ch_z0(void *data, Evas_Object *obj, void *event_info __UNUSED__)
240void 240void
241test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 241test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
242{ 242{
243 Evas_Object *win, *bx, *sl; 243 Evas_Object *win, *bg, *bx, *sl;
244 244
245 win = elm_win_util_standard_add("box-vert", "Box Vert"); 245 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
246 elm_win_title_set(win, "Box Vert");
246 elm_win_autodel_set(win, EINA_TRUE); 247 elm_win_autodel_set(win, EINA_TRUE);
247 248
249 bg = elm_bg_add(win);
250 elm_win_resize_object_add(win, bg);
251 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
252 evas_object_show(bg);
253
248 cube = _cube_new(evas_object_evas_get(win), 240, 240, 240); 254 cube = _cube_new(evas_object_evas_get(win), 240, 240, 240);
249 255
250 bx = elm_box_add(win); 256 bx = elm_box_add(win);
diff --git a/src/bin/test_actionslider.c b/src/bin/test_actionslider.c
index f3b645425..b6a3e6f8d 100644
--- a/src/bin/test_actionslider.c
+++ b/src/bin/test_actionslider.c
@@ -89,11 +89,17 @@ _magnet_enable_disable_cb(void *data __UNUSED__, Evas_Object *obj, void *event_i
89void 89void
90test_actionslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) 90test_actionslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__)
91{ 91{
92 Evas_Object *win, *bx, *as; 92 Evas_Object *win, *bg, *bx, *as;
93 93
94 win = elm_win_util_standard_add("actionslider", "Actionslider"); 94 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
95 elm_win_title_set(win, "Actionslider");
95 elm_win_autodel_set(win, EINA_TRUE); 96 elm_win_autodel_set(win, EINA_TRUE);
96 97
98 bg = elm_bg_add(win);
99 elm_win_resize_object_add(win, bg);
100 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, 0);
101 evas_object_show(bg);
102
97 bx = elm_box_add(win); 103 bx = elm_box_add(win);
98 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0); 104 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0);
99 elm_win_resize_object_add(win, bx); 105 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 1b191f9f5..0f9698b73 100644
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -129,14 +129,20 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
129void 129void
130test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 130test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
131{ 131{
132 Evas_Object *win, *bx, *ic, *bxx, *bt; 132 Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
133 char buf[PATH_MAX]; 133 char buf[PATH_MAX];
134 api_data *api = calloc(1, sizeof(api_data)); 134 api_data *api = calloc(1, sizeof(api_data));
135 135
136 win = elm_win_util_standard_add("box-vert", "Box Vert"); 136 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
137 elm_win_title_set(win, "Box Vert");
137 elm_win_autodel_set(win, EINA_TRUE); 138 elm_win_autodel_set(win, EINA_TRUE);
138 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 139 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
139 140
141 bg = elm_bg_add(win);
142 elm_win_resize_object_add(win, bg);
143 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
144 evas_object_show(bg);
145
140 bxx = elm_box_add(win); 146 bxx = elm_box_add(win);
141 elm_win_resize_object_add(win, bxx); 147 elm_win_resize_object_add(win, bxx);
142 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 148 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -195,11 +201,17 @@ _del_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
195void 201void
196test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 202test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
197{ 203{
198 Evas_Object *win, *bx, *bt; 204 Evas_Object *win, *bg, *bx, *bt;
199 205
200 win = elm_win_util_standard_add("box-vert2", "Box Vert 2"); 206 win = elm_win_add(NULL, "box-vert2", ELM_WIN_BASIC);
207 elm_win_title_set(win, "Box Vert 2");
201 elm_win_autodel_set(win, EINA_TRUE); 208 elm_win_autodel_set(win, EINA_TRUE);
202 209
210 bg = elm_bg_add(win);
211 elm_win_resize_object_add(win, bg);
212 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
213 evas_object_show(bg);
214
203 bx = elm_box_add(win); 215 bx = elm_box_add(win);
204 elm_win_resize_object_add(win, bx); 216 elm_win_resize_object_add(win, bx);
205 elm_box_padding_set(bx, 10, 10); 217 elm_box_padding_set(bx, 10, 10);
@@ -252,13 +264,18 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
252void 264void
253test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 265test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
254{ 266{
255 Evas_Object *win, *bx, *ic, *bxx, *bt; 267 Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
256 char buf[PATH_MAX]; 268 char buf[PATH_MAX];
257 api_data *api = calloc(1, sizeof(api_data)); 269 api_data *api = calloc(1, sizeof(api_data));
258 270
259 win = elm_win_util_standard_add("box-horiz", "Box Horiz"); 271 win = elm_win_add(NULL, "box-horiz", ELM_WIN_BASIC);
272 elm_win_title_set(win, "Box Horiz");
260 elm_win_autodel_set(win, EINA_TRUE); 273 elm_win_autodel_set(win, EINA_TRUE);
261 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 274 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
275 bg = elm_bg_add(win);
276 elm_win_resize_object_add(win, bg);
277 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
278 evas_object_show(bg);
262 279
263 bxx = elm_box_add(win); 280 bxx = elm_box_add(win);
264 elm_win_resize_object_add(win, bxx); 281 elm_win_resize_object_add(win, bxx);
@@ -638,12 +655,18 @@ _win_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
638void 655void
639test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 656test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
640{ 657{
641 Evas_Object *win, *bx, *bt; 658 Evas_Object *win, *bg, *bx, *bt;
642 Transitions_Data *tdata; 659 Transitions_Data *tdata;
643 660
644 win = elm_win_util_standard_add("box-transition", "Box Transition"); 661 win = elm_win_add(NULL, "box-transition", ELM_WIN_BASIC);
662 elm_win_title_set(win, "Box Transition");
645 elm_win_autodel_set(win, EINA_TRUE); 663 elm_win_autodel_set(win, EINA_TRUE);
646 664
665 bg = elm_bg_add(win);
666 elm_win_resize_object_add(win, bg);
667 evas_object_size_hint_weight_set(bg, 1.0, 1.0);
668 evas_object_show(bg);
669
647 bx = elm_box_add(win); 670 bx = elm_box_add(win);
648 elm_win_resize_object_add(win, bx); 671 elm_win_resize_object_add(win, bx);
649 evas_object_size_hint_weight_set(bx, 1.0, 1.0); 672 evas_object_size_hint_weight_set(bx, 1.0, 1.0);
diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c
index 01b5ad6d2..fb64e37a6 100644
--- a/src/bin/test_bubble.c
+++ b/src/bin/test_bubble.c
@@ -105,15 +105,21 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
105void 105void
106test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 106test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
107{ 107{
108 Evas_Object *win, *bx, *ic, *bb, *ct, *bxx, *bt; 108 Evas_Object *win, *bg, *bx, *ic, *bb, *ct, *bxx, *bt;
109 char buf[PATH_MAX]; 109 char buf[PATH_MAX];
110 api_data *api = calloc(1, sizeof(api_data)); 110 api_data *api = calloc(1, sizeof(api_data));
111 111
112 win = elm_win_util_standard_add("bubble", "Bubble"); 112 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
113 api->win = win; 113 api->win = win;
114 elm_win_title_set(win, "Bubble");
114 elm_win_autodel_set(win, EINA_TRUE); 115 elm_win_autodel_set(win, EINA_TRUE);
115 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 116 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
116 117
118 bg = elm_bg_add(win);
119 elm_win_resize_object_add(win, bg);
120 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
121 evas_object_show(bg);
122
117 bxx = elm_box_add(win); 123 bxx = elm_box_add(win);
118 elm_win_resize_object_add(win, bxx); 124 elm_win_resize_object_add(win, bxx);
119 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 125 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index be5d655fd..d332482f9 100644
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -34,12 +34,18 @@ _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
34void 34void
35test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 35test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
36{ 36{
37 Evas_Object *win, *scr, *bx, *ic, *bt; 37 Evas_Object *win, *bg, *scr, *bx, *ic, *bt;
38 char buf[PATH_MAX]; 38 char buf[PATH_MAX];
39 39
40 win = elm_win_util_standard_add("buttons", "Buttons"); 40 win = elm_win_add(NULL, "buttons", ELM_WIN_BASIC);
41 elm_win_title_set(win, "Buttons");
41 elm_win_autodel_set(win, EINA_TRUE); 42 elm_win_autodel_set(win, EINA_TRUE);
42 43
44 bg = elm_bg_add(win);
45 elm_win_resize_object_add(win, bg);
46 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
47 evas_object_show(bg);
48
43 scr = elm_scroller_add(win); 49 scr = elm_scroller_add(win);
44 elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE); 50 elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE);
45 elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); 51 elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c
index 71107fd92..ba10f3a1e 100644
--- a/src/bin/test_calendar.c
+++ b/src/bin/test_calendar.c
@@ -117,13 +117,19 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
117void 117void
118test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 118test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
119{ 119{
120 Evas_Object *win, *cal, *bx, *bxx, *bt; 120 Evas_Object *win, *bg, *cal, *bx, *bxx, *bt;
121 api_data *api = calloc(1, sizeof(api_data)); 121 api_data *api = calloc(1, sizeof(api_data));
122 122
123 win = elm_win_util_standard_add("calendar", "Calendar"); 123 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
124 elm_win_title_set(win, "Calendar");
124 elm_win_autodel_set(win, EINA_TRUE); 125 elm_win_autodel_set(win, EINA_TRUE);
125 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 126 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
126 127
128 bg = elm_bg_add(win);
129 elm_win_resize_object_add(win, bg);
130 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
131 evas_object_show(bg);
132
127 bxx = elm_box_add(win); 133 bxx = elm_box_add(win);
128 elm_win_resize_object_add(win, bxx); 134 elm_win_resize_object_add(win, bxx);
129 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 135 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -207,7 +213,7 @@ _format_month_year(struct tm *stm)
207void 213void
208test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 214test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
209{ 215{
210 Evas_Object *win, *bx, *bxh, *cal, *cal2, *cal3, *en; 216 Evas_Object *win, *bg, *bx, *bxh, *cal, *cal2, *cal3, *en;
211 Elm_Calendar_Mark *mark; 217 Elm_Calendar_Mark *mark;
212 struct tm selected_time; 218 struct tm selected_time;
213 time_t current_time; 219 time_t current_time;
@@ -217,9 +223,15 @@ test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
217 "Thursday", "Friday", "Saturday" 223 "Thursday", "Friday", "Saturday"
218 }; 224 };
219 225
220 win = elm_win_util_standard_add("calendar2", "Calendar 2"); 226 win = elm_win_add(NULL, "calendar2", ELM_WIN_BASIC);
227 elm_win_title_set(win, "Calendar 2");
221 elm_win_autodel_set(win, EINA_TRUE); 228 elm_win_autodel_set(win, EINA_TRUE);
222 229
230 bg = elm_bg_add(win);
231 elm_win_resize_object_add(win, bg);
232 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
233 evas_object_show(bg);
234
223 bx = elm_box_add(win); 235 bx = elm_box_add(win);
224 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 236 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
225 elm_win_resize_object_add(win, bx); 237 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c
index 6e28d2162..b71ac932d 100644
--- a/src/bin/test_clock.c
+++ b/src/bin/test_clock.c
@@ -96,14 +96,20 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
96void 96void
97test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 97test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
98{ 98{
99 Evas_Object *win, *bx, *ck, *bt, *bxx; 99 Evas_Object *win, *bg, *bx, *ck, *bt, *bxx;
100 unsigned int digedit; 100 unsigned int digedit;
101 api_data *api = calloc(1, sizeof(api_data)); 101 api_data *api = calloc(1, sizeof(api_data));
102 102
103 win = elm_win_util_standard_add("clock", "Clock"); 103 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
104 elm_win_title_set(win, "Clock");
104 elm_win_autodel_set(win, EINA_TRUE); 105 elm_win_autodel_set(win, EINA_TRUE);
105 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 106 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
106 107
108 bg = elm_bg_add(win);
109 elm_win_resize_object_add(win, bg);
110 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
111 evas_object_show(bg);
112
107 bxx = elm_box_add(win); 113 bxx = elm_box_add(win);
108 elm_win_resize_object_add(win, bxx); 114 elm_win_resize_object_add(win, bxx);
109 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 115 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -205,13 +211,19 @@ _hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
205void 211void
206test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 212test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
207{ 213{
208 Evas_Object *win, *bx, *hbx, *ck, *bt, *bxx; 214 Evas_Object *win, *bg, *bx, *hbx, *ck, *bt, *bxx;
209 api_data *api = calloc(1, sizeof(api_data)); 215 api_data *api = calloc(1, sizeof(api_data));
210 216
211 win = elm_win_util_standard_add("clock2", "Clock 2"); 217 win = elm_win_add(NULL, "clock2", ELM_WIN_BASIC);
218 elm_win_title_set(win, "Clock 2");
212 elm_win_autodel_set(win, EINA_TRUE); 219 elm_win_autodel_set(win, EINA_TRUE);
213 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 220 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
214 221
222 bg = elm_bg_add(win);
223 elm_win_resize_object_add(win, bg);
224 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
225 evas_object_show(bg);
226
215 bxx = elm_box_add(win); 227 bxx = elm_box_add(win);
216 elm_win_resize_object_add(win, bxx); 228 elm_win_resize_object_add(win, bxx);
217 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 229 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -264,11 +276,17 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
264void 276void
265test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 277test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
266{ 278{
267 Evas_Object *win, *bx, *ck, *lb; 279 Evas_Object *win, *bg, *bx, *ck, *lb;
268 280
269 win = elm_win_util_standard_add("clock3", "Clock 3"); 281 win = elm_win_add(NULL, "clock3", ELM_WIN_BASIC);
282 elm_win_title_set(win, "Clock 3");
270 elm_win_autodel_set(win, EINA_TRUE); 283 elm_win_autodel_set(win, EINA_TRUE);
271 284
285 bg = elm_bg_add(win);
286 elm_win_resize_object_add(win, bg);
287 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
288 evas_object_show(bg);
289
272 bx = elm_box_add(win); 290 bx = elm_box_add(win);
273 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 291 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
274 elm_win_resize_object_add(win, bx); 292 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c
index 31aad2de7..4790ee089 100644
--- a/src/bin/test_cnp.c
+++ b/src/bin/test_cnp.c
@@ -38,11 +38,17 @@ _bt_clear_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
38void 38void
39test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 39test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
40{ 40{
41 Evas_Object *win, *gd, *bt, *en, *lb; 41 Evas_Object *win, *bg, *gd, *bt, *en, *lb;
42 42
43 win = elm_win_util_standard_add("copypaste", "CopyPaste"); 43 win = elm_win_add(NULL, "CopyPaste", ELM_WIN_BASIC);
44 elm_win_title_set(win, "CopyPaste");
44 elm_win_autodel_set(win, EINA_TRUE); 45 elm_win_autodel_set(win, EINA_TRUE);
45 46
47 bg = elm_bg_add(win);
48 elm_win_resize_object_add(win, bg);
49 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
50 evas_object_show(bg);
51
46 gd = elm_grid_add(win); 52 gd = elm_grid_add(win);
47 elm_grid_size_set(gd, 100, 100); 53 elm_grid_size_set(gd, 100, 100);
48 elm_win_resize_object_add(win, gd); 54 elm_win_resize_object_add(win, gd);
diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c
index 187861053..67fa2196b 100644
--- a/src/bin/test_colorselector.c
+++ b/src/bin/test_colorselector.c
@@ -75,12 +75,18 @@ void
75test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 75test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
76 void *event_info __UNUSED__) 76 void *event_info __UNUSED__)
77{ 77{
78 Evas_Object *win, *bx, *bx2, *cs, *fr, *re, *bt; 78 Evas_Object *win, *bg, *bx, *bx2, *cs, *fr, *re, *bt;
79 int r, g, b, a; 79 int r, g, b, a;
80 80
81 win = elm_win_util_standard_add("colorselector", "ColorSelector"); 81 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
82 elm_win_title_set(win, "Color Selector");
82 elm_win_autodel_set(win, EINA_TRUE); 83 elm_win_autodel_set(win, EINA_TRUE);
83 84
85 bg = elm_bg_add(win);
86 elm_win_resize_object_add(win, bg);
87 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
88 evas_object_show(bg);
89
84 bx = elm_box_add(win); 90 bx = elm_box_add(win);
85 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 91 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
86 elm_win_resize_object_add(win, bx); 92 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c
index 925a1aa22..3ff3f5c54 100644
--- a/src/bin/test_conform.c
+++ b/src/bin/test_conform.c
@@ -7,12 +7,18 @@
7void 7void
8test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 8test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
9{ 9{
10 Evas_Object *win, *conform, *btn, *bx, *en; 10 Evas_Object *win, *bg, *conform, *btn, *bx, *en;
11 11
12 win = elm_win_util_standard_add("conformant", "Conformant"); 12 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
13 elm_win_title_set(win, "Conformant");
13 elm_win_autodel_set(win, EINA_TRUE); 14 elm_win_autodel_set(win, EINA_TRUE);
14 elm_win_conformant_set(win, EINA_TRUE); 15 elm_win_conformant_set(win, EINA_TRUE);
15 16
17 bg = elm_bg_add(win);
18 elm_win_resize_object_add(win, bg);
19 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
20 evas_object_show(bg);
21
16 conform = elm_conformant_add(win); 22 conform = elm_conformant_add(win);
17 elm_win_resize_object_add(win, conform); 23 elm_win_resize_object_add(win, conform);
18 evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 24 evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -90,12 +96,18 @@ popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
90void 96void
91test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 97test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
92{ 98{
93 Evas_Object *win, *conform, *btn, *bx, *en, *pg; 99 Evas_Object *win, *bg, *conform, *btn, *bx, *en, *pg;
94 100
95 win = elm_win_util_standard_add("conformant2", "Conformant 2"); 101 win = elm_win_add(NULL, "conformant2", ELM_WIN_BASIC);
102 elm_win_title_set(win, "Conformant 2");
96 elm_win_autodel_set(win, EINA_TRUE); 103 elm_win_autodel_set(win, EINA_TRUE);
97 elm_win_conformant_set(win, EINA_TRUE); 104 elm_win_conformant_set(win, EINA_TRUE);
98 105
106 bg = elm_bg_add(win);
107 elm_win_resize_object_add(win, bg);
108 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
109 evas_object_show(bg);
110
99 bx = elm_box_add(win); 111 bx = elm_box_add(win);
100 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 112 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
101 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 113 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c
index 94b91328d..bd52cc9c8 100644
--- a/src/bin/test_ctxpopup.c
+++ b/src/bin/test_ctxpopup.c
@@ -288,11 +288,17 @@ static void _list_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, vo
288void 288void
289test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 289test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
290{ 290{
291 Evas_Object *win, *list; 291 Evas_Object *win, *bg, *list;
292 292
293 win = elm_win_util_standard_add("contextual-popup", "Contextual Popup"); 293 win = elm_win_add(NULL, "Contextual Popup", ELM_WIN_BASIC);
294 elm_win_title_set(win, "Contextual Popup");
294 elm_win_autodel_set(win, EINA_TRUE); 295 elm_win_autodel_set(win, EINA_TRUE);
295 296
297 bg = elm_bg_add(win);
298 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
299 elm_win_resize_object_add(win, bg);
300 evas_object_show(bg);
301
296 list = elm_list_add(win); 302 list = elm_list_add(win);
297 elm_win_resize_object_add(win, list); 303 elm_win_resize_object_add(win, list);
298 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 304 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 0150b4416..859d01075 100644
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -165,7 +165,7 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
165void 165void
166test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 166test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
167{ 167{
168 Evas_Object *win, *bx, *o, *grid, *gl; 168 Evas_Object *win, *bg, *bx, *o, *grid, *gl;
169 Elm_Object_Item *glit1, *glit2, *glit3; 169 Elm_Object_Item *glit1, *glit2, *glit3;
170 Elm_Object_Item *tb_it; 170 Elm_Object_Item *tb_it;
171 Elm_Object_Item *lit; 171 Elm_Object_Item *lit;
@@ -185,9 +185,15 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
185 "wood_01.jpg", 185 "wood_01.jpg",
186 }; 186 };
187 187
188 win = elm_win_util_standard_add("cursor2", "Cursor 2"); 188 win = elm_win_add(NULL, "cursor2", ELM_WIN_BASIC);
189 elm_win_title_set(win, "Cursor 2");
189 elm_win_autodel_set(win, EINA_TRUE); 190 elm_win_autodel_set(win, EINA_TRUE);
190 191
192 bg = elm_bg_add(win);
193 elm_win_resize_object_add(win, bg);
194 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
195 evas_object_show(bg);
196
191 bx = elm_box_add(win); 197 bx = elm_box_add(win);
192 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 198 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
193 elm_win_resize_object_add(win, bx); 199 elm_win_resize_object_add(win, bx);
@@ -283,16 +289,22 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
283void 289void
284test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 290test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
285{ 291{
286 Evas_Object *win, *bx, *o; 292 Evas_Object *win, *bg, *bx, *o;
287 Elm_Object_Item *lit; 293 Elm_Object_Item *lit;
288 char buf[PATH_MAX]; 294 char buf[PATH_MAX];
289 295
290 win = elm_win_util_standard_add("cursor3", "Cursor 3"); 296 win = elm_win_add(NULL, "cursor3", ELM_WIN_BASIC);
297 elm_win_title_set(win, "Cursor 3");
291 elm_win_autodel_set(win, EINA_TRUE); 298 elm_win_autodel_set(win, EINA_TRUE);
292 299
293 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get()); 300 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get());
294 elm_theme_extension_add(NULL, buf); 301 elm_theme_extension_add(NULL, buf);
295 302
303 bg = elm_bg_add(win);
304 elm_win_resize_object_add(win, bg);
305 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
306 evas_object_show(bg);
307
296 bx = elm_box_add(win); 308 bx = elm_box_add(win);
297 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 309 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
298 elm_win_resize_object_add(win, bx); 310 elm_win_resize_object_add(win, bx);
@@ -388,14 +400,20 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
388void 400void
389test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 401test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
390{ 402{
391 Evas_Object *win, *bx, *ly, *bt; 403 Evas_Object *win, *bg, *bx, *ly, *bt;
392 char buf[PATH_MAX]; 404 char buf[PATH_MAX];
393 405
394 win = elm_win_util_standard_add("cursor layout", "Cursor Layout"); 406 win = elm_win_add(NULL, "cursor layout", ELM_WIN_BASIC);
407 elm_win_title_set(win, "Cursor Layout");
395 elm_win_autodel_set(win, EINA_TRUE); 408 elm_win_autodel_set(win, EINA_TRUE);
396 409
397 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get()); 410 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get());
398 411
412 bg = elm_bg_add(win);
413 elm_win_resize_object_add(win, bg);
414 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
415 evas_object_show(bg);
416
399 bx = elm_box_add(win); 417 bx = elm_box_add(win);
400 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 418 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
401 elm_win_resize_object_add(win, bx); 419 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_datetime.c b/src/bin/test_datetime.c
index ffc8608b9..1d50c79cb 100644
--- a/src/bin/test_datetime.c
+++ b/src/bin/test_datetime.c
@@ -15,13 +15,19 @@ _changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
15void 15void
16test_datetime(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 16test_datetime(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
17{ 17{
18 Evas_Object *win, *bx, *datetime; 18 Evas_Object *win, *bg, *bx, *datetime;
19 time_t t; 19 time_t t;
20 struct tm time1; 20 struct tm time1;
21 21
22 win = elm_win_util_standard_add("datetime", "DateTime"); 22 win = elm_win_add(NULL, "Datetime", ELM_WIN_BASIC);
23 elm_win_title_set(win, "Datetime");
23 elm_win_autodel_set(win, 1); 24 elm_win_autodel_set(win, 1);
24 25
26 bg = elm_bg_add(win);
27 elm_win_resize_object_add(win, bg);
28 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
29 evas_object_show(bg);
30
25 bx = elm_box_add(win); 31 bx = elm_box_add(win);
26 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 32 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
27 elm_win_resize_object_add(win, bx); 33 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_dayselector.c b/src/bin/test_dayselector.c
index 7d5fc5541..c87ddd626 100644
--- a/src/bin/test_dayselector.c
+++ b/src/bin/test_dayselector.c
@@ -43,11 +43,18 @@ static void _changed_cb(void* data __UNUSED__, Evas_Object* obj, void* event_inf
43void 43void
44test_dayselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 44test_dayselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
45{ 45{
46 Evas_Object *win, *bx, *dayselector, *sunday; 46 Evas_Object *win, *bg, *bx, *dayselector, *sunday;
47 47
48 win = elm_win_util_standard_add("dayselector", "Day Selector"); 48 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
49 elm_win_title_set(win, "Day Selector");
49 elm_win_autodel_set(win, EINA_TRUE); 50 elm_win_autodel_set(win, EINA_TRUE);
50 51
52 bg = elm_bg_add(win);
53 elm_win_resize_object_add(win, bg);
54 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
56 evas_object_show(bg);
57
51 bx = elm_box_add(win); 58 bx = elm_box_add(win);
52 elm_win_resize_object_add(win, bx); 59 elm_win_resize_object_add(win, bx);
53 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 60 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c
index d62dee485..45d909955 100644
--- a/src/bin/test_diskselector.c
+++ b/src/bin/test_diskselector.c
@@ -202,7 +202,7 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
202void 202void
203test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 203test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
204{ 204{
205 Evas_Object *win, *bx, *disk, *ic, *bxx, *bt; 205 Evas_Object *win, *bg, *bx, *disk, *ic, *bxx, *bt;
206 Elm_Object_Item *ds_it; 206 Elm_Object_Item *ds_it;
207 char buf[PATH_MAX]; 207 char buf[PATH_MAX];
208 api_data *api = calloc(1, sizeof(api_data)); 208 api_data *api = calloc(1, sizeof(api_data));
@@ -216,10 +216,17 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
216 }; 216 };
217 char date[3]; 217 char date[3];
218 218
219 win = elm_win_util_standard_add("diskselector", "Disk Selector"); 219 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
220 elm_win_title_set(win, "Disk Selector");
220 elm_win_autodel_set(win, EINA_TRUE); 221 elm_win_autodel_set(win, EINA_TRUE);
221 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 222 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
222 223
224 bg = elm_bg_add(win);
225 elm_win_resize_object_add(win, bg);
226 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
227 evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
228 evas_object_show(bg);
229
223 bxx = elm_box_add(win); 230 bxx = elm_box_add(win);
224 elm_win_resize_object_add(win, bxx); 231 elm_win_resize_object_add(win, bxx);
225 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 232 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index 7e26a4cab..9aa9cd453 100644
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -126,7 +126,7 @@ _test_eio_clear(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
126void 126void
127test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 127test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
128{ 128{
129 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_bt, *gl; 129 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *gl;
130 130
131 it_eio.item_style = "default"; 131 it_eio.item_style = "default";
132 it_eio.func.text_get = _gl_text_get; 132 it_eio.func.text_get = _gl_text_get;
@@ -134,9 +134,15 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
134 it_eio.func.state_get = _gl_state_get; 134 it_eio.func.state_get = _gl_state_get;
135 it_eio.func.del = _gl_del; 135 it_eio.func.del = _gl_del;
136 136
137 win = elm_win_util_standard_add("fileselector-button", "File Selector Button"); 137 win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC);
138 elm_win_title_set(win, "File Selector Button");
138 elm_win_autodel_set(win, EINA_TRUE); 139 elm_win_autodel_set(win, EINA_TRUE);
139 140
141 bg = elm_bg_add(win);
142 elm_win_resize_object_add(win, bg);
143 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
144 evas_object_show(bg);
145
140 vbox = elm_box_add(win); 146 vbox = elm_box_add(win);
141 elm_win_resize_object_add(win, vbox); 147 elm_win_resize_object_add(win, vbox);
142 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 148 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index a07011dc8..3de91135c 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -77,12 +77,18 @@ my_entry_bt_6(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
77void 77void
78test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 78test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
79{ 79{
80 Evas_Object *win, *bx, *bx2, *bt, *en; 80 Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
81 char buf[4096]; 81 char buf[4096];
82 82
83 win = elm_win_util_standard_add("entry", "Entry"); 83 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
84 elm_win_title_set(win, "Entry");
84 elm_win_autodel_set(win, EINA_TRUE); 85 elm_win_autodel_set(win, EINA_TRUE);
85 86
87 bg = elm_bg_add(win);
88 elm_win_resize_object_add(win, bg);
89 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
90 evas_object_show(bg);
91
86 bx = elm_box_add(win); 92 bx = elm_box_add(win);
87 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 93 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
88 elm_win_resize_object_add(win, bx); 94 elm_win_resize_object_add(win, bx);
@@ -269,13 +275,19 @@ scrolled_anchor_test(void *data, Evas_Object *obj __UNUSED__, void *event_info _
269void 275void
270test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 276test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
271{ 277{
272 Evas_Object *win, *bx, *bx2, *bt, *en, *en_p, *sp; 278 Evas_Object *win, *bg, *bx, *bx2, *bt, *en, *en_p, *sp;
273 static Elm_Entry_Filter_Accept_Set digits_filter_data, digits_filter_data2; 279 static Elm_Entry_Filter_Accept_Set digits_filter_data, digits_filter_data2;
274 static Elm_Entry_Filter_Limit_Size limit_filter_data, limit_filter_data2; 280 static Elm_Entry_Filter_Limit_Size limit_filter_data, limit_filter_data2;
275 281
276 win = elm_win_util_standard_add("entry-scrolled", "Entry Scrolled"); 282 win = elm_win_add(NULL, "entry-scrolled", ELM_WIN_BASIC);
283 elm_win_title_set(win, "Entry Scrolled");
277 elm_win_autodel_set(win, EINA_TRUE); 284 elm_win_autodel_set(win, EINA_TRUE);
278 285
286 bg = elm_bg_add(win);
287 elm_win_resize_object_add(win, bg);
288 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
289 evas_object_show(bg);
290
279 bx = elm_box_add(win); 291 bx = elm_box_add(win);
280 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 292 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
281 elm_win_resize_object_add(win, bx); 293 elm_win_resize_object_add(win, bx);
@@ -705,11 +717,17 @@ my_ent_bt_pas(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
705void 717void
706test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 718test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
707{ 719{
708 Evas_Object *win, *bx, *bx2, *bt, *en; 720 Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
709 721
710 win = elm_win_util_standard_add("entry3", "Entry 3"); 722 win = elm_win_add(NULL, "entry3", ELM_WIN_BASIC);
723 elm_win_title_set(win, "Entry 3");
711 elm_win_autodel_set(win, EINA_TRUE); 724 elm_win_autodel_set(win, EINA_TRUE);
712 725
726 bg = elm_bg_add(win);
727 elm_win_resize_object_add(win, bg);
728 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
729 evas_object_show(bg);
730
713 bx = elm_box_add(win); 731 bx = elm_box_add(win);
714 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 732 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
715 elm_win_resize_object_add(win, bx); 733 elm_win_resize_object_add(win, bx);
@@ -1261,12 +1279,18 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1261void 1279void
1262test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1280test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1263{ 1281{
1264 Evas_Object *win, *ly, *en; 1282 Evas_Object *win, *bg, *ly, *en;
1265 char buf[PATH_MAX]; 1283 char buf[PATH_MAX];
1266 1284
1267 win = elm_win_util_standard_add("entry4", "Entry 4"); 1285 win = elm_win_add(NULL, "entry4", ELM_WIN_BASIC);
1286 elm_win_title_set(win, "Entry 4");
1268 elm_win_autodel_set(win, EINA_TRUE); 1287 elm_win_autodel_set(win, EINA_TRUE);
1269 1288
1289 bg = elm_bg_add(win);
1290 elm_win_resize_object_add(win, bg);
1291 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1292 evas_object_show(bg);
1293
1270 ly = elm_layout_add(win); 1294 ly = elm_layout_add(win);
1271 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 1295 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
1272 elm_layout_file_set(ly, buf, "layout"); 1296 elm_layout_file_set(ly, buf, "layout");
@@ -1324,11 +1348,17 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1324void 1348void
1325test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1349test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1326{ 1350{
1327 Evas_Object *win, *bx, *bx2, *bt, *en; 1351 Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
1328 1352
1329 win = elm_win_util_standard_add("entry5", "Entry 5"); 1353 win = elm_win_add(NULL, "entry5", ELM_WIN_BASIC);
1354 elm_win_title_set(win, "Entry 5");
1330 elm_win_autodel_set(win, EINA_TRUE); 1355 elm_win_autodel_set(win, EINA_TRUE);
1331 1356
1357 bg = elm_bg_add(win);
1358 elm_win_resize_object_add(win, bg);
1359 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1360 evas_object_show(bg);
1361
1332 bx = elm_box_add(win); 1362 bx = elm_box_add(win);
1333 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1363 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1334 elm_win_resize_object_add(win, bx); 1364 elm_win_resize_object_add(win, bx);
@@ -1614,11 +1644,17 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1614void 1644void
1615test_entry6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1645test_entry6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1616{ 1646{
1617 Evas_Object *win, *bx, *en; 1647 Evas_Object *win, *bg, *bx, *en;
1618 1648
1619 win = elm_win_util_standard_add("entry6", "Entry 6"); 1649 win = elm_win_add(NULL, "entry6", ELM_WIN_BASIC);
1650 elm_win_title_set(win, "Entry 6");
1620 elm_win_autodel_set(win, EINA_TRUE); 1651 elm_win_autodel_set(win, EINA_TRUE);
1621 1652
1653 bg = elm_bg_add(win);
1654 elm_win_resize_object_add(win, bg);
1655 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1656 evas_object_show(bg);
1657
1622 bx = elm_box_add(win); 1658 bx = elm_box_add(win);
1623 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1659 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1624 elm_win_resize_object_add(win, bx); 1660 elm_win_resize_object_add(win, bx);
@@ -2130,11 +2166,17 @@ auto_save_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
2130void 2166void
2131test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 2167test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
2132{ 2168{
2133 Evas_Object *win, *bx, *bx2, *bt, *np, *ch; 2169 Evas_Object *win, *bg, *bx, *bx2, *bt, *np, *ch;
2134 2170
2135 win = elm_win_util_standard_add("entry-notepad", "Entry Notepad"); 2171 win = elm_win_add(NULL, "entry-notepad", ELM_WIN_BASIC);
2172 elm_win_title_set(win, "Entry Notepad");
2136 elm_win_autodel_set(win, EINA_TRUE); 2173 elm_win_autodel_set(win, EINA_TRUE);
2137 2174
2175 bg = elm_bg_add(win);
2176 elm_win_resize_object_add(win, bg);
2177 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2178 evas_object_show(bg);
2179
2138 bx = elm_box_add(win); 2180 bx = elm_box_add(win);
2139 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2181 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2140 elm_win_resize_object_add(win, bx); 2182 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_entry_anchor2.c b/src/bin/test_entry_anchor2.c
index eb1762b55..c8ca7564f 100644
--- a/src/bin/test_entry_anchor2.c
+++ b/src/bin/test_entry_anchor2.c
@@ -73,11 +73,17 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
73void 73void
74test_entry_anchor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 74test_entry_anchor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
75{ 75{
76 Evas_Object *win, *av; 76 Evas_Object *win, *bg, *av;
77 77
78 win = elm_win_util_standard_add("entry_anchor", "Anchorview"); 78 win = elm_win_add(NULL, "entry_anchor", ELM_WIN_BASIC);
79 elm_win_title_set(win, "Anchorview");
79 elm_win_autodel_set(win, EINA_TRUE); 80 elm_win_autodel_set(win, EINA_TRUE);
80 81
82 bg = elm_bg_add(win);
83 elm_win_resize_object_add(win, bg);
84 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
85 evas_object_show(bg);
86
81 av = elm_entry_add(win); 87 av = elm_entry_add(win);
82 elm_entry_anchor_hover_style_set(av, "popout"); 88 elm_entry_anchor_hover_style_set(av, "popout");
83 elm_entry_anchor_hover_parent_set(av, win); 89 elm_entry_anchor_hover_parent_set(av, win);
diff --git a/src/bin/test_factory.c b/src/bin/test_factory.c
index 83fcd78cb..63a434270 100644
--- a/src/bin/test_factory.c
+++ b/src/bin/test_factory.c
@@ -134,12 +134,18 @@ fac_realize1(void *data, Evas_Object *obj, void *event_info __UNUSED__)
134void 134void
135test_factory(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 135test_factory(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
136{ 136{
137 Evas_Object *win, *bx, *sc, *fc; 137 Evas_Object *win, *bg, *bx, *sc, *fc;
138 int i; 138 int i;
139 139
140 win = elm_win_util_standard_add("factory", "Factory"); 140 win = elm_win_add(NULL, "factory", ELM_WIN_BASIC);
141 elm_win_title_set(win, "Factory");
141 elm_win_autodel_set(win, EINA_TRUE); 142 elm_win_autodel_set(win, EINA_TRUE);
142 143
144 bg = elm_bg_add(win);
145 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
146 elm_win_resize_object_add(win, bg);
147 evas_object_show(bg);
148
143 bx = elm_box_add(win); 149 bx = elm_box_add(win);
144#ifdef HOMOG 150#ifdef HOMOG
145 elm_box_homogeneous_set(bx, EINA_TRUE); 151 elm_box_homogeneous_set(bx, EINA_TRUE);
diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c
index 0b2ce2190..2cbdee21c 100644
--- a/src/bin/test_fileselector.c
+++ b/src/bin/test_fileselector.c
@@ -119,7 +119,7 @@ test_fileselector(void *data __UNUSED__,
119 Evas_Object *obj __UNUSED__, 119 Evas_Object *obj __UNUSED__,
120 void *event_info __UNUSED__) 120 void *event_info __UNUSED__)
121{ 121{
122 Evas_Object *win, *fs, *vbox, *hbox, *bt, *sep; 122 Evas_Object *win, *fs, *bg, *vbox, *hbox, *bt, *sep;
123 123
124 /* Set the locale according to the system pref. 124 /* Set the locale according to the system pref.
125 * If you dont do so the file selector will order the files list in 125 * If you dont do so the file selector will order the files list in
@@ -129,9 +129,15 @@ test_fileselector(void *data __UNUSED__,
129 129
130 elm_need_ethumb(); 130 elm_need_ethumb();
131 131
132 win = elm_win_util_standard_add("fileselector", "File Selector"); 132 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
133 elm_win_title_set(win, "File Selector");
133 elm_win_autodel_set(win, EINA_TRUE); 134 elm_win_autodel_set(win, EINA_TRUE);
134 135
136 bg = elm_bg_add(win);
137 elm_win_resize_object_add(win, bg);
138 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
139 evas_object_show(bg);
140
135 vbox = elm_box_add(win); 141 vbox = elm_box_add(win);
136 elm_win_resize_object_add(win, vbox); 142 elm_win_resize_object_add(win, vbox);
137 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 143 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c
index 969983ab9..e87a7164f 100644
--- a/src/bin/test_fileselector_button.c
+++ b/src/bin/test_fileselector_button.c
@@ -155,13 +155,19 @@ test_fileselector_button(void *data __UNUSED__,
155 Evas_Object *obj __UNUSED__, 155 Evas_Object *obj __UNUSED__,
156 void *event_info __UNUSED__) 156 void *event_info __UNUSED__)
157{ 157{
158 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *bxx; 158 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *bxx;
159 api_data *api = calloc(1, sizeof(api_data)); 159 api_data *api = calloc(1, sizeof(api_data));
160 160
161 win = elm_win_util_standard_add("fileselector-button", "File Selector Button"); 161 win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC);
162 elm_win_title_set(win, "File Selector Button");
162 elm_win_autodel_set(win, EINA_TRUE); 163 elm_win_autodel_set(win, EINA_TRUE);
163 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 164 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
164 165
166 bg = elm_bg_add(win);
167 elm_win_resize_object_add(win, bg);
168 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
169 evas_object_show(bg);
170
165 bxx = elm_box_add(win); 171 bxx = elm_box_add(win);
166 elm_win_resize_object_add(win, bxx); 172 elm_win_resize_object_add(win, bxx);
167 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 173 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_fileselector_entry.c b/src/bin/test_fileselector_entry.c
index 98ab423bc..48357d71b 100644
--- a/src/bin/test_fileselector_entry.c
+++ b/src/bin/test_fileselector_entry.c
@@ -160,13 +160,19 @@ test_fileselector_entry(void *data __UNUSED__,
160 Evas_Object *obj __UNUSED__, 160 Evas_Object *obj __UNUSED__,
161 void *event_info __UNUSED__) 161 void *event_info __UNUSED__)
162{ 162{
163 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb, *bxx; 163 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb, *bxx;
164 api_data *api = calloc(1, sizeof(api_data)); 164 api_data *api = calloc(1, sizeof(api_data));
165 165
166 win = elm_win_util_standard_add("fileselector-entry", "File Selector Entry"); 166 win = elm_win_add(NULL, "fileselector-entry", ELM_WIN_BASIC);
167 elm_win_title_set(win, "File Selector Entry");
167 elm_win_autodel_set(win, EINA_TRUE); 168 elm_win_autodel_set(win, EINA_TRUE);
168 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 169 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
169 170
171 bg = elm_bg_add(win);
172 elm_win_resize_object_add(win, bg);
173 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
174 evas_object_show(bg);
175
170 bxx = elm_box_add(win); 176 bxx = elm_box_add(win);
171 elm_win_resize_object_add(win, bxx); 177 elm_win_resize_object_add(win, bxx);
172 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 178 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index 20d4e49ef..f5b32ed7a 100644
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -63,13 +63,19 @@ my_fl_8(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
63void 63void
64test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 64test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
65{ 65{
66 Evas_Object *win, *bx, *bx2, *fl, *o, *bt, *ly; 66 Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *ly;
67 char buf[PATH_MAX]; 67 char buf[PATH_MAX];
68 68
69 win = elm_win_util_standard_add("flip", "Flip"); 69 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
70 elm_win_title_set(win, "Flip");
70 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 71 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
71 elm_win_autodel_set(win, EINA_TRUE); 72 elm_win_autodel_set(win, EINA_TRUE);
72 73
74 bg = elm_bg_add(win);
75 elm_win_resize_object_add(win, bg);
76 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
77 evas_object_show(bg);
78
73 bx = elm_box_add(win); 79 bx = elm_box_add(win);
74 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 80 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
75 elm_win_resize_object_add(win, bx); 81 elm_win_resize_object_add(win, bx);
@@ -367,12 +373,18 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
367void 373void
368test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 374test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
369{ 375{
370 Evas_Object *win, *bx, *bx2, *fl, *fl_f, *fl_b, *o, *bt, *fr; 376 Evas_Object *win, *bg, *bx, *bx2, *fl, *fl_f, *fl_b, *o, *bt, *fr;
371 char buf[PATH_MAX]; 377 char buf[PATH_MAX];
372 378
373 win = elm_win_util_standard_add("flip3", "Flip Flip"); 379 win = elm_win_add(NULL, "flip3", ELM_WIN_BASIC);
380 elm_win_title_set(win, "Flip Flip");
374 elm_win_autodel_set(win, EINA_TRUE); 381 elm_win_autodel_set(win, EINA_TRUE);
375 382
383 bg = elm_bg_add(win);
384 elm_win_resize_object_add(win, bg);
385 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
376 bx = elm_box_add(win); 388 bx = elm_box_add(win);
377 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 389 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
378 elm_win_resize_object_add(win, bx); 390 elm_win_resize_object_add(win, bx);
@@ -499,12 +511,18 @@ my_fl_ch(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
499void 511void
500test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 512test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
501{ 513{
502 Evas_Object *win, *bx, *fl, *im, *li, *bt, *rd, *rdg; 514 Evas_Object *win, *bg, *bx, *fl, *im, *li, *bt, *rd, *rdg;
503 char buf[PATH_MAX]; 515 char buf[PATH_MAX];
504 516
505 win = elm_win_util_standard_add("flip-interactive", "Flip Interactive"); 517 win = elm_win_add(NULL, "flip4", ELM_WIN_BASIC);
518 elm_win_title_set(win, "Flip Interactive");
506 elm_win_autodel_set(win, EINA_TRUE); 519 elm_win_autodel_set(win, EINA_TRUE);
507 520
521 bg = elm_bg_add(win);
522 elm_win_resize_object_add(win, bg);
523 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
524 evas_object_show(bg);
525
508 bx = elm_box_add(win); 526 bx = elm_box_add(win);
509 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 527 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
510 elm_win_resize_object_add(win, bx); 528 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_flip_page.c b/src/bin/test_flip_page.c
index 20cafb3f6..6715e79e0 100644
--- a/src/bin/test_flip_page.c
+++ b/src/bin/test_flip_page.c
@@ -835,13 +835,19 @@ im_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
835void 835void
836test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 836test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
837{ 837{
838 Evas_Object *win, *im, *im2, *rc; 838 Evas_Object *win, *bg, *im, *im2, *rc;
839 char buf[PATH_MAX]; 839 char buf[PATH_MAX];
840 840
841 win = elm_win_util_standard_add("flip-page", "Flip Page"); 841 win = elm_win_add(NULL, "flip_page", ELM_WIN_BASIC);
842 elm_win_title_set(win, "Flip Page");
842 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 843 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
843 elm_win_autodel_set(win, EINA_TRUE); 844 elm_win_autodel_set(win, EINA_TRUE);
844 845
846 bg = elm_bg_add(win);
847 elm_win_resize_object_add(win, bg);
848 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
849 evas_object_show(bg);
850
845 im2 = evas_object_image_filled_add(evas_object_evas_get(win)); 851 im2 = evas_object_image_filled_add(evas_object_evas_get(win));
846 snprintf(buf, sizeof(buf), "%s/images/%s", 852 snprintf(buf, sizeof(buf), "%s/images/%s",
847 elm_app_data_dir_get(), "sky_04.jpg"); 853 elm_app_data_dir_get(), "sky_04.jpg");
diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c
index 100588dc9..8126ab16e 100644
--- a/src/bin/test_flipselector.c
+++ b/src/bin/test_flipselector.c
@@ -82,7 +82,7 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
82{ 82{
83 char buf[8]; 83 char buf[8];
84 unsigned int i; 84 unsigned int i;
85 Evas_Object *win, *bx, *fp, *bt, *bx2, *sl; 85 Evas_Object *win, *bg, *bx, *fp, *bt, *bx2, *sl;
86 static const char *lbl[] = { 86 static const char *lbl[] = {
87 "Elementary", 87 "Elementary",
88 "Evas", 88 "Evas",
@@ -94,9 +94,15 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
94 "Edbus" 94 "Edbus"
95 }; 95 };
96 96
97 win = elm_win_util_standard_add("flipselector", "Flip Selector"); 97 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
98 elm_win_title_set(win, "Flip Selector");
98 elm_win_autodel_set(win, EINA_TRUE); 99 elm_win_autodel_set(win, EINA_TRUE);
99 100
101 bg = elm_bg_add(win);
102 elm_win_resize_object_add(win, bg);
103 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
104 evas_object_show(bg);
105
100 bx = elm_box_add(win); 106 bx = elm_box_add(win);
101 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 107 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
102 elm_win_resize_object_add(win, bx); 108 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_floating.c b/src/bin/test_floating.c
index 2e3ac9429..211425ca8 100644
--- a/src/bin/test_floating.c
+++ b/src/bin/test_floating.c
@@ -65,13 +65,19 @@ _del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event
65void 65void
66test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 66test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
67{ 67{
68 Evas_Object *win, *gl; 68 Evas_Object *win, *bg, *gl;
69 int i; 69 int i;
70 Ecore_Animator *ani; 70 Ecore_Animator *ani;
71 71
72 win = elm_win_util_standard_add("floating", "Floating"); 72 win = elm_win_add(NULL, "floating", ELM_WIN_BASIC);
73 elm_win_title_set(win, "Floating");
73 elm_win_autodel_set(win, EINA_TRUE); 74 elm_win_autodel_set(win, EINA_TRUE);
74 75
76 bg = elm_bg_add(win);
77 elm_win_resize_object_add(win, bg);
78 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
79 evas_object_show(bg);
80
75 gl = elm_genlist_add(win); 81 gl = elm_genlist_add(win);
76 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 82 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
77 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); 83 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index af30f3098..e52a84ecc 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -57,13 +57,23 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
57 Evas_Object *win; 57 Evas_Object *win;
58 unsigned int i, j; 58 unsigned int i, j;
59 59
60 win = elm_win_util_standard_add("focus", "Focus"); 60 win = elm_win_add(NULL, "focus", ELM_WIN_BASIC);
61 elm_win_title_set(win, "Focus");
61 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 62 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
62 evas_object_resize(win, 800, 600); 63 evas_object_resize(win, 800, 600);
63 elm_object_event_callback_add(win, _event, NULL); 64 elm_object_event_callback_add(win, _event, NULL);
64 elm_win_autodel_set(win, EINA_TRUE); 65 elm_win_autodel_set(win, EINA_TRUE);
65 my_show(win); 66 my_show(win);
66 67
68 {
69 Evas_Object *bg;
70 bg = elm_bg_add(win);
71 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
72 EVAS_HINT_EXPAND);
73 elm_win_resize_object_add(win, bg);
74 my_show(bg);
75 }
76
67 Evas_Object *mainbx = elm_box_add(win); 77 Evas_Object *mainbx = elm_box_add(win);
68 elm_box_horizontal_set(mainbx, EINA_TRUE); 78 elm_box_horizontal_set(mainbx, EINA_TRUE);
69 elm_win_resize_object_add(win, mainbx); 79 elm_win_resize_object_add(win, mainbx);
diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c
index 81042bdc7..443733842 100644
--- a/src/bin/test_focus2.c
+++ b/src/bin/test_focus2.c
@@ -48,10 +48,11 @@ _focus_layout_part(void *data, Evas_Object *o __UNUSED__, void *event_info __UNU
48void 48void
49test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 49test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
50{ 50{
51 Evas_Object *win, *bx, *ly, *bt, *en, *bt1; 51 Evas_Object *win, *bg, *bx, *ly, *bt, *en, *bt1;
52 char buf[PATH_MAX]; 52 char buf[PATH_MAX];
53 53
54 win = elm_win_util_standard_add("focus2", "Focus 2"); 54 win = elm_win_add(NULL, "focus2", ELM_WIN_BASIC);
55 elm_win_title_set(win, "Focus2");
55 elm_win_autodel_set(win, EINA_TRUE); 56 elm_win_autodel_set(win, EINA_TRUE);
56 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 57 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
57 58
@@ -62,6 +63,11 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
62 (evas_object_evas_get(win), EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 63 (evas_object_evas_get(win), EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
63 _focus_out, NULL); 64 _focus_out, NULL);
64 65
66 bg = elm_bg_add(win);
67 elm_win_resize_object_add(win, bg);
68 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
69 evas_object_show(bg);
70
65 bx = elm_box_add(win); 71 bx = elm_box_add(win);
66 elm_win_resize_object_add(win, bx); 72 elm_win_resize_object_add(win, bx);
67 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 73 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index 71a5a8a11..36fe8ff8f 100644
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -53,13 +53,19 @@ _hide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNU
53void 53void
54test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 54test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
55{ 55{
56 Evas_Object *win, *bx, *bt, *en; 56 Evas_Object *win, *bg, *bx, *bt, *en;
57 57
58 win = elm_win_util_standard_add("focus3", "Focus 3"); 58 win = elm_win_add(NULL, "focus3", ELM_WIN_BASIC);
59 elm_win_title_set(win, "Focus 3");
59 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 60 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
60 evas_object_resize(win, 320, 480); 61 evas_object_resize(win, 320, 480);
61 elm_win_autodel_set(win, EINA_TRUE); 62 elm_win_autodel_set(win, EINA_TRUE);
62 63
64 bg = elm_bg_add(win);
65 elm_win_resize_object_add(win, bg);
66 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
67 evas_object_show(bg);
68
63 bx = elm_box_add(win); 69 bx = elm_box_add(win);
64 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 70 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
65 elm_win_resize_object_add(win, bx); 71 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index b17c8f971..20e03147c 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -469,13 +469,19 @@ cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
469void 469void
470test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 470test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
471{ 471{
472 Evas_Object *win, *bt, *content_box, *bxx, *bx, *tg; 472 Evas_Object *win, *bg, *bt, *content_box, *bxx, *bx, *tg;
473 api_data *api = calloc(1, sizeof(api_data)); 473 api_data *api = calloc(1, sizeof(api_data));
474 474
475 win = elm_win_util_standard_add("gengrid", "GenGrid"); 475 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
476 elm_win_title_set(win, "GenGrid");
476 elm_win_autodel_set(win, EINA_TRUE); 477 elm_win_autodel_set(win, EINA_TRUE);
477 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 478 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
478 479
480 bg = elm_bg_add(win);
481 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
482 elm_win_resize_object_add(win, bg);
483 evas_object_show(bg);
484
479 bxx = elm_box_add(win); 485 bxx = elm_box_add(win);
480 api->box = bxx; 486 api->box = bxx;
481 elm_win_resize_object_add(win, bxx); 487 elm_win_resize_object_add(win, bxx);
@@ -680,11 +686,17 @@ _size_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
680void 686void
681test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 687test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
682{ 688{
683 Evas_Object *win, *grid, *bx, *hbx, *bt, *ck; 689 Evas_Object *win, *bg, *grid, *bx, *hbx, *bt, *ck;
684 690
685 win = elm_win_util_standard_add("gengrid2", "GenGrid 2"); 691 win = elm_win_add(NULL, "gengrid2", ELM_WIN_BASIC);
692 elm_win_title_set(win, "GenGrid2");
686 elm_win_autodel_set(win, EINA_TRUE); 693 elm_win_autodel_set(win, EINA_TRUE);
687 694
695 bg = elm_bg_add(win);
696 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
697 elm_win_resize_object_add(win, bg);
698 evas_object_show(bg);
699
688 bx = elm_box_add(win); 700 bx = elm_box_add(win);
689 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 701 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
690 elm_win_resize_object_add(win, bx); 702 elm_win_resize_object_add(win, bx);
@@ -776,14 +788,20 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
776void 788void
777test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 789test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
778{ 790{
779 Evas_Object *win, *grid; 791 Evas_Object *win, *bg, *grid;
780 static Testitem ti[144]; 792 static Testitem ti[144];
781 int i, n; 793 int i, n;
782 char buf[PATH_MAX]; 794 char buf[PATH_MAX];
783 795
784 win = elm_win_util_standard_add("gengrid_group", "GenGrid Group"); 796 win = elm_win_add(NULL, "gengrid_group", ELM_WIN_BASIC);
797 elm_win_title_set(win, "GenGrid Group");
785 elm_win_autodel_set(win, EINA_TRUE); 798 elm_win_autodel_set(win, EINA_TRUE);
786 799
800 bg = elm_bg_add(win);
801 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
802 elm_win_resize_object_add(win, bg);
803 evas_object_show(bg);
804
787 grid = elm_gengrid_add(win); 805 grid = elm_gengrid_add(win);
788 elm_gengrid_item_size_set(grid, 150, 150); 806 elm_gengrid_item_size_set(grid, 150, 150);
789 elm_gengrid_group_item_size_set(grid, 31, 31); 807 elm_gengrid_group_item_size_set(grid, 31, 31);
diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c
index 487c84ede..e61883c05 100644
--- a/src/bin/test_gesture_layer2.c
+++ b/src/bin/test_gesture_layer2.c
@@ -523,16 +523,22 @@ void
523test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 523test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
524 void *event_info __UNUSED__) 524 void *event_info __UNUSED__)
525{ 525{
526 Evas_Object *win, *tb, *lb, *bx; 526 Evas_Object *win, *bg, *tb, *lb, *bx;
527 Evas_Object *r; /* Gesture layer transparent object */ 527 Evas_Object *r; /* Gesture layer transparent object */
528 Evas_Object *g; /* The Gesture Layer object */ 528 Evas_Object *g; /* The Gesture Layer object */
529 529
530 infra_data *infra = _infra_data_alloc(); 530 infra_data *infra = _infra_data_alloc();
531 531
532 win = elm_win_util_standard_add("table", "Table"); 532 win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
533 elm_win_title_set(win, "Table");
533 elm_win_autodel_set(win, EINA_TRUE); 534 elm_win_autodel_set(win, EINA_TRUE);
534 evas_object_smart_callback_add(win, "delete,request", my_win_del, infra); 535 evas_object_smart_callback_add(win, "delete,request", my_win_del, infra);
535 536
537 bg = elm_bg_add(win);
538 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
539 elm_win_resize_object_add(win, bg);
540 evas_object_show(bg);
541
536 /* START - Building icons table */ 542 /* START - Building icons table */
537 bx = elm_box_add(win); 543 bx = elm_box_add(win);
538 tb = elm_table_add(win); 544 tb = elm_table_add(win);
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index f8f276727..325d487b5 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -558,7 +558,7 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve
558void 558void
559test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 559test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
560{ 560{
561 Evas_Object *win, *bx, *bt, *gl; 561 Evas_Object *win, *bg, *bx, *bt, *gl;
562 Ecore_Animator *ani; 562 Ecore_Animator *ani;
563 GLData *gld = NULL; 563 GLData *gld = NULL;
564 564
@@ -569,12 +569,19 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
569 // new window - do the usual and give it a name, title and delete handler 569 // new window - do the usual and give it a name, title and delete handler
570 // Set the engine to opengl_x11 570 // Set the engine to opengl_x11
571 elm_config_preferred_engine_set("opengl_x11"); 571 elm_config_preferred_engine_set("opengl_x11");
572 win = elm_win_util_standard_add("glview", "GLView"); 572 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
573 // Set preferred engine back to default from config 573 // Set preferred engine back to default from config
574 elm_config_preferred_engine_set(NULL); 574 elm_config_preferred_engine_set(NULL);
575 575
576 elm_win_title_set(win, "GLView");
576 elm_win_autodel_set(win, EINA_TRUE); 577 elm_win_autodel_set(win, EINA_TRUE);
577 578
579 // add a standard bg
580 bg = elm_bg_add(win);
581 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
582 elm_win_resize_object_add(win, bg);
583 evas_object_show(bg);
584
578 bx = elm_box_add(win); 585 bx = elm_box_add(win);
579 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 586 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
580 elm_win_resize_object_add(win, bx); 587 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index fc21ef43c..f75e39842 100644
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -232,7 +232,7 @@ _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event
232void 232void
233test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 233test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
234{ 234{
235 Evas_Object *win, *bx, *bt, *gl; 235 Evas_Object *win, *bg, *bx, *bt, *gl;
236 Ecore_Animator *ani; 236 Ecore_Animator *ani;
237 GLData *gld = NULL; 237 GLData *gld = NULL;
238 238
@@ -240,12 +240,18 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
240 240
241 // Set the engine to opengl_x11 241 // Set the engine to opengl_x11
242 elm_config_preferred_engine_set("opengl_x11"); 242 elm_config_preferred_engine_set("opengl_x11");
243 win = elm_win_util_standard_add("glview simple", "GLView Simple"); 243 win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC);
244 // Set preferred engine back to default from config 244 // Set preferred engine back to default from config
245 elm_config_preferred_engine_set(NULL); 245 elm_config_preferred_engine_set(NULL);
246 246
247 elm_win_title_set(win, "GLView Simple");
247 elm_win_autodel_set(win, EINA_TRUE); 248 elm_win_autodel_set(win, EINA_TRUE);
248 249
250 bg = elm_bg_add(win);
251 elm_win_resize_object_add(win, bg);
252 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
253 evas_object_show(bg);
254
249 bx = elm_box_add(win); 255 bx = elm_box_add(win);
250 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 256 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
251 elm_win_resize_object_add(win, bx); 257 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_grid.c b/src/bin/test_grid.c
index f08c06049..cb7c535cc 100644
--- a/src/bin/test_grid.c
+++ b/src/bin/test_grid.c
@@ -96,12 +96,17 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
96void 96void
97test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 97test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
98{ 98{
99 Evas_Object *win, *gd, *bt, *rc, *en; 99 Evas_Object *win, *bg, *gd, *bt, *rc, *en;
100 100
101 win = elm_win_util_standard_add("grid", "Grid"); 101 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
102 elm_win_title_set(win, "Grid");
102 elm_win_autodel_set(win, EINA_TRUE); 103 elm_win_autodel_set(win, EINA_TRUE);
103 api_data *api = calloc(1, sizeof(api_data)); 104 api_data *api = calloc(1, sizeof(api_data));
104 105
106 bg = elm_bg_add(win);
107 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
108 elm_win_resize_object_add(win, bg);
109 evas_object_show(bg);
105 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 110 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
106 111
107 gd = elm_grid_add(win); 112 gd = elm_grid_add(win);
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index d86c3cf8b..1fc6b76c3 100644
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -93,14 +93,20 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
93void 93void
94test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 94test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
95{ 95{
96 Evas_Object *win, *bx, *bt, *ic, *bxx; 96 Evas_Object *win, *bg, *bx, *bt, *ic, *bxx;
97 char buf[PATH_MAX]; 97 char buf[PATH_MAX];
98 api_data *api = calloc(1, sizeof(api_data)); 98 api_data *api = calloc(1, sizeof(api_data));
99 99
100 win = elm_win_util_standard_add("hoversel", "HoverSel"); 100 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
101 elm_win_title_set(win, "Hoversel");
101 elm_win_autodel_set(win, EINA_TRUE); 102 elm_win_autodel_set(win, EINA_TRUE);
102 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 103 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
103 104
105 bg = elm_bg_add(win);
106 elm_win_resize_object_add(win, bg);
107 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
108 evas_object_show(bg);
109
104 bxx = elm_box_add(win); 110 bxx = elm_box_add(win);
105 elm_win_resize_object_add(win, bxx); 111 elm_win_resize_object_add(win, bxx);
106 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 112 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_icon_desktops.c b/src/bin/test_icon_desktops.c
index aed269a59..d719362fe 100644
--- a/src/bin/test_icon_desktops.c
+++ b/src/bin/test_icon_desktops.c
@@ -59,14 +59,20 @@ desktop_sel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
59void 59void
60test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 60test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
61{ 61{
62 Evas_Object *win, *gl; 62 Evas_Object *win, *bg, *gl;
63#ifdef ELM_EFREET 63#ifdef ELM_EFREET
64 Eina_List *desktops; 64 Eina_List *desktops;
65#endif 65#endif
66 66
67 win = elm_win_util_standard_add("icon-desktops", "Icon Desktops"); 67 win = elm_win_add(NULL, "icon-desktops", ELM_WIN_BASIC);
68 elm_win_title_set(win, "Icon Desktops");
68 elm_win_autodel_set(win, EINA_TRUE); 69 elm_win_autodel_set(win, EINA_TRUE);
69 70
71 bg = elm_bg_add(win);
72 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
73 elm_win_resize_object_add(win, bg);
74 evas_object_show(bg);
75
70 it_desk.item_style = "default"; 76 it_desk.item_style = "default";
71 it_desk.func.text_get = desk_gl_text_get; 77 it_desk.func.text_get = desk_gl_text_get;
72 it_desk.func.content_get = desk_gl_content_get; 78 it_desk.func.content_get = desk_gl_content_get;
diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 0e3928a1e..f369b6a8f 100644
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -162,15 +162,21 @@ id_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
162void 162void
163test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 163test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
164{ 164{
165 Evas_Object *win, *bxx, *gl, *id, *bt; 165 Evas_Object *win, *bg, *bxx, *gl, *id, *bt;
166 Elm_Object_Item *glit; 166 Elm_Object_Item *glit;
167 int i, j; 167 int i, j;
168 api_data *api = calloc(1, sizeof(api_data)); 168 api_data *api = calloc(1, sizeof(api_data));
169 169
170 win = elm_win_util_standard_add("index", "Index"); 170 win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
171 elm_win_title_set(win, "Index");
171 elm_win_autodel_set(win, EINA_TRUE); 172 elm_win_autodel_set(win, EINA_TRUE);
172 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 173 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
173 174
175 bg = elm_bg_add(win);
176 elm_win_resize_object_add(win, bg);
177 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
178 evas_object_show(bg);
179
174 bxx = elm_box_add(win); 180 bxx = elm_box_add(win);
175 elm_win_resize_object_add(win, bxx); 181 elm_win_resize_object_add(win, bxx);
176 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 182 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -329,15 +335,21 @@ test_index2_id_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void
329void 335void
330test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 336test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
331{ 337{
332 Evas_Object *win, *box, *bt; 338 Evas_Object *win, *bg, *box, *bt;
333 Test_Index2_Elements *gui; 339 Test_Index2_Elements *gui;
334 340
335 gui = malloc(sizeof(*gui)); 341 gui = malloc(sizeof(*gui));
336 342
337 win = elm_win_util_standard_add("sorted-index-list", "Sorted Index and List"); 343 win = elm_win_add(NULL, "sorted-index-list", ELM_WIN_BASIC);
344 elm_win_title_set(win, "Sorted Index and List");
338 evas_object_smart_callback_add(win, "delete,request", test_index2_del, gui); 345 evas_object_smart_callback_add(win, "delete,request", test_index2_del, gui);
339 elm_win_autodel_set(win, EINA_TRUE); 346 elm_win_autodel_set(win, EINA_TRUE);
340 347
348 bg = elm_bg_add(win);
349 elm_win_resize_object_add(win, bg);
350 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
351 evas_object_show(bg);
352
341 box = elm_box_add(win); 353 box = elm_box_add(win);
342 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 354 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
343 elm_win_resize_object_add(win, box); 355 elm_win_resize_object_add(win, box);
diff --git a/src/bin/test_inwin.c b/src/bin/test_inwin.c
index 14ab16849..2558bf5d5 100644
--- a/src/bin/test_inwin.c
+++ b/src/bin/test_inwin.c
@@ -61,13 +61,19 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
61void 61void
62test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 62test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
63{ 63{
64 Evas_Object *win, *inwin, *lb, *bxx, *bt; 64 Evas_Object *win, *bg, *inwin, *lb, *bxx, *bt;
65 api_data *api = calloc(1, sizeof(api_data)); 65 api_data *api = calloc(1, sizeof(api_data));
66 66
67 win = elm_win_util_standard_add("inwin", "InWin"); 67 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
68 elm_win_title_set(win, "Inwin");
68 elm_win_autodel_set(win, EINA_TRUE); 69 elm_win_autodel_set(win, EINA_TRUE);
69 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 70 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
70 71
72 bg = elm_bg_add(win);
73 elm_win_resize_object_add(win, bg);
74 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
75 evas_object_show(bg);
76
71 inwin = elm_win_inwin_add(win); 77 inwin = elm_win_inwin_add(win);
72 api->inwin = inwin; 78 api->inwin = inwin;
73 evas_object_show(inwin); 79 evas_object_show(inwin);
@@ -101,11 +107,17 @@ test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
101void 107void
102test_inwin2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 108test_inwin2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
103{ 109{
104 Evas_Object *win, *inwin, *lb; 110 Evas_Object *win, *bg, *inwin, *lb;
105 111
106 win = elm_win_util_standard_add("inwin2", "InWin 2"); 112 win = elm_win_add(NULL, "inwin2", ELM_WIN_BASIC);
113 elm_win_title_set(win, "Inwin 2");
107 elm_win_autodel_set(win, EINA_TRUE); 114 elm_win_autodel_set(win, EINA_TRUE);
108 115
116 bg = elm_bg_add(win);
117 elm_win_resize_object_add(win, bg);
118 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
119 evas_object_show(bg);
120
109 inwin = elm_win_inwin_add(win); 121 inwin = elm_win_inwin_add(win);
110 elm_object_style_set(inwin, "minimal_vertical"); 122 elm_object_style_set(inwin, "minimal_vertical");
111 evas_object_show(inwin); 123 evas_object_show(inwin);
diff --git a/src/bin/test_label.c b/src/bin/test_label.c
index b21740708..82d28abaf 100644
--- a/src/bin/test_label.c
+++ b/src/bin/test_label.c
@@ -15,11 +15,17 @@ enum _slide_style
15void 15void
16test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 16test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
17{ 17{
18 Evas_Object *win, *bx, *lb; 18 Evas_Object *win, *bg, *bx, *lb;
19 19
20 win = elm_win_util_standard_add("label", "Label"); 20 win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
21 elm_win_title_set(win, "Label");
21 elm_win_autodel_set(win, EINA_TRUE); 22 elm_win_autodel_set(win, EINA_TRUE);
22 23
24 bg = elm_bg_add(win);
25 elm_win_resize_object_add(win, bg);
26 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
27 evas_object_show(bg);
28
23 bx = elm_box_add(win); 29 bx = elm_box_add(win);
24 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 30 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
25 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 31 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c
index 90826cbe8..736a70080 100644
--- a/src/bin/test_layout.c
+++ b/src/bin/test_layout.c
@@ -37,12 +37,18 @@ _clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
37void 37void
38test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 38test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
39{ 39{
40 Evas_Object *win, *box, *ly, *bt; 40 Evas_Object *win, *bg, *box, *ly, *bt;
41 char buf[PATH_MAX]; 41 char buf[PATH_MAX];
42 42
43 win = elm_win_util_standard_add("layout", "Layout"); 43 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
44 elm_win_title_set(win, "Layout");
44 elm_win_autodel_set(win, EINA_TRUE); 45 elm_win_autodel_set(win, EINA_TRUE);
45 46
47 bg = elm_bg_add(win);
48 elm_win_resize_object_add(win, bg);
49 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
50 evas_object_show(bg);
51
46 box = elm_box_add(win); 52 box = elm_box_add(win);
47 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 53 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
48 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); 54 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index d136e8310..df09cb368 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -501,12 +501,18 @@ _zoom_manual(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED_
501static void 501static void
502_track_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 502_track_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
503{ 503{
504 Evas_Object *fs, *vbox, *hbox, *sep; 504 Evas_Object *fs, *bg, *vbox, *hbox, *sep;
505 char *path = NULL; 505 char *path = NULL;
506 506
507 fs_win = elm_win_util_standard_add("fileselector", "File Selector"); 507 fs_win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
508 elm_win_title_set(fs_win, "File Selector");
508 elm_win_autodel_set(fs_win, 1); 509 elm_win_autodel_set(fs_win, 1);
509 510
511 bg = elm_bg_add(fs_win);
512 elm_win_resize_object_add(fs_win, bg);
513 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
514 evas_object_show(bg);
515
510 vbox = elm_box_add(fs_win); 516 vbox = elm_box_add(fs_win);
511 elm_win_resize_object_add(fs_win, vbox); 517 elm_win_resize_object_add(fs_win, vbox);
512 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 518 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -964,15 +970,21 @@ _del_map(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
964void 970void
965test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 971test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
966{ 972{
967 Evas_Object *win, *map; 973 Evas_Object *win, *bg, *map;
968 int idx = 0; 974 int idx = 0;
969 const char **tile_srcs; 975 const char **tile_srcs;
970 const char **route_srcs; 976 const char **route_srcs;
971 const char **name_srcs; 977 const char **name_srcs;
972 978
973 win = elm_win_util_standard_add("map", "Map"); 979 win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
980 elm_win_title_set(win, "Map");
974 elm_win_autodel_set(win, EINA_TRUE); 981 elm_win_autodel_set(win, EINA_TRUE);
975 982
983 bg = elm_bg_add(win);
984 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
985 elm_win_resize_object_add(win, bg);
986 evas_object_show(bg);
987
976 map = elm_map_add(win); 988 map = elm_map_add(win);
977 if (map) 989 if (map)
978 { 990 {
diff --git a/src/bin/test_menu.c b/src/bin/test_menu.c
index cc940d7cf..753f22d71 100644
--- a/src/bin/test_menu.c
+++ b/src/bin/test_menu.c
@@ -4,7 +4,7 @@
4#include <Elementary.h> 4#include <Elementary.h>
5#ifndef ELM_LIB_QUICKLAUNCH 5#ifndef ELM_LIB_QUICKLAUNCH
6 6
7static Evas_Object *menu; 7static Evas_Object *win, *bg, *menu, *rect;
8 8
9static void 9static void
10_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) 10_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
@@ -97,12 +97,17 @@ _populate_1(Evas_Object *obj, Elm_Object_Item *menu_it)
97void 97void
98test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 98test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
99{ 99{
100 Evas_Object *win, *rect;
101 Elm_Object_Item *menu_it; 100 Elm_Object_Item *menu_it;
102 101
103 win = elm_win_util_standard_add("menu", "Menu"); 102 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
103 elm_win_title_set(win, "Menu");
104 elm_win_autodel_set(win, EINA_TRUE); 104 elm_win_autodel_set(win, EINA_TRUE);
105 105
106 bg = elm_bg_add(win);
107 elm_win_resize_object_add(win, bg);
108 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
109 evas_object_show(bg);
110
106 rect = evas_object_rectangle_add(evas_object_evas_get(win)); 111 rect = evas_object_rectangle_add(evas_object_evas_get(win));
107 elm_win_resize_object_add(win, rect); 112 elm_win_resize_object_add(win, rect);
108 evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 113 evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_multibuttonentry.c b/src/bin/test_multibuttonentry.c
index d5d983cc1..d530ae999 100644
--- a/src/bin/test_multibuttonentry.c
+++ b/src/bin/test_multibuttonentry.c
@@ -199,13 +199,19 @@ test_multibuttonentry(void *data __UNUSED__,
199 Evas_Object *obj __UNUSED__, 199 Evas_Object *obj __UNUSED__,
200 void *event_info __UNUSED__) 200 void *event_info __UNUSED__)
201{ 201{
202 Evas_Object *win, *sc, *bx; 202 Evas_Object *win, *bg, *sc, *bx;
203 Evas_Object *ly; 203 Evas_Object *ly;
204 char buf[PATH_MAX]; 204 char buf[PATH_MAX];
205 205
206 win = elm_win_util_standard_add("multibuttonentry", "MultiButtonEntry"); 206 win = elm_win_add(NULL, "Multibuttonentry", ELM_WIN_BASIC);
207 elm_win_title_set(win, "Multibuttonentry");
207 elm_win_autodel_set(win, EINA_TRUE); 208 elm_win_autodel_set(win, EINA_TRUE);
208 209
210 bg = elm_bg_add(win);
211 elm_win_resize_object_add(win, bg);
212 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
213 evas_object_show(bg);
214
209 ly = elm_layout_add(win); 215 ly = elm_layout_add(win);
210 snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get()); 216 snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get());
211 elm_layout_file_set(ly, buf, "multibuttonentry_test"); 217 elm_layout_file_set(ly, buf, "multibuttonentry_test");
diff --git a/src/bin/test_notify.c b/src/bin/test_notify.c
index dcb387adc..16cbc6433 100644
--- a/src/bin/test_notify.c
+++ b/src/bin/test_notify.c
@@ -40,11 +40,17 @@ _notify_block(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
40void 40void
41test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 41test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
42{ 42{
43 Evas_Object *win, *bx, *tb, *notify, *bt, *lb; 43 Evas_Object *win, *bg, *bx, *tb, *notify, *bt, *lb;
44 44
45 win = elm_win_util_standard_add("notify", "Notify"); 45 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
46 elm_win_title_set(win, "Notify");
46 elm_win_autodel_set(win, EINA_TRUE); 47 elm_win_autodel_set(win, EINA_TRUE);
47 48
49 bg = elm_bg_add(win);
50 elm_win_resize_object_add(win, bg);
51 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
52 evas_object_show(bg);
53
48 tb = elm_table_add(win); 54 tb = elm_table_add(win);
49 elm_win_resize_object_add(win, tb); 55 elm_win_resize_object_add(win, tb);
50 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 56 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c
index ee88b8c1a..4e47e4ca4 100644
--- a/src/bin/test_panel.c
+++ b/src/bin/test_panel.c
@@ -154,12 +154,18 @@ _dir_has_subs(const char *path)
154void 154void
155test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 155test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
156{ 156{
157 Evas_Object *win, *panel, *bx, *vbx, *toolbar; 157 Evas_Object *win, *bg, *panel, *bx, *vbx, *toolbar;
158 Evas_Object *list; 158 Evas_Object *list;
159 159
160 win = elm_win_util_standard_add("panel", "Panel"); 160 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
161 elm_win_title_set(win, "Panel");
161 elm_win_autodel_set(win, EINA_TRUE); 162 elm_win_autodel_set(win, EINA_TRUE);
162 163
164 bg = elm_bg_add(win);
165 elm_win_resize_object_add(win, bg);
166 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
167 evas_object_show(bg);
168
163 vbx = elm_box_add(win); 169 vbx = elm_box_add(win);
164 elm_win_resize_object_add(win, vbx); 170 elm_win_resize_object_add(win, vbx);
165 evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 171 evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c
index bf8d091ea..ec95bc614 100644
--- a/src/bin/test_panes.c
+++ b/src/bin/test_panes.c
@@ -49,8 +49,8 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
49 elm_win_autodel_set(win, EINA_TRUE); 49 elm_win_autodel_set(win, EINA_TRUE);
50 50
51 bg = elm_bg_add(win); 51 bg = elm_bg_add(win);
52 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
53 elm_win_resize_object_add(win, bg); 52 elm_win_resize_object_add(win, bg);
53 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
54 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 54 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
55 evas_object_show(bg); 55 evas_object_show(bg);
56 56
diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c
index 5346b2e31..5276737d0 100644
--- a/src/bin/test_photo.c
+++ b/src/bin/test_photo.c
@@ -11,7 +11,7 @@ static void drag_start_cb(void *mydata, Evas_Object *obj, void *evdata);
11void 11void
12test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 12test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
13{ 13{
14 Evas_Object *win, *sc, *tb, *ph; 14 Evas_Object *win, *bg, *sc, *tb, *ph;
15 int i, j, n; 15 int i, j, n;
16 char buf[PATH_MAX]; 16 char buf[PATH_MAX];
17 const char *img[9] = 17 const char *img[9] =
@@ -29,9 +29,15 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
29 29
30 elm_need_ethumb(); 30 elm_need_ethumb();
31 31
32 win = elm_win_util_standard_add("photo", "Photo"); 32 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
33 elm_win_title_set(win, "Photo");
33 elm_win_autodel_set(win, EINA_TRUE); 34 elm_win_autodel_set(win, EINA_TRUE);
34 35
36 bg = elm_bg_add(win);
37 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
38 elm_win_resize_object_add(win, bg);
39 evas_object_show(bg);
40
35 tb = elm_table_add(win); 41 tb = elm_table_add(win);
36 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 42 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
37 43
diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c
index 75431eee1..c431a4f0f 100644
--- a/src/bin/test_photocam.c
+++ b/src/bin/test_photocam.c
@@ -222,7 +222,7 @@ _photocam_move_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
222void 222void
223test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 223test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
224{ 224{
225 Evas_Object *win, *ph, *tb2, *bt, *box; 225 Evas_Object *win, *bg, *ph, *tb2, *bt, *box;
226 // these were just testing - use the "select photo" browser to select one 226 // these were just testing - use the "select photo" browser to select one
227 const char *img[5] = 227 const char *img[5] =
228 { 228 {
@@ -233,9 +233,15 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
233 "/home/raster/t5.jpg" // 466 mpixel 233 "/home/raster/t5.jpg" // 466 mpixel
234 }; 234 };
235 235
236 win = elm_win_util_standard_add("photocam", "PhotoCam"); 236 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
237 elm_win_title_set(win, "Photocam");
237 elm_win_autodel_set(win, EINA_TRUE); 238 elm_win_autodel_set(win, EINA_TRUE);
238 239
240 bg = elm_bg_add(win);
241 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
242 elm_win_resize_object_add(win, bg);
243 evas_object_show(bg);
244
239 ph = elm_photocam_add(win); 245 ph = elm_photocam_add(win);
240 evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 246 evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
241 elm_win_resize_object_add(win, ph); 247 elm_win_resize_object_add(win, ph);
diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c
index 54ee314a9..b4effe714 100644
--- a/src/bin/test_popup.c
+++ b/src/bin/test_popup.c
@@ -271,11 +271,17 @@ void
271test_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 271test_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
272 void *event_info __UNUSED__) 272 void *event_info __UNUSED__)
273{ 273{
274 Evas_Object *win, *list; 274 Evas_Object *win, *bg, *list;
275 275
276 win = elm_win_util_standard_add("popup", "Popup"); 276 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
277 elm_win_title_set(win, "popup");
277 elm_win_autodel_set(win, EINA_TRUE); 278 elm_win_autodel_set(win, EINA_TRUE);
278 279
280 bg = elm_bg_add(win);
281 elm_win_resize_object_add(win, bg);
282 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
283 evas_object_show(bg);
284
279 list = elm_list_add(win); 285 list = elm_list_add(win);
280 elm_win_resize_object_add(win, list); 286 elm_win_resize_object_add(win, list);
281 elm_list_mode_set(list, ELM_LIST_LIMIT); 287 elm_list_mode_set(list, ELM_LIST_LIMIT);
diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index 6eed552a3..f459ff1f4 100644
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -71,13 +71,19 @@ my_progressbar_destroy(void *data __UNUSED__, Evas_Object *obj, void *event_info
71void 71void
72test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 72test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
73{ 73{
74 Evas_Object *win, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2; 74 Evas_Object *win, *bg, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2;
75 char buf[PATH_MAX]; 75 char buf[PATH_MAX];
76 76
77 win = elm_win_util_standard_add("progressbar", "Progressbar"); 77 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
78 elm_win_title_set(win, "Progressbar");
78 evas_object_smart_callback_add(win, "delete,request", 79 evas_object_smart_callback_add(win, "delete,request",
79 my_progressbar_destroy, NULL); 80 my_progressbar_destroy, NULL);
80 81
82 bg = elm_bg_add(win);
83 elm_win_resize_object_add(win, bg);
84 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
85 evas_object_show(bg);
86
81 bx = elm_box_add(win); 87 bx = elm_box_add(win);
82 elm_win_resize_object_add(win, bx); 88 elm_win_resize_object_add(win, bx);
83 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 89 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c
index 1c822eabd..67c61d0a9 100644
--- a/src/bin/test_radio.c
+++ b/src/bin/test_radio.c
@@ -6,12 +6,18 @@
6void 6void
7test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bx, *ic, *rd, *rdg; 9 Evas_Object *win, *bg, *bx, *ic, *rd, *rdg;
10 char buf[PATH_MAX]; 10 char buf[PATH_MAX];
11 11
12 win = elm_win_util_standard_add("radios", "Radios"); 12 win = elm_win_add(NULL, "radios", ELM_WIN_BASIC);
13 elm_win_title_set(win, "Radios");
13 elm_win_autodel_set(win, EINA_TRUE); 14 elm_win_autodel_set(win, EINA_TRUE);
14 15
16 bg = elm_bg_add(win);
17 elm_win_resize_object_add(win, bg);
18 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
19 evas_object_show(bg);
20
15 bx = elm_box_add(win); 21 bx = elm_box_add(win);
16 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 22 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
17 elm_win_resize_object_add(win, bx); 23 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index 9e5f26e6b..494f91d4c 100644
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -6,11 +6,17 @@
6void 6void
7test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bx, *bt; 9 Evas_Object *win, *bg, *bx, *bt;
10 10
11 win = elm_win_util_standard_add("scaling", "Scaling"); 11 win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC);
12 elm_win_title_set(win, "Scaling");
12 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
13 14
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
14 bx = elm_box_add(win); 20 bx = elm_box_add(win);
15 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 21 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
16 elm_win_resize_object_add(win, bx); 22 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 295bd6d2e..a838e261a 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -30,7 +30,7 @@ my_bt_go_900_900(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
30void 30void
31test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 31test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
32{ 32{
33 Evas_Object *win, *bg2, *tb, *tb2, *sc, *bt; 33 Evas_Object *win, *bg2, *tb, *tb2, *bg, *sc, *bt;
34 int i, j, n; 34 int i, j, n;
35 char buf[PATH_MAX]; 35 char buf[PATH_MAX];
36 const char *img[9] = 36 const char *img[9] =
@@ -46,9 +46,15 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
46 "wood_01.jpg" 46 "wood_01.jpg"
47 }; 47 };
48 48
49 win = elm_win_util_standard_add("scroller", "Scroller"); 49 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
50 elm_win_title_set(win, "Scroller");
50 elm_win_autodel_set(win, EINA_TRUE); 51 elm_win_autodel_set(win, EINA_TRUE);
51 52
53 bg = elm_bg_add(win);
54 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 elm_win_resize_object_add(win, bg);
56 evas_object_show(bg);
57
52 tb = elm_table_add(win); 58 tb = elm_table_add(win);
53 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 59 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
54 60
@@ -132,12 +138,18 @@ click_through(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED
132void 138void
133test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 139test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
134{ 140{
135 Evas_Object *win, *bt, *bx, *bx2, *sc, *tb, *tb2, *rc; 141 Evas_Object *win, *bt, *bx, *bx2, *bg, *sc, *tb, *tb2, *rc;
136 int i, j; 142 int i, j;
137 143
138 win = elm_win_util_standard_add("scroller2", "Scroller 2"); 144 win = elm_win_add(NULL, "scroller2", ELM_WIN_BASIC);
145 elm_win_title_set(win, "Scroller 2");
139 elm_win_autodel_set(win, EINA_TRUE); 146 elm_win_autodel_set(win, EINA_TRUE);
140 147
148 bg = elm_bg_add(win);
149 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
150 elm_win_resize_object_add(win, bg);
151 evas_object_show(bg);
152
141 bx = elm_box_add(win); 153 bx = elm_box_add(win);
142 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0); 154 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0);
143 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0); 155 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);
diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c
index 48ae35b0f..ea84de1f0 100644
--- a/src/bin/test_segment_control.c
+++ b/src/bin/test_segment_control.c
@@ -7,7 +7,7 @@
7void 7void
8test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 8test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
9{ 9{
10 Evas_Object *win, *ic, *ic1, *ic2, *ic3, *ic4, *ic5; 10 Evas_Object *win, *bg, *ic, *ic1, *ic2, *ic3, *ic4, *ic5;
11 Elm_Object_Item *seg_it; 11 Elm_Object_Item *seg_it;
12 12
13 Evas_Object * in_layout; 13 Evas_Object * in_layout;
@@ -20,9 +20,15 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
20 char buf5[PATH_MAX]; 20 char buf5[PATH_MAX];
21 char buf6[PATH_MAX]; 21 char buf6[PATH_MAX];
22 22
23 win = elm_win_util_standard_add("segmentcontrol", "Segment Control"); 23 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
24 elm_win_title_set(win, "Segment Control");
24 elm_win_autodel_set(win, EINA_TRUE); 25 elm_win_autodel_set(win, EINA_TRUE);
25 26
27 bg = elm_bg_add(win);
28 elm_win_resize_object_add(win, bg);
29 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
30 evas_object_show(bg);
31
26 in_layout = elm_layout_add( win ); 32 in_layout = elm_layout_add( win );
27 elm_win_resize_object_add(win, in_layout); 33 elm_win_resize_object_add(win, in_layout);
28 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 34 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
diff --git a/src/bin/test_separator.c b/src/bin/test_separator.c
index 8c1959c08..da00f059d 100644
--- a/src/bin/test_separator.c
+++ b/src/bin/test_separator.c
@@ -6,11 +6,17 @@
6void 6void
7test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bx0, *bx, *bt, *sp; 9 Evas_Object *win, *bg, *bx0, *bx, *bt, *sp;
10 10
11 win = elm_win_util_standard_add("separators", "Separators"); 11 win = elm_win_add(NULL, "separators", ELM_WIN_BASIC);
12 elm_win_title_set(win, "Separators");
12 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
13 14
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
14 bx0 = elm_box_add(win); 20 bx0 = elm_box_add(win);
15 evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 21 evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
16 elm_box_horizontal_set(bx0, EINA_TRUE); 22 elm_box_horizontal_set(bx0, EINA_TRUE);
diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c
index c10e93caa..c4197ba39 100644
--- a/src/bin/test_slider.c
+++ b/src/bin/test_slider.c
@@ -14,12 +14,18 @@ _change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
14void 14void
15test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 15test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
16{ 16{
17 Evas_Object *win, *bx, *sl, *ic, *sl1, *bx2; 17 Evas_Object *win, *bg, *bx, *sl, *ic, *sl1, *bx2;
18 char buf[PATH_MAX]; 18 char buf[PATH_MAX];
19 19
20 win = elm_win_util_standard_add("slider", "Slider"); 20 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
21 elm_win_title_set(win, "Slider");
21 elm_win_autodel_set(win, EINA_TRUE); 22 elm_win_autodel_set(win, EINA_TRUE);
22 23
24 bg = elm_bg_add(win);
25 elm_win_resize_object_add(win, bg);
26 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
27 evas_object_show(bg);
28
23 bx = elm_box_add(win); 29 bx = elm_box_add(win);
24 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 30 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
25 elm_win_resize_object_add(win, bx); 31 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index 85ae3405c..9c96e88a9 100644
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -110,14 +110,20 @@ _slide_transition(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
110void 110void
111test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 111test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
112{ 112{
113 Evas_Object *win, *notify, *bx, *bt, *hv, *spin; 113 Evas_Object *win, *bg, *notify, *bx, *bt, *hv, *spin;
114 const Eina_List *l; 114 const Eina_List *l;
115 const char *transition, *layout; 115 const char *transition, *layout;
116 Elm_Object_Item *slide_last_it; 116 Elm_Object_Item *slide_last_it;
117 117
118 win = elm_win_util_standard_add("slideshow", "Slideshow"); 118 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
119 elm_win_title_set(win, "Slideshow");
119 elm_win_autodel_set(win, EINA_TRUE); 120 elm_win_autodel_set(win, EINA_TRUE);
120 121
122 bg = elm_bg_add(win);
123 elm_win_resize_object_add(win, bg);
124 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
125 evas_object_show(bg);
126
121 slideshow = elm_slideshow_add(win); 127 slideshow = elm_slideshow_add(win);
122 elm_slideshow_loop_set(slideshow, EINA_TRUE); 128 elm_slideshow_loop_set(slideshow, EINA_TRUE);
123 elm_win_resize_object_add(win, slideshow); 129 elm_win_resize_object_add(win, slideshow);
diff --git a/src/bin/test_spinner.c b/src/bin/test_spinner.c
index 17e743a0d..e6bc1e7b7 100644
--- a/src/bin/test_spinner.c
+++ b/src/bin/test_spinner.c
@@ -6,11 +6,17 @@
6void 6void
7test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bx, *sp; 9 Evas_Object *win, *bg, *bx, *sp;
10 10
11 win = elm_win_util_standard_add("spinner", "Spinner"); 11 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
12 elm_win_title_set(win, "Spinner");
12 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
13 14
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
14 bx = elm_box_add(win); 20 bx = elm_box_add(win);
15 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 21 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
16 elm_win_resize_object_add(win, bx); 22 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_store.c b/src/bin/test_store.c
index 38e04c589..3c7bd73c6 100644
--- a/src/bin/test_store.c
+++ b/src/bin/test_store.c
@@ -228,12 +228,19 @@ _st_store_unfetch(void *data __UNUSED__, Elm_Store_Item *sti)
228void 228void
229test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 229test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
230{ 230{
231 Evas_Object *win, *gl, *bx; 231 Evas_Object *win, *bg, *gl, *bx;
232
232 Elm_Store *st; 233 Elm_Store *st;
233 234
234 win = elm_win_util_standard_add("store", "Store"); 235 win = elm_win_add(NULL, "store", ELM_WIN_BASIC);
236 elm_win_title_set(win, "Store");
235 elm_win_autodel_set(win, EINA_TRUE); 237 elm_win_autodel_set(win, EINA_TRUE);
236 238
239 bg = elm_bg_add(win);
240 elm_win_resize_object_add(win, bg);
241 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
242 evas_object_show(bg);
243
237 bx = elm_box_add(win); 244 bx = elm_box_add(win);
238 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 245 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
239 elm_win_resize_object_add(win, bx); 246 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_table.c b/src/bin/test_table.c
index 4f406087e..4c19c8244 100644
--- a/src/bin/test_table.c
+++ b/src/bin/test_table.c
@@ -6,11 +6,17 @@
6void 6void
7test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *tb, *bt; 9 Evas_Object *win, *bg, *tb, *bt;
10 10
11 win = elm_win_util_standard_add("table", "Table"); 11 win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
12 elm_win_title_set(win, "Table");
12 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
13 14
15 bg = elm_bg_add(win);
16 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
17 elm_win_resize_object_add(win, bg);
18 evas_object_show(bg);
19
14 tb = elm_table_add(win); 20 tb = elm_table_add(win);
15 elm_win_resize_object_add(win, tb); 21 elm_win_resize_object_add(win, tb);
16 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 22 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -64,11 +70,17 @@ test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
64void 70void
65test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 71test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
66{ 72{
67 Evas_Object *win, *tb, *bt; 73 Evas_Object *win, *bg, *tb, *bt;
68 74
69 win = elm_win_util_standard_add("table2", "Table Homogeneous"); 75 win = elm_win_add(NULL, "table2", ELM_WIN_BASIC);
76 elm_win_title_set(win, "Table Homogeneous");
70 elm_win_autodel_set(win, EINA_TRUE); 77 elm_win_autodel_set(win, EINA_TRUE);
71 78
79 bg = elm_bg_add(win);
80 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
81 elm_win_resize_object_add(win, bg);
82 evas_object_show(bg);
83
72 tb = elm_table_add(win); 84 tb = elm_table_add(win);
73 elm_table_homogeneous_set(tb, EINA_TRUE); 85 elm_table_homogeneous_set(tb, EINA_TRUE);
74 elm_win_resize_object_add(win, tb); 86 elm_win_resize_object_add(win, tb);
@@ -134,11 +146,17 @@ my_tb_ch(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
134void 146void
135test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 147test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
136{ 148{
137 Evas_Object *win, *tb, *bt; 149 Evas_Object *win, *bg, *tb, *bt;
138 150
139 win = elm_win_util_standard_add("table3", "Table 3"); 151 win = elm_win_add(NULL, "table3", ELM_WIN_BASIC);
152 elm_win_title_set(win, "Table 3");
140 elm_win_autodel_set(win, EINA_TRUE); 153 elm_win_autodel_set(win, EINA_TRUE);
141 154
155 bg = elm_bg_add(win);
156 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
157 elm_win_resize_object_add(win, bg);
158 evas_object_show(bg);
159
142 tb = elm_table_add(win); 160 tb = elm_table_add(win);
143 elm_win_resize_object_add(win, tb); 161 elm_win_resize_object_add(win, tb);
144 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 162 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -178,11 +196,17 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
178void 196void
179test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 197test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
180{ 198{
181 Evas_Object *win, *tb, *bt; 199 Evas_Object *win, *bg, *tb, *bt;
182 200
183 win = elm_win_util_standard_add("table4", "Table 4"); 201 win = elm_win_add(NULL, "table4", ELM_WIN_BASIC);
202 elm_win_title_set(win, "Table 4");
184 elm_win_autodel_set(win, EINA_TRUE); 203 elm_win_autodel_set(win, EINA_TRUE);
185 204
205 bg = elm_bg_add(win);
206 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
207 elm_win_resize_object_add(win, bg);
208 evas_object_show(bg);
209
186 tb = elm_table_add(win); 210 tb = elm_table_add(win);
187 elm_win_resize_object_add(win, tb); 211 elm_win_resize_object_add(win, tb);
188 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 212 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -222,11 +246,17 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
222void 246void
223test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 247test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
224{ 248{
225 Evas_Object *win, *tb, *bt; 249 Evas_Object *win, *bg, *tb, *bt;
226 250
227 win = elm_win_util_standard_add("table5", "Table 5"); 251 win = elm_win_add(NULL, "table5", ELM_WIN_BASIC);
252 elm_win_title_set(win, "Table 5");
228 elm_win_autodel_set(win, EINA_TRUE); 253 elm_win_autodel_set(win, EINA_TRUE);
229 254
255 bg = elm_bg_add(win);
256 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
257 elm_win_resize_object_add(win, bg);
258 evas_object_show(bg);
259
230 tb = elm_table_add(win); 260 tb = elm_table_add(win);
231 elm_table_homogeneous_set(tb, EINA_TRUE); 261 elm_table_homogeneous_set(tb, EINA_TRUE);
232 elm_win_resize_object_add(win, tb); 262 elm_win_resize_object_add(win, tb);
@@ -274,11 +304,17 @@ test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
274void 304void
275test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 305test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
276{ 306{
277 Evas_Object *win, *tb, *bt; 307 Evas_Object *win, *bg, *tb, *bt;
278 308
279 win = elm_win_util_standard_add("table6", "Table 6"); 309 win = elm_win_add(NULL, "table6", ELM_WIN_BASIC);
310 elm_win_title_set(win, "Table 6");
280 elm_win_autodel_set(win, EINA_TRUE); 311 elm_win_autodel_set(win, EINA_TRUE);
281 312
313 bg = elm_bg_add(win);
314 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
315 elm_win_resize_object_add(win, bg);
316 evas_object_show(bg);
317
282 tb = elm_table_add(win); 318 tb = elm_table_add(win);
283 elm_table_homogeneous_set(tb, EINA_TRUE); 319 elm_table_homogeneous_set(tb, EINA_TRUE);
284 elm_win_resize_object_add(win, tb); 320 elm_win_resize_object_add(win, tb);
@@ -333,11 +369,17 @@ test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
333void 369void
334test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 370test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
335{ 371{
336 Evas_Object *win, *tb, *bt; 372 Evas_Object *win, *bg, *tb, *bt;
337 373
338 win = elm_win_util_standard_add("table7", "Table 7"); 374 win = elm_win_add(NULL, "table7", ELM_WIN_BASIC);
375 elm_win_title_set(win, "Table 7");
339 elm_win_autodel_set(win, EINA_TRUE); 376 elm_win_autodel_set(win, EINA_TRUE);
340 377
378 bg = elm_bg_add(win);
379 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
380 elm_win_resize_object_add(win, bg);
381 evas_object_show(bg);
382
341 tb = elm_table_add(win); 383 tb = elm_table_add(win);
342 elm_table_padding_set(tb, 10, 20); 384 elm_table_padding_set(tb, 10, 20);
343 elm_win_resize_object_add(win, tb); 385 elm_win_resize_object_add(win, tb);
diff --git a/src/bin/test_thumb.c b/src/bin/test_thumb.c
index 5a6c04a0a..6f68d18a4 100644
--- a/src/bin/test_thumb.c
+++ b/src/bin/test_thumb.c
@@ -6,7 +6,7 @@
6void 6void
7test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *sc, *tb, *th; 9 Evas_Object *win, *bg, *sc, *tb, *th;
10 int i, j, n; 10 int i, j, n;
11 char buf[PATH_MAX]; 11 char buf[PATH_MAX];
12 const char *img[11] = 12 const char *img[11] =
@@ -26,9 +26,15 @@ test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
26 26
27 elm_need_ethumb(); 27 elm_need_ethumb();
28 28
29 win = elm_win_util_standard_add("thumb", "Thumb"); 29 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
30 elm_win_title_set(win, "Thumb");
30 elm_win_autodel_set(win, EINA_TRUE); 31 elm_win_autodel_set(win, EINA_TRUE);
31 32
33 bg = elm_bg_add(win);
34 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
35 elm_win_resize_object_add(win, bg);
36 evas_object_show(bg);
37
32 tb = elm_table_add(win); 38 tb = elm_table_add(win);
33 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 39 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
34 40
diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c
index e9ffdd1d5..ecfbd19cb 100644
--- a/src/bin/test_toolbar.c
+++ b/src/bin/test_toolbar.c
@@ -64,15 +64,21 @@ tb_5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
64void 64void
65test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 65test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
66{ 66{
67 Evas_Object *win, *bx, *tb, *ph, *menu; 67 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
68 Evas_Object *ph1, *ph2, *ph3, *ph4; 68 Evas_Object *ph1, *ph2, *ph3, *ph4;
69 Elm_Object_Item *tb_it; 69 Elm_Object_Item *tb_it;
70 Elm_Object_Item *menu_it; 70 Elm_Object_Item *menu_it;
71 char buf[PATH_MAX]; 71 char buf[PATH_MAX];
72 72
73 win = elm_win_util_standard_add("toolbar", "Toolbar"); 73 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
74 elm_win_title_set(win, "Toolbar 7");
74 elm_win_autodel_set(win, EINA_TRUE); 75 elm_win_autodel_set(win, EINA_TRUE);
75 76
77 bg = elm_bg_add(win);
78 elm_win_resize_object_add(win, bg);
79 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
80 evas_object_show(bg);
81
76 bx = elm_box_add(win); 82 bx = elm_box_add(win);
77 elm_win_resize_object_add(win, bx); 83 elm_win_resize_object_add(win, bx);
78 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 84 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -168,15 +174,21 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
168void 174void
169test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 175test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
170{ 176{
171 Evas_Object *win, *bx, *tb, *ph, *menu; 177 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
172 Evas_Object *ph1, *ph2, *ph3, *ph4; 178 Evas_Object *ph1, *ph2, *ph3, *ph4;
173 Elm_Object_Item *item; 179 Elm_Object_Item *item;
174 Elm_Object_Item *menu_it; 180 Elm_Object_Item *menu_it;
175 char buf[PATH_MAX]; 181 char buf[PATH_MAX];
176 182
177 win = elm_win_util_standard_add("toolbar2", "Toolbar 2"); 183 win = elm_win_add(NULL, "toolbar2", ELM_WIN_BASIC);
184 elm_win_title_set(win, "Toolbar 2");
178 elm_win_autodel_set(win, EINA_TRUE); 185 elm_win_autodel_set(win, EINA_TRUE);
179 186
187 bg = elm_bg_add(win);
188 elm_win_resize_object_add(win, bg);
189 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
190 evas_object_show(bg);
191
180 bx = elm_box_add(win); 192 bx = elm_box_add(win);
181 elm_win_resize_object_add(win, bx); 193 elm_win_resize_object_add(win, bx);
182 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 194 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -272,15 +284,21 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
272void 284void
273test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 285test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
274{ 286{
275 Evas_Object *win, *bx, *tb, *ph, *menu; 287 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
276 Evas_Object *ph1, *ph2, *ph3, *ph4; 288 Evas_Object *ph1, *ph2, *ph3, *ph4;
277 Elm_Object_Item *tb_it; 289 Elm_Object_Item *tb_it;
278 Elm_Object_Item *menu_it; 290 Elm_Object_Item *menu_it;
279 char buf[PATH_MAX]; 291 char buf[PATH_MAX];
280 292
281 win = elm_win_util_standard_add("toolbar3", "Toolbar 3"); 293 win = elm_win_add(NULL, "toolbar3", ELM_WIN_BASIC);
294 elm_win_title_set(win, "Toolbar 3");
282 elm_win_autodel_set(win, EINA_TRUE); 295 elm_win_autodel_set(win, EINA_TRUE);
283 296
297 bg = elm_bg_add(win);
298 elm_win_resize_object_add(win, bg);
299 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
300 evas_object_show(bg);
301
284 bx = elm_box_add(win); 302 bx = elm_box_add(win);
285 elm_win_resize_object_add(win, bx); 303 elm_win_resize_object_add(win, bx);
286 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 304 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -376,15 +394,21 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
376void 394void
377test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 395test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
378{ 396{
379 Evas_Object *win, *bx, *tb, *ph, *menu; 397 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
380 Evas_Object *ph1, *ph2, *ph3, *ph4; 398 Evas_Object *ph1, *ph2, *ph3, *ph4;
381 Elm_Object_Item *tb_it; 399 Elm_Object_Item *tb_it;
382 Elm_Object_Item *menu_it; 400 Elm_Object_Item *menu_it;
383 char buf[PATH_MAX]; 401 char buf[PATH_MAX];
384 402
385 win = elm_win_util_standard_add("toolbar4", "Toolbar 4"); 403 win = elm_win_add(NULL, "toolbar4", ELM_WIN_BASIC);
404 elm_win_title_set(win, "Toolbar 4");
386 elm_win_autodel_set(win, EINA_TRUE); 405 elm_win_autodel_set(win, EINA_TRUE);
387 406
407 bg = elm_bg_add(win);
408 elm_win_resize_object_add(win, bg);
409 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
410 evas_object_show(bg);
411
388 bx = elm_box_add(win); 412 bx = elm_box_add(win);
389 elm_win_resize_object_add(win, bx); 413 elm_win_resize_object_add(win, bx);
390 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 414 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -480,15 +504,21 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
480void 504void
481test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 505test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
482{ 506{
483 Evas_Object *win, *bx, *tb, *ph, *menu; 507 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
484 Evas_Object *ph1, *ph2, *ph3, *ph4; 508 Evas_Object *ph1, *ph2, *ph3, *ph4;
485 Elm_Object_Item *tb_it; 509 Elm_Object_Item *tb_it;
486 Elm_Object_Item *menu_it; 510 Elm_Object_Item *menu_it;
487 char buf[PATH_MAX]; 511 char buf[PATH_MAX];
488 512
489 win = elm_win_util_standard_add("toolbar5", "Toolbar 5"); 513 win = elm_win_add(NULL, "toolbar5", ELM_WIN_BASIC);
514 elm_win_title_set(win, "Toolbar 5");
490 elm_win_autodel_set(win, EINA_TRUE); 515 elm_win_autodel_set(win, EINA_TRUE);
491 516
517 bg = elm_bg_add(win);
518 elm_win_resize_object_add(win, bg);
519 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
520 evas_object_show(bg);
521
492 bx = elm_box_add(win); 522 bx = elm_box_add(win);
493 elm_win_resize_object_add(win, bx); 523 elm_win_resize_object_add(win, bx);
494 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 524 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -588,15 +618,21 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
588void 618void
589test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 619test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
590{ 620{
591 Evas_Object *win, *bx, *tb, *ph, *menu; 621 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
592 Evas_Object *ph1, *ph2, *ph3, *ph4; 622 Evas_Object *ph1, *ph2, *ph3, *ph4;
593 Elm_Object_Item *tb_it; 623 Elm_Object_Item *tb_it;
594 Elm_Object_Item *menu_it; 624 Elm_Object_Item *menu_it;
595 char buf[PATH_MAX]; 625 char buf[PATH_MAX];
596 626
597 win = elm_win_util_standard_add("toolbar6", "Toolbar 6"); 627 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
628 elm_win_title_set(win, "Toolbar");
598 elm_win_autodel_set(win, EINA_TRUE); 629 elm_win_autodel_set(win, EINA_TRUE);
599 630
631 bg = elm_bg_add(win);
632 elm_win_resize_object_add(win, bg);
633 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
634 evas_object_show(bg);
635
600 bx = elm_box_add(win); 636 bx = elm_box_add(win);
601 elm_win_resize_object_add(win, bx); 637 elm_win_resize_object_add(win, bx);
602 elm_box_horizontal_set(bx, EINA_TRUE); 638 elm_box_horizontal_set(bx, EINA_TRUE);
@@ -693,15 +729,21 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
693void 729void
694test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 730test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
695{ 731{
696 Evas_Object *win, *bx, *tb, *ph, *menu; 732 Evas_Object *win, *bg, *bx, *tb, *ph, *menu;
697 Evas_Object *ph1, *ph2, *ph3, *ph4; 733 Evas_Object *ph1, *ph2, *ph3, *ph4;
698 Elm_Object_Item *tb_it; 734 Elm_Object_Item *tb_it;
699 Elm_Object_Item *menu_it; 735 Elm_Object_Item *menu_it;
700 char buf[PATH_MAX]; 736 char buf[PATH_MAX];
701 737
702 win = elm_win_util_standard_add("toolbar7", "Toolbar 7"); 738 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
739 elm_win_title_set(win, "Toolbar");
703 elm_win_autodel_set(win, EINA_TRUE); 740 elm_win_autodel_set(win, EINA_TRUE);
704 741
742 bg = elm_bg_add(win);
743 elm_win_resize_object_add(win, bg);
744 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
745 evas_object_show(bg);
746
705 bx = elm_box_add(win); 747 bx = elm_box_add(win);
706 elm_win_resize_object_add(win, bx); 748 elm_win_resize_object_add(win, bx);
707 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 749 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -798,15 +840,21 @@ test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
798void 840void
799test_toolbar8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 841test_toolbar8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
800{ 842{
801 Evas_Object *win, *bx, *tb, *ph, *sl, *menu; 843 Evas_Object *win, *bg, *bx, *tb, *ph, *sl, *menu;
802 Evas_Object *ph1, *ph2, *ph3, *ph4; 844 Evas_Object *ph1, *ph2, *ph3, *ph4;
803 Elm_Object_Item *item; 845 Elm_Object_Item *item;
804 Elm_Object_Item *menu_it; 846 Elm_Object_Item *menu_it;
805 char buf[PATH_MAX]; 847 char buf[PATH_MAX];
806 848
807 win = elm_win_util_standard_add("toolbar8", "Toolbar 8"); 849 win = elm_win_add(NULL, "toolbar8", ELM_WIN_BASIC);
850 elm_win_title_set(win, "Toolbar 8");
808 elm_win_autodel_set(win, EINA_TRUE); 851 elm_win_autodel_set(win, EINA_TRUE);
809 852
853 bg = elm_bg_add(win);
854 elm_win_resize_object_add(win, bg);
855 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
856 evas_object_show(bg);
857
810 bx = elm_box_add(win); 858 bx = elm_box_add(win);
811 elm_win_resize_object_add(win, bx); 859 elm_win_resize_object_add(win, bx);
812 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 860 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 7d4cb97a2..1b51e263a 100644
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -371,13 +371,20 @@ test_tooltip(void *data __UNUSED__,
371 Evas_Object *obj __UNUSED__, 371 Evas_Object *obj __UNUSED__,
372 void *event_info __UNUSED__) 372 void *event_info __UNUSED__)
373{ 373{
374 Evas_Object *win, *bx, *tb, *bt, *se, *lst; 374 Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst;
375 Elm_Object_Item *tb_it; 375 Elm_Object_Item *tb_it;
376 Elm_Object_Item *lit; 376 Elm_Object_Item *lit;
377 377
378 win = elm_win_util_standard_add("tooltip", "Tooltip"); 378 win = elm_win_add(NULL, "tooltip", ELM_WIN_BASIC);
379 elm_win_title_set(win, "Tooltip");
379 elm_win_autodel_set(win, EINA_TRUE); 380 elm_win_autodel_set(win, EINA_TRUE);
380 381
382 bg = elm_bg_add(win);
383 elm_win_resize_object_add(win, bg);
384 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
385 EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
381 bx = elm_box_add(win); 388 bx = elm_box_add(win);
382 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 389 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
383 EVAS_HINT_EXPAND); 390 EVAS_HINT_EXPAND);
@@ -510,7 +517,7 @@ test_tooltip2(void *data __UNUSED__,
510 Evas_Object *obj __UNUSED__, 517 Evas_Object *obj __UNUSED__,
511 void *event_info __UNUSED__) 518 void *event_info __UNUSED__)
512{ 519{
513 Evas_Object *win, *bx, *grid, *gl; 520 Evas_Object *win, *bg, *bx, *grid, *gl;
514 Elm_Object_Item *glit1, *glit2, *glit3; 521 Elm_Object_Item *glit1, *glit2, *glit3;
515 static Testitem ti[144]; 522 static Testitem ti[144];
516 int i, n; 523 int i, n;
@@ -528,9 +535,16 @@ test_tooltip2(void *data __UNUSED__,
528 "wood_01.jpg", 535 "wood_01.jpg",
529 }; 536 };
530 537
531 win = elm_win_util_standard_add("tooltip2", "Tooltip 2"); 538 win = elm_win_add(NULL, "tooltip2", ELM_WIN_BASIC);
539 elm_win_title_set(win, "Tooltip 2");
532 elm_win_autodel_set(win, EINA_TRUE); 540 elm_win_autodel_set(win, EINA_TRUE);
533 541
542 bg = elm_bg_add(win);
543 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
544 EVAS_HINT_EXPAND);
545 elm_win_resize_object_add(win, bg);
546 evas_object_show(bg);
547
534 bx = elm_box_add(win); 548 bx = elm_box_add(win);
535 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 549 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
536 EVAS_HINT_EXPAND); 550 EVAS_HINT_EXPAND);
diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index 7596d019c..901d91171 100644
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -236,12 +236,18 @@ _transit_resizable_flip(void *data, Evas_Object *obj, void *event_info __UNUSED_
236void 236void
237test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 237test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
238{ 238{
239 Evas_Object *win, *bx, *bt, *ic; 239 Evas_Object *win, *bg, *bx, *bt, *ic;
240 char buf[PATH_MAX]; 240 char buf[PATH_MAX];
241 241
242 win = elm_win_util_standard_add("transit", "Transit"); 242 win = elm_win_add(NULL, "transit", ELM_WIN_BASIC);
243 elm_win_title_set(win, "Transit");
243 elm_win_autodel_set(win, EINA_TRUE); 244 elm_win_autodel_set(win, EINA_TRUE);
244 245
246 bg = elm_bg_add(win);
247 elm_win_resize_object_add(win, bg);
248 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
249 evas_object_show(bg);
250
245 bx = elm_box_add(win); 251 bx = elm_box_add(win);
246 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 252 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
247 elm_win_resize_object_add(win, bx); 253 elm_win_resize_object_add(win, bx);
@@ -281,11 +287,17 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
281void 287void
282test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 288test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
283{ 289{
284 Evas_Object *win, *bt; 290 Evas_Object *win, *bg, *bt;
285 291
286 win = elm_win_util_standard_add("transit2", "Transit 2"); 292 win = elm_win_add(NULL, "transit2", ELM_WIN_BASIC);
293 elm_win_title_set(win, "Transit 2");
287 elm_win_autodel_set(win, EINA_TRUE); 294 elm_win_autodel_set(win, EINA_TRUE);
288 295
296 bg = elm_bg_add(win);
297 elm_win_resize_object_add(win, bg);
298 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
299 evas_object_show(bg);
300
289 bt = elm_button_add(win); 301 bt = elm_button_add(win);
290 elm_object_text_set(bt, "Resizing Effect"); 302 elm_object_text_set(bt, "Resizing Effect");
291 evas_object_show(bt); 303 evas_object_show(bt);
@@ -301,11 +313,17 @@ test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
301void 313void
302test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 314test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
303{ 315{
304 Evas_Object *win, *bt, *bt2; 316 Evas_Object *win, *bg, *bt, *bt2;
305 317
306 win = elm_win_util_standard_add("transit3", "Transit 3"); 318 win = elm_win_add(NULL, "transit3", ELM_WIN_BASIC);
319 elm_win_title_set(win, "Transit 3");
307 elm_win_autodel_set(win, EINA_TRUE); 320 elm_win_autodel_set(win, EINA_TRUE);
308 321
322 bg = elm_bg_add(win);
323 elm_win_resize_object_add(win, bg);
324 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
325 evas_object_show(bg);
326
309 bt = elm_button_add(win); 327 bt = elm_button_add(win);
310 elm_object_text_set(bt, "Front Button - Flip Effect"); 328 elm_object_text_set(bt, "Front Button - Flip Effect");
311 evas_object_show(bt); 329 evas_object_show(bt);
@@ -328,11 +346,17 @@ test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
328void 346void
329test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 347test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
330{ 348{
331 Evas_Object *win, *bt; 349 Evas_Object *win, *bg, *bt;
332 350
333 win = elm_win_util_standard_add("transit4", "Transit 4"); 351 win = elm_win_add(NULL, "transit4", ELM_WIN_BASIC);
352 elm_win_title_set(win, "Transit 4");
334 elm_win_autodel_set(win, EINA_TRUE); 353 elm_win_autodel_set(win, EINA_TRUE);
335 354
355 bg = elm_bg_add(win);
356 elm_win_resize_object_add(win, bg);
357 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
358 evas_object_show(bg);
359
336 bt = elm_button_add(win); 360 bt = elm_button_add(win);
337 elm_object_text_set(bt, "Zoom Effect"); 361 elm_object_text_set(bt, "Zoom Effect");
338 evas_object_resize(bt, 100, 50); 362 evas_object_resize(bt, 100, 50);
@@ -349,12 +373,18 @@ test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
349void 373void
350test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 374test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
351{ 375{
352 Evas_Object *win, *bt, *bt2, *ic; 376 Evas_Object *win, *bg, *bt, *bt2, *ic;
353 char buf[PATH_MAX]; 377 char buf[PATH_MAX];
354 378
355 win = elm_win_util_standard_add("transit5", "Transit 5"); 379 win = elm_win_add(NULL, "transit5", ELM_WIN_BASIC);
380 elm_win_title_set(win, "Transit 5");
356 elm_win_autodel_set(win, EINA_TRUE); 381 elm_win_autodel_set(win, EINA_TRUE);
357 382
383 bg = elm_bg_add(win);
384 elm_win_resize_object_add(win, bg);
385 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
358 ic = elm_icon_add(win); 388 ic = elm_icon_add(win);
359 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get()); 389 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
360 elm_icon_file_set(ic, buf, NULL); 390 elm_icon_file_set(ic, buf, NULL);
@@ -389,12 +419,18 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
389void 419void
390test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 420test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
391{ 421{
392 Evas_Object *win, *bt, *bt2, *ic; 422 Evas_Object *win, *bg, *bt, *bt2, *ic;
393 char buf[PATH_MAX]; 423 char buf[PATH_MAX];
394 424
395 win = elm_win_util_standard_add("transit6","Transit 6"); 425 win = elm_win_add(NULL, "transit6", ELM_WIN_BASIC);
426 elm_win_title_set(win, "Transit 6");
396 elm_win_autodel_set(win, EINA_TRUE); 427 elm_win_autodel_set(win, EINA_TRUE);
397 428
429 bg = elm_bg_add(win);
430 elm_win_resize_object_add(win, bg);
431 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
432 evas_object_show(bg);
433
398 ic = elm_icon_add(win); 434 ic = elm_icon_add(win);
399 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get()); 435 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
400 elm_icon_file_set(ic, buf, NULL); 436 elm_icon_file_set(ic, buf, NULL);
@@ -429,11 +465,17 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
429void 465void
430test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 466test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
431{ 467{
432 Evas_Object *win, *bt, *bt2; 468 Evas_Object *win, *bg, *bt, *bt2;
433 469
434 win = elm_win_util_standard_add("transit7", "Transit 7"); 470 win = elm_win_add(NULL, "transit7", ELM_WIN_BASIC);
471 elm_win_title_set(win, "Transit 7");
435 elm_win_autodel_set(win, EINA_TRUE); 472 elm_win_autodel_set(win, EINA_TRUE);
436 473
474 bg = elm_bg_add(win);
475 elm_win_resize_object_add(win, bg);
476 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
477 evas_object_show(bg);
478
437 bt = elm_button_add(win); 479 bt = elm_button_add(win);
438 elm_object_text_set(bt, "Front Button - Resizable Flip Effect"); 480 elm_object_text_set(bt, "Front Button - Resizable Flip Effect");
439 evas_object_show(bt); 481 evas_object_show(bt);
@@ -456,13 +498,19 @@ test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
456void 498void
457test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 499test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
458{ 500{
459 Evas_Object *win, *bt; 501 Evas_Object *win, *bg, *bt;
460 Elm_Transit *trans; 502 Elm_Transit *trans;
461 Elm_Transit_Effect *effect_context; 503 Elm_Transit_Effect *effect_context;
462 504
463 win = elm_win_util_standard_add("transit8", "Transit 8"); 505 win = elm_win_add(NULL, "transit8", ELM_WIN_BASIC);
506 elm_win_title_set(win, "Transit 8");
464 elm_win_autodel_set(win, EINA_TRUE); 507 elm_win_autodel_set(win, EINA_TRUE);
465 508
509 bg = elm_bg_add(win);
510 elm_win_resize_object_add(win, bg);
511 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
512 evas_object_show(bg);
513
466 bt = elm_button_add(win); 514 bt = elm_button_add(win);
467 elm_object_text_set(bt, "Button - Custom Effect"); 515 elm_object_text_set(bt, "Button - Custom Effect");
468 evas_object_show(bt); 516 evas_object_show(bt);
@@ -490,12 +538,18 @@ test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
490void 538void
491test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 539test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
492{ 540{
493 Evas_Object *win, *bt, *bt2, *bt3, *bt4; 541 Evas_Object *win, *bg, *bt, *bt2, *bt3, *bt4;
494 Elm_Transit *trans, *trans2, *trans3, *trans4; 542 Elm_Transit *trans, *trans2, *trans3, *trans4;
495 543
496 win = elm_win_util_standard_add("transit9", "Transit 9"); 544 win = elm_win_add(NULL, "transit9", ELM_WIN_BASIC);
545 elm_win_title_set(win, "Transit 9");
497 elm_win_autodel_set(win, EINA_TRUE); 546 elm_win_autodel_set(win, EINA_TRUE);
498 547
548 bg = elm_bg_add(win);
549 elm_win_resize_object_add(win, bg);
550 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
551 evas_object_show(bg);
552
499 bt = elm_button_add(win); 553 bt = elm_button_add(win);
500 elm_object_text_set(bt, "Chain 1"); 554 elm_object_text_set(bt, "Chain 1");
501 evas_object_resize(bt, 100, 100); 555 evas_object_resize(bt, 100, 100);
diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c
index 062a9a0c3..893af3fe2 100644
--- a/src/bin/test_weather.c
+++ b/src/bin/test_weather.c
@@ -55,7 +55,7 @@ _hover_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
55void 55void
56test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 56test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
57{ 57{
58 Evas_Object *win; 58 Evas_Object *win, *bg;
59#ifdef HAVE_ELEMENTARY_EWEATHER 59#ifdef HAVE_ELEMENTARY_EWEATHER
60 Evas_Object *bx, *bx0, *bt; 60 Evas_Object *bx, *bx0, *bt;
61 EWeather *eweather; 61 EWeather *eweather;
@@ -65,9 +65,15 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
65 unsigned int i; 65 unsigned int i;
66#endif 66#endif
67 67
68 win = elm_win_util_standard_add("weather", "Weather"); 68 win = elm_win_add(NULL, "weather", ELM_WIN_BASIC);
69 elm_win_title_set(win, "Weather");
69 elm_win_autodel_set(win, EINA_TRUE); 70 elm_win_autodel_set(win, EINA_TRUE);
70 71
72 bg = elm_bg_add(win);
73 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
74 elm_win_resize_object_add(win, bg);
75 evas_object_show(bg);
76
71#ifdef HAVE_ELEMENTARY_EWEATHER 77#ifdef HAVE_ELEMENTARY_EWEATHER
72 bx = elm_box_add(win); 78 bx = elm_box_add(win);
73 elm_win_resize_object_add(win, bx); 79 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_web.c b/src/bin/test_web.c
index 32c533f96..138063791 100644
--- a/src/bin/test_web.c
+++ b/src/bin/test_web.c
@@ -90,13 +90,18 @@ static Evas_Object *
90_new_window_hook(void *data, Evas_Object *obj __UNUSED__, Eina_Bool js __UNUSED__, const Elm_Web_Window_Features *wf __UNUSED__) 90_new_window_hook(void *data, Evas_Object *obj __UNUSED__, Eina_Bool js __UNUSED__, const Elm_Web_Window_Features *wf __UNUSED__)
91{ 91{
92 Web_Test *wt = data; 92 Web_Test *wt = data;
93 Evas_Object *new_win, *new_web; 93 Evas_Object *new_win, *new_web, *bg;
94 94
95 new_win = elm_win_util_standard_add("elm-web-test-popup", "Elm Web Test Popup"); 95 new_win = elm_win_add(NULL, "elm-web-test-popup", ELM_WIN_BASIC);
96 elm_win_autodel_set(new_win, EINA_TRUE); 96 elm_win_autodel_set(new_win, EINA_TRUE);
97 evas_object_resize(new_win, 300, 300); 97 evas_object_resize(new_win, 300, 300);
98 evas_object_show(new_win); 98 evas_object_show(new_win);
99 99
100 bg = elm_bg_add(new_win);
101 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
102 elm_win_resize_object_add(new_win, bg);
103 evas_object_show(bg);
104
100 new_web = elm_web_add(new_win); 105 new_web = elm_web_add(new_win);
101 elm_web_useragent_set(new_web, wt->user_agent); 106 elm_web_useragent_set(new_web, wt->user_agent);
102 evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND, 107 evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND,
@@ -333,26 +338,33 @@ test_web(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
333{ 338{
334 const char user_agent_firefox[] = "Mozilla/5.0 (X11; Linux x86_64; rv:9.0.1) Gecko/20100101 Firefox/9.0.1"; 339 const char user_agent_firefox[] = "Mozilla/5.0 (X11; Linux x86_64; rv:9.0.1) Gecko/20100101 Firefox/9.0.1";
335 const char user_agent_mobile[] = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"; 340 const char user_agent_mobile[] = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3";
336 Evas_Object *win, *bx, *bx2, *bt, *web, *url; 341 Evas_Object *win, *bg, *bx, *bx2, *bt, *web, *url;
337 Web_Test *wt; 342 Web_Test *wt;
338 343
339 elm_need_web(); 344 elm_need_web();
340 345
341 wt = calloc(1, sizeof(*wt)); 346 wt = calloc(1, sizeof(*wt));
342 347
348 win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
349
343 if (mobile == EINA_TRUE) 350 if (mobile == EINA_TRUE)
344 { 351 {
345 win = elm_win_util_standard_add("web-mobile", "Web Mobile"); 352 wt->user_agent = user_agent_mobile;
346 wt->user_agent = user_agent_mobile; 353 elm_win_title_set(win, "Web-mobile");
347 } 354 }
348 else 355 else
349 { 356 {
350 win = elm_win_util_standard_add("web", "Web"); 357 wt->user_agent = user_agent_firefox;
351 wt->user_agent = user_agent_firefox; 358 elm_win_title_set(win, "Web");
352 } 359 }
353 360
354 elm_win_autodel_set(win, EINA_TRUE); 361 elm_win_autodel_set(win, EINA_TRUE);
355 362
363 bg = elm_bg_add(win);
364 elm_win_resize_object_add(win, bg);
365 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
366 evas_object_show(bg);
367
356 bx = elm_box_add(win); 368 bx = elm_box_add(win);
357 elm_win_resize_object_add(win, bx); 369 elm_win_resize_object_add(win, bx);
358 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 370 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_win_socket.c b/src/bin/test_win_socket.c
index 223bb57d2..d8b87ba06 100644
--- a/src/bin/test_win_socket.c
+++ b/src/bin/test_win_socket.c
@@ -144,13 +144,19 @@ fill(Evas_Object *win, Eina_Bool do_bg)
144void 144void
145test_win_socket(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 145test_win_socket(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
146{ 146{
147 Evas_Object *win, *bx, *lb; 147 Evas_Object *win, *bg, *bx, *lb;
148 Evas_Object *win_socket; 148 Evas_Object *win_socket;
149 149
150 /* for socket info window */ 150 /* for socket info window */
151 win = elm_win_util_standard_add("win-socket", "Win Socket"); 151 win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
152 elm_win_title_set(win, "Label");
152 elm_win_autodel_set(win, EINA_TRUE); 153 elm_win_autodel_set(win, EINA_TRUE);
153 154
155 bg = elm_bg_add(win);
156 elm_win_resize_object_add(win, bg);
157 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
158 evas_object_show(bg);
159
154 bx = elm_box_add(win); 160 bx = elm_box_add(win);
155 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 161 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
156 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 162 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);