Moved BMenuWindow to its own file

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10536 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/interface/MenuWindow.h

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+//	Copyright (c) 2003-2004, Haiku, Inc.
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		MenuWindow.h
+//	Authors:		Marc Flerackers ([email protected])
+//					Stefano Ceccherini ([email protected])
+//	Description:	BMenuWindow is the custom BWindow for menus.
+//------------------------------------------------------------------------------
+#ifndef __MENUWINDOW_H
+#define __MENUWINDOW_H
+
+#include <Window.h>
+
+class BMenu;
+class BMenuWindow : public BWindow {
+public:
+	BMenuWindow(BRect frame, BMenu *menu);
+	virtual ~BMenuWindow();
+
+	virtual void WindowActivated(bool active);
+
+private:
+	BMenu *fMenu;
+};
+
+#endif

src/kits/interface/Menu.cpp

@@ -32,6 +32,8 @@
 #include <PropertyInfo.h>
 #include <Window.h>
 
+#include <MenuWindow.h>
+
 #include <stdio.h>
 #define CALLED() printf("%s\n", __PRETTY_FUNCTION__);
 
@@ -87,37 +89,6 @@ static property_info sPropList[] =
 	{}
 };
 
-// TODO: Move this to its own file
-class BMenuWindow : public BWindow
-{
-public:
-	BMenuWindow(BRect frame, BMenu *menu) :
-		BWindow(frame, "Menu", B_NO_BORDER_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-			B_NOT_ZOOMABLE)
-	{
-		fMenu = menu;
-		AddChild(fMenu);	
-		ResizeTo(fMenu->Bounds().Width() + 1, fMenu->Bounds().Height() + 1);
-		fMenu->MakeFocus(true);
-	}
-
-	virtual ~BMenuWindow() {}
-
-	virtual void WindowActivated(bool active)
-	{
-		if (!active)
-		{
-			RemoveChild(fMenu);
-
-			if (Lock())
-				Quit();
-		}
-	}
-
-private:
-	BMenu *fMenu;
-};
-
 
 BMenu::BMenu(const char *name, menu_layout layout)
 	:	BView(BRect(), name, B_FOLLOW_LEFT | B_FOLLOW_TOP,

src/kits/interface/MenuWindow.cpp

@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+//	Copyright (c) 2001-2004, Haiku, Inc.
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		Menu.cpp
+//	Authors:		Marc Flerackers ([email protected])
+//					Stefano Ceccherini ([email protected])
+//	Description:	BMenuWindow is a custom BWindow for BMenus.
+//------------------------------------------------------------------------------
+// TODO: Just a very simple implementation for now
+
+#include <Menu.h>
+
+#include <MenuWindow.h>
+
+BMenuWindow::BMenuWindow(BRect frame, BMenu *menu)
+	:
+	BWindow(frame, "Menu", B_NO_BORDER_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
+			B_NOT_ZOOMABLE)
+{
+	fMenu = menu;
+	AddChild(fMenu);	
+	ResizeTo(fMenu->Bounds().Width() + 1, fMenu->Bounds().Height() + 1);
+	fMenu->MakeFocus(true);
+}
+
+
+BMenuWindow::~BMenuWindow()
+{
+}
+
+
+void 
+BMenuWindow::WindowActivated(bool active)
+{
+	if (!active) {
+		RemoveChild(fMenu);
+
+		if (Lock())
+			Quit();
+	}
+}

src/kits/interface/interface.src

@@ -18,6 +18,7 @@ INTERFACE_KIT_SOURCE =
 	MenuBar.cpp
 	MenuField.cpp
 	MenuItem.cpp
+	MenuWindow.cpp
 	OptionControl.cpp
 	OptionPopUp.cpp
 	Picture.cpp