From 954c5e46a180e1d40ab7345a1f29276b241853a3 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Sat, 22 Oct 2011 19:39:44 -0600 Subject: [PATCH] Fix a bug in LayoutTest1, where we were getting the view of a view-less layout, and then calling methods on it, resulting in a (SURPRISE!) segfault. --- src/tests/kits/interface/layout/LayoutTest1.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/tests/kits/interface/layout/LayoutTest1.cpp b/src/tests/kits/interface/layout/LayoutTest1.cpp index 3627953aae..741c20f52e 100644 --- a/src/tests/kits/interface/layout/LayoutTest1.cpp +++ b/src/tests/kits/interface/layout/LayoutTest1.cpp @@ -338,7 +338,7 @@ struct GroupLayoutTest1 : public Test { // row 2 .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 2) - .GetView(&toggledRow) + .GetLayout(&toggledRow) .Add(new TestView()) .Add(new TestView()) .Add(new TestView()) @@ -362,10 +362,7 @@ struct GroupLayoutTest1 : public Test { switch (message->what) { case MSG_TOGGLE_1: { - if (toggledRow->IsHidden(toggledRow)) - toggledRow->Show(); - else - toggledRow->Hide(); + toggledRow->SetVisible(!toggledRow->IsVisible()); break; } @@ -387,7 +384,7 @@ struct GroupLayoutTest1 : public Test { private: BButton* toggleRowButton; BButton* toggleViewButton; - BView* toggledRow; + BGroupLayout* toggledRow; TestView* toggledView; };