Index: src/bin/test_box.c
===================================================================
--- src/bin/test_box.c	(revision 68179)
+++ src/bin/test_box.c	(working copy)
@@ -186,7 +186,7 @@ _unpack_btn_cb(void *data, Evas_Object *obj __UNUS
    Eina_List *rl, *l;
    int value, svalue;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
 
    rl = (Eina_List *) evas_object_data_get(box, "radio-list");
    EINA_LIST_FOREACH(rl, l, radio)
@@ -210,7 +210,7 @@ _unpack_all_btn_cb(void *data, Evas_Object *obj __
    Evas_Object *box, *radio;
    Eina_List *rl, *l;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
    elm_box_unpack_all(box);
 
    rl = (Eina_List *) evas_object_data_get(box, "radio-list");
@@ -253,7 +253,8 @@ _pack(Evas_Object *box, _Box_Pack_Position pos)
    int value, svalue, count;
 
    rl = (Eina_List *) evas_object_data_get(box, "radio-list");
-   if (!rl && (pos == BOX_PACK_POSITION_START || pos == BOX_PACK_POSITION_END))
+   if (!rl && ((pos == BOX_PACK_POSITION_START) ||
+               (pos == BOX_PACK_POSITION_END)))
      {
         rd = _radio_new(box, 0);
         if (pos == BOX_PACK_POSITION_START) elm_box_pack_start(box, rd);
@@ -278,20 +279,20 @@ _pack(Evas_Object *box, _Box_Pack_Position pos)
 
         rd = _radio_new(box, count);
 
-       switch(pos)
+       switch (pos)
          {
-            case BOX_PACK_POSITION_START:
-               elm_box_pack_start(box, rd);
-               break;
-            case BOX_PACK_POSITION_BEFORE:
-               elm_box_pack_before(box, rd, radio);
-               break;
-            case BOX_PACK_POSITION_AFTER:
-               elm_box_pack_after(box, rd, radio);
-               break;
-            case BOX_PACK_POSITION_END:
-               elm_box_pack_end(box, rd);
-               break;
+          case BOX_PACK_POSITION_START:
+             elm_box_pack_start(box, rd);
+             break;
+          case BOX_PACK_POSITION_BEFORE:
+             elm_box_pack_before(box, rd, radio);
+             break;
+          case BOX_PACK_POSITION_AFTER:
+             elm_box_pack_after(box, rd, radio);
+             break;
+          case BOX_PACK_POSITION_END:
+             elm_box_pack_end(box, rd);
+             break;
          }
 
         rdg = evas_object_data_get(box, "radio-group");
@@ -308,7 +309,7 @@ _pack_start_btn_cb(void *data, Evas_Object *obj __
    Evas_Object *box;
    if (!data) return;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
    _pack(box, BOX_PACK_POSITION_START);
 }
 
@@ -318,7 +319,7 @@ _pack_before_btn_cb(void *data, Evas_Object *obj _
    Evas_Object *box;
    if (!data) return;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
    _pack(box, BOX_PACK_POSITION_BEFORE);
 }
 
@@ -328,7 +329,7 @@ _pack_after_btn_cb(void *data, Evas_Object *obj __
    Evas_Object *box;
    if (!data) return;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
    _pack(box, BOX_PACK_POSITION_AFTER);
 }
 
@@ -338,14 +339,14 @@ _pack_end_btn_cb(void *data, Evas_Object *obj __UN
    Evas_Object *box;
    if (!data) return;
 
-   box = (Evas_Object *) data;
+   box = (Evas_Object *)data;
    _pack(box, BOX_PACK_POSITION_END);
 }
 
 void
 test_box_pack(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg;
+   Evas_Object *win;
    Evas_Object *box, *lbox, *rbox;
    Evas_Object *sc;
    Evas_Object *bt;
@@ -353,15 +354,9 @@ test_box_pack(void *data __UNUSED__, Evas_Object *
    Eina_List *l = NULL;
    int i;
 
-   win = elm_win_add(NULL, "box-pack", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Pack");
+   win = elm_win_util_standard_add("box-pack", "Box Pack");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    box = elm_box_add(win);
    elm_box_horizontal_set(box, EINA_TRUE);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -375,7 +370,7 @@ test_box_pack(void *data __UNUSED__, Evas_Object *
    evas_object_size_hint_align_set(lbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    sc = elm_scroller_add(win);
-   elm_scroller_bounce_set(sc, 0, 1);
+   elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
@@ -450,26 +445,19 @@ _cb_check_changed(void *data, Evas_Object *obj, vo
 
    homo = elm_check_state_get(obj);
    elm_box_homogeneous_set(box, homo);
-
 }
 
 void
 test_box_homo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg;
+   Evas_Object *win;
    Evas_Object *box, *o_bg;
    Evas_Object *rd;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "box-homogeneous", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Homogeneous");
+   win = elm_win_util_standard_add("box-homogeneous", "Box Homogeneous");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    box = elm_box_add(win);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, box);
@@ -488,10 +476,8 @@ test_box_homo(void *data __UNUSED__, Evas_Object *
    evas_object_smart_callback_add(rd, "changed", _cb_check_changed, box);
    elm_box_pack_end(box, rd);
    evas_object_show(rd);
-
    evas_object_show(o_bg);
-   evas_object_size_hint_min_set(bg, 160, 160);
-   evas_object_size_hint_max_set(bg, 640, 640);
+
    evas_object_resize(win, 320, 320);
    evas_object_show(win);
 }
@@ -547,7 +533,6 @@ test_box_transition(void *data __UNUSED__, Evas_Ob
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
    evas_object_size_hint_weight_set(bx, 1.0, 1.0);
-
    evas_object_show(bx);
 
    bt = elm_button_add(win);