Change internal windows from Elm win to Elm layout.

3 files changed, 6 insertions, 11 deletions

diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 03979ab..fe6a3c2 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -524,7 +524,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
    // Bump the top toolbar above the windows.
   evas_object_raise(ourGlobals.tb);
 
-  evas_object_show(ourGlobals.mainWindow->box);
   _on_resize(&ourGlobals, NULL, NULL, NULL);
 
   elm_run();
diff --git a/src/extantz/files.c b/src/extantz/files.c
index 6ac151d..12dcc8d 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -147,9 +147,8 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   Evas_Object *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel;
 
   me = winFangAdd(ourGlobals->mainWindow, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500, "file selector", "files", ourGlobals->world);
-  useBox(me);
 
-  wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, me->box, NULL);
+  wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, me->win, NULL);
   fs = wid->obj;
   wid->data = ourGlobals;
   wid->on_del = _on_fs_del;
@@ -159,7 +158,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
     elm_interface_fileselector_expandable_set(EINA_TRUE),
     elm_interface_fileselector_folder_only_set(EINA_FALSE)
        );
-  elm_box_pack_end(me->box, fs);
+  elm_layout_box_append(me->win, BOX, fs);
 
   elm_fileselector_path_set(fs, path);
   elm_fileselector_is_save_set(fs, save);
@@ -265,9 +264,8 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   elm_box_pack_end(vbox, bt);
   eo_unref(bt);
 
-  elm_box_pack_end(me->box, vbox);
+  elm_layout_box_append(me->win, BOX, vbox);
   evas_object_show(vbox);
-  evas_object_show(me->box);
   eo_unref(vbox);
 
   winFangHide(me);
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 6167cb1..7e476ea 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -160,7 +160,6 @@ winFang *woMan_add(globals *ourGlobals)
     int i;
 
     me = winFangAdd(ourGlobals->mainWindow, 30, 200, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan", ourGlobals->world);
-    useBox(me);
 
     // A tab thingy.
     tb = elm_toolbar_add(me->win);
@@ -185,7 +184,7 @@ winFang *woMan_add(globals *ourGlobals)
     elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL);
 
     // The toolbar needs to be packed into the box AFTER the menus are added.
-    elm_box_pack_end(me->box, tb);
+    elm_layout_box_append(me->win, BOX, tb);
     evas_object_show(tb);
 
     gridList = elm_genlist_add(me->win);
@@ -268,7 +267,7 @@ winFang *woMan_add(globals *ourGlobals)
     tab = viewerList;                           tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it);
     tab = _content_image_new(me->win, strdup(buf));     tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it);
     tab = gridList;                             tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL);      elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE);    elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it);
-    elm_box_pack_end(me->box, nf);
+    elm_layout_box_append(me->win, BOX, nf);
 
     bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win,
 //              evas_obj_text_set("Login"),
@@ -278,9 +277,8 @@ winFang *woMan_add(globals *ourGlobals)
         );
     elm_object_text_set(bt, "Login");           // No eo interface for this that I can find.
 //    evas_object_smart_callback_add(bt, "clicked", NULL, NULL);
-    elm_box_pack_end(me->box, bt);
+    elm_layout_box_append(me->win, BOX, bt);
     eo_unref(bt);
-    evas_object_show(me->box);
 
     return me;
 }