From 446b8c194e9ec252eaac62a62551800b9775b833 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 27 Dec 2004 09:05:16 +0000 Subject: [PATCH] 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 | 44 +++++++++++++++++++ src/kits/interface/Menu.cpp | 33 +------------- src/kits/interface/MenuWindow.cpp | 59 ++++++++++++++++++++++++++ src/kits/interface/interface.src | 1 + 4 files changed, 106 insertions(+), 31 deletions(-) create mode 100644 headers/private/interface/MenuWindow.h create mode 100644 src/kits/interface/MenuWindow.cpp diff --git a/headers/private/interface/MenuWindow.h b/headers/private/interface/MenuWindow.h new file mode 100644 index 0000000000..8be04be9f3 --- /dev/null +++ b/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 (mflerackers@androme.be) +// Stefano Ceccherini (burton666@libero.it) +// Description: BMenuWindow is the custom BWindow for menus. +//------------------------------------------------------------------------------ +#ifndef __MENUWINDOW_H +#define __MENUWINDOW_H + +#include + +class BMenu; +class BMenuWindow : public BWindow { +public: + BMenuWindow(BRect frame, BMenu *menu); + virtual ~BMenuWindow(); + + virtual void WindowActivated(bool active); + +private: + BMenu *fMenu; +}; + +#endif diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index 69aeed5628..c2d18aa57b 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -32,6 +32,8 @@ #include #include +#include + #include #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, diff --git a/src/kits/interface/MenuWindow.cpp b/src/kits/interface/MenuWindow.cpp new file mode 100644 index 0000000000..527ff572de --- /dev/null +++ b/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 (mflerackers@androme.be) +// Stefano Ceccherini (burton666@libero.it) +// Description: BMenuWindow is a custom BWindow for BMenus. +//------------------------------------------------------------------------------ +// TODO: Just a very simple implementation for now + +#include + +#include + +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(); + } +} diff --git a/src/kits/interface/interface.src b/src/kits/interface/interface.src index fdba3b9381..02d11b3d9a 100644 --- a/src/kits/interface/interface.src +++ b/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