From 86dab989e5c62e0c518e1668dc08afbf66bd6930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Tue, 2 Sep 2008 10:56:14 +0000
Subject: [PATCH] Added test for adding a BMenu instead of a BMenuItem, but
 everything works fine, at least in the context of the layout management. I am
 investigating a bug though that shows at least in WonderBrush (missing Filter
 menu).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27284 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../widget_layout_test/tests/MenuBarTest.cpp  | 27 +++++++++++++++++++
 .../widget_layout_test/tests/MenuBarTest.h    |  4 +++
 2 files changed, 31 insertions(+)

diff --git a/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.cpp b/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.cpp
index 51c01cbc21..3d232a80c3 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.cpp
@@ -14,6 +14,7 @@
 
 enum {
 	MSG_THIRD_ITEM			= '3rdi',
+	MSG_CHILD_MENU			= 'chmn',
 	MSG_CHANGE_ITEM_TEXT	= 'chit'
 };
 
@@ -29,6 +30,7 @@ MenuBarTest::MenuBarTest()
 	fMenuBar->AddItem(fFirstItem = new BMenuItem("Menu item 1", NULL));
 	fMenuBar->AddItem(new BMenuItem("Menu item 2", NULL));
 	fThirdItem = new BMenuItem("Menu item 3", NULL);
+	fChildMenu = new BMenu("Child menu");
 }
 
 
@@ -53,6 +55,11 @@ MenuBarTest::ActivateTest(View* controls)
 		new BMessage(MSG_THIRD_ITEM), this);
 	group->AddChild(fThirdItemCheckBox);
 
+	// child menu
+	fChildMenuCheckBox = new LabeledCheckBox("Child menu",
+		new BMessage(MSG_CHILD_MENU), this);
+	group->AddChild(fChildMenuCheckBox);
+
 	// long text
 	fLongTextCheckBox = new LabeledCheckBox("Long label text",
 		new BMessage(MSG_CHANGE_ITEM_TEXT), this);
@@ -80,6 +87,9 @@ MenuBarTest::MessageReceived(BMessage* message)
 		case MSG_THIRD_ITEM:
 			UpdateThirdItem();
 			break;
+		case MSG_CHILD_MENU:
+			UpdateChildMenu();
+			break;
 		case MSG_CHANGE_ITEM_TEXT:
 			UpdateLongText();
 			break;
@@ -107,6 +117,23 @@ MenuBarTest::UpdateThirdItem()
 }
 
 
+// UpdateChildMenu
+void
+MenuBarTest::UpdateChildMenu()
+{
+	if (!fChildMenuCheckBox || !fMenuBar)
+		return;
+
+	if (fChildMenuCheckBox->IsSelected() == (fChildMenu->Supermenu() != NULL))
+		return;
+
+	if (fChildMenuCheckBox->IsSelected())
+		fMenuBar->AddItem(fChildMenu);
+	else
+		fMenuBar->RemoveItem(fChildMenu);
+}
+
+
 // 	UpdateLongText
 void
 MenuBarTest::UpdateLongText()
diff --git a/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.h b/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.h
index 216342676d..80993e5642 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.h
+++ b/src/tests/kits/interface/layout/widget_layout_test/tests/MenuBarTest.h
@@ -9,6 +9,7 @@
 #include "Test.h"
 
 
+class BMenu;
 class BMenuBar;
 class BMenuItem;
 class LabeledCheckBox;
@@ -27,13 +28,16 @@ public:
 
 private:
 			void				UpdateThirdItem();
+			void				UpdateChildMenu();
 			void				UpdateLongText();
 
 private:
 			BMenuBar*			fMenuBar;
 			BMenuItem*			fFirstItem;
 			BMenuItem*			fThirdItem;
+			BMenu*				fChildMenu;
 			LabeledCheckBox*	fThirdItemCheckBox;
+			LabeledCheckBox*	fChildMenuCheckBox;
 			LabeledCheckBox*	fLongTextCheckBox;
 };