From 675ffabd70492a962f8c0288a32208c22ce5de18 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Tue, 12 Oct 2010 08:49:18 +0000 Subject: [PATCH] Layout update for LookTest, fixes #6648. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38953 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/interface/look/Look.cpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/tests/kits/interface/look/Look.cpp b/src/tests/kits/interface/look/Look.cpp index 4c9e7e50ad..f6c66a2160 100644 --- a/src/tests/kits/interface/look/Look.cpp +++ b/src/tests/kits/interface/look/Look.cpp @@ -13,8 +13,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -317,7 +316,8 @@ main(int argc, char** argv) layout->AddView(colorControl, 0, row, 4); BTabView* tabView = new BTabView("tab view", B_WIDTH_FROM_WIDEST); - BView* content = BGroupLayoutBuilder(B_VERTICAL, kInset) + BGroupView* content = new BGroupView(B_VERTICAL, kInset); + BLayoutBuilder::Group<>(content) .Add(scrollView) .Add(columnListView) .Add(controls) @@ -362,19 +362,16 @@ main(int argc, char** argv) BButton* okButton = new BButton("OK", new BMessage(B_QUIT_REQUESTED)); - window->AddChild(BGroupLayoutBuilder(B_VERTICAL) + BLayoutBuilder::Group<>(window, B_VERTICAL, 0) .Add(menuBar) - .Add(BGroupLayoutBuilder(B_VERTICAL, kInset) - .Add(tabView) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, kInset) - .Add(new BButton("Revert", new BMessage(MSG_TOGGLE_LOOK))) - .Add(BSpaceLayoutItem::CreateGlue()) - .Add(new BButton("Cancel", NULL)) - .Add(okButton) - ) + .AddGroup(B_VERTICAL, kInset) .SetInsets(kInset, kInset, kInset, kInset) - ) - ); + .Add(tabView) + .AddGroup(B_HORIZONTAL, kInset) + .Add(new BButton("Revert", new BMessage(MSG_TOGGLE_LOOK))) + .AddGlue() + .Add(new BButton("Cancel", NULL)) + .Add(okButton); window->SetDefaultButton(okButton);