From 3b3dc8019a520ce5e166c8ae9098ba020f8b3f94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 18 May 2006 07:13:20 +0000 Subject: [PATCH] Include wx/menu.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/menu.mm | 8 +++++--- src/common/taskbarcmn.cpp | 3 +-- src/gtk/frame.cpp | 2 +- src/gtk/mdi.cpp | 2 +- src/gtk/taskbar.cpp | 3 +-- src/gtk/window.cpp | 2 +- src/gtk1/frame.cpp | 2 +- src/gtk1/mdi.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/html/helpdlg.cpp | 2 +- src/html/helpfrm.cpp | 2 +- src/html/helpwnd.cpp | 2 +- src/mac/carbon/app.cpp | 2 +- src/mac/carbon/choice.cpp | 6 +++++- src/mac/carbon/combobox.cpp | 2 +- src/mac/carbon/combobxc.cpp | 2 +- src/mac/carbon/frame.cpp | 2 +- src/mac/carbon/menuitem.cpp | 2 +- src/mac/carbon/taskbar.cpp | 2 +- src/mac/carbon/textctrl.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/mac/classic/choice.cpp | 6 +++++- src/mac/classic/combobox.cpp | 2 +- src/mac/classic/frame.cpp | 2 +- src/mac/classic/mdi.cpp | 26 +++++++++++++------------- src/mac/classic/menuitem.cpp | 3 +-- src/mac/classic/window.cpp | 2 +- src/mgl/window.cpp | 2 +- src/motif/frame.cpp | 2 +- src/motif/mdi.cpp | 12 ++++++++---- src/motif/menuitem.cpp | 3 +-- src/motif/window.cpp | 2 +- src/msw/menu.cpp | 5 +++-- src/msw/menuitem.cpp | 7 +++---- src/os2/menu.cpp | 35 ++++++++++++++++------------------- src/palmos/menu.cpp | 3 ++- src/palmos/menuitem.cpp | 5 ++--- src/univ/menu.cpp | 3 ++- src/univ/themes/metal.cpp | 5 +++-- src/univ/themes/win32.cpp | 4 ++-- src/x11/window.cpp | 2 +- src/xrc/xh_menu.cpp | 3 +-- 43 files changed, 99 insertions(+), 91 deletions(-) diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm index fc5e4b038c..27cc125141 100644 --- a/src/cocoa/menu.mm +++ b/src/cocoa/menu.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/menu.cpp +// Name: src/cocoa/menu.cpp // Purpose: wxMenu and wxMenuBar implementation // Author: David Elliott // Modified by: // Created: 2002/12/09 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// @@ -18,8 +18,10 @@ // ---------------------------------------------------------------------------- #include "wx/wxprec.h" + +#include "wx/menu.h" + #ifndef WX_PRECOMP - #include "wx/menu.h" #include "wx/log.h" #endif // WX_PRECOMP diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp index 1ffc0a1db1..ad25c102e4 100644 --- a/src/common/taskbarcmn.cpp +++ b/src/common/taskbarcmn.cpp @@ -20,13 +20,12 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/menu.h" #endif // DLL options compatibility check: WX_CHECK_BUILD_OPTIONS("wxAdvanced") - -#include "wx/menu.h" #include "wx/taskbar.h" DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 1aebe9aac2..696d588eef 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -23,11 +23,11 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/dialog.h" #include "wx/control.h" -#include "wx/menu.h" #if wxUSE_TOOLBAR #include "wx/toolbar.h" #endif diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index c06efa1a51..b6994bebaa 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -16,11 +16,11 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/menu.h" #endif #include "wx/notebook.h" #include "wx/dialog.h" -#include "wx/menu.h" #include "wx/gtk/private.h" #include diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp index 0ef04d1e44..70f600372d 100644 --- a/src/gtk/taskbar.cpp +++ b/src/gtk/taskbar.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/frame.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" - #include #ifdef __WXGTK20__ diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 870c4c9ccb..ee7f1f9f46 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -23,6 +23,7 @@ #include "wx/utils.h" #include "wx/frame.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif #include "wx/layout.h" @@ -50,7 +51,6 @@ #include "wx/textctrl.h" #endif -#include "wx/menu.h" #include "wx/statusbr.h" #include "wx/settings.h" #include "wx/fontutil.h" diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 1deda790eb..ce1cfdef46 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -23,11 +23,11 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/dialog.h" #include "wx/control.h" -#include "wx/menu.h" #if wxUSE_TOOLBAR #include "wx/toolbar.h" #endif diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index b95b07de75..10cf8bbe39 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -16,11 +16,11 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/menu.h" #endif #include "wx/notebook.h" #include "wx/dialog.h" -#include "wx/menu.h" #include "wx/gtk1/private.h" #include diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index a36bfe0a10..d3b99faf01 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -23,6 +23,7 @@ #include "wx/utils.h" #include "wx/frame.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif #include "wx/layout.h" @@ -47,7 +48,6 @@ #include "wx/textctrl.h" #endif -#include "wx/menu.h" #include "wx/statusbr.h" #include "wx/settings.h" #include "wx/fontutil.h" diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp index 70cf98208e..8af3d252e0 100644 --- a/src/html/helpdlg.cpp +++ b/src/html/helpdlg.cpp @@ -28,10 +28,10 @@ #include "wx/bmpbuttn.h" #include "wx/statbox.h" #include "wx/radiobox.h" + #include "wx/menu.h" #endif // WXPRECOMP #ifdef __WXMAC__ - #include "wx/menu.h" #include "wx/msgdlg.h" #endif diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index a1456b1ae2..c5c2847bfc 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -33,10 +33,10 @@ #include "wx/bmpbuttn.h" #include "wx/statbox.h" #include "wx/radiobox.h" + #include "wx/menu.h" #endif // WXPRECOMP #ifdef __WXMAC__ - #include "wx/menu.h" #include "wx/msgdlg.h" #endif diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 7d0eed086b..b78fc0f795 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -33,10 +33,10 @@ #include "wx/bmpbuttn.h" #include "wx/statbox.h" #include "wx/radiobox.h" + #include "wx/menu.h" #endif // WXPRECOMP #ifdef __WXMAC__ - #include "wx/menu.h" #include "wx/msgdlg.h" #endif diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 2527374184..82d28bc4c8 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -21,6 +21,7 @@ #include "wx/frame.h" #include "wx/dc.h" #include "wx/button.h" + #include "wx/menu.h" #endif #include "wx/gdicmn.h" @@ -35,7 +36,6 @@ #include "wx/memory.h" #include "wx/tooltip.h" #include "wx/textctrl.h" -#include "wx/menu.h" #include "wx/docview.h" #include "wx/filename.h" diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index d5575233dc..d4268c6e97 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -14,7 +14,11 @@ #if wxUSE_CHOICE #include "wx/choice.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/menu.h" +#endif + #include "wx/mac/uma.h" extern MenuHandle NewUniqueMenu() ; diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 54d864df0e..dd73be5b4c 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -17,9 +17,9 @@ #ifndef WX_PRECOMP #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/containr.h" #include "wx/mac/uma.h" diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp index b5d1bffd67..fff4f2e43a 100644 --- a/src/mac/carbon/combobxc.cpp +++ b/src/mac/carbon/combobxc.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/mac/uma.h" #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index b3464ad2cd..9bcd1d587b 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -16,12 +16,12 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index 0eb888060b..7929831fb4 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/menu.h" #endif // WX_PRECOMP -#include "wx/menu.h" #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp index cc9afbef1d..ca4d3fe1fe 100644 --- a/src/mac/carbon/taskbar.cpp +++ b/src/mac/carbon/taskbar.cpp @@ -17,11 +17,11 @@ #ifndef WX_PRECOMP #include "wx/dcmemory.h" + #include "wx/menu.h" #endif #include "wx/mac/private.h" -#include "wx/menu.h" #include "wx/icon.h" diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 687f527adb..1a04cf533c 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -21,6 +21,7 @@ #include "wx/utils.h" #include "wx/dc.h" #include "wx/button.h" + #include "wx/menu.h" #endif #ifdef __DARWIN__ @@ -44,7 +45,6 @@ #include "wx/settings.h" #include "wx/filefn.h" #include "wx/sysopt.h" -#include "wx/menu.h" #if defined(__BORLANDC__) && !defined(__WIN32__) #include diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index d6fe9edd1e..64658395c0 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -22,9 +22,9 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/scrolbar.h" diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index 4fe7e37496..e0c3cebdd9 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -25,6 +25,7 @@ #include "wx/frame.h" #include "wx/dc.h" #include "wx/button.h" + #include "wx/menu.h" #endif #include "wx/gdicmn.h" @@ -39,7 +40,6 @@ #include "wx/memory.h" #include "wx/tooltip.h" #include "wx/textctrl.h" -#include "wx/menu.h" #include "wx/docview.h" #include "wx/filename.h" diff --git a/src/mac/classic/choice.cpp b/src/mac/classic/choice.cpp index cfbd7aa4a8..8371e99ad9 100644 --- a/src/mac/classic/choice.cpp +++ b/src/mac/classic/choice.cpp @@ -14,7 +14,11 @@ #if wxUSE_CHOICE #include "wx/choice.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/menu.h" +#endif + #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp index 5af51c8fa8..aba551e2f3 100644 --- a/src/mac/classic/combobox.cpp +++ b/src/mac/classic/combobox.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp index 6cd7b8fb01..4790dafe98 100644 --- a/src/mac/classic/frame.cpp +++ b/src/mac/classic/frame.cpp @@ -16,12 +16,12 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/menu.h" #include "wx/dialog.h" #include "wx/settings.h" diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp index 2603ac21dd..99298939e1 100644 --- a/src/mac/classic/mdi.cpp +++ b/src/mac/classic/mdi.cpp @@ -15,9 +15,9 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/settings.h" #include "wx/mac/private.h" @@ -60,16 +60,16 @@ wxMDIParentFrame::wxMDIParentFrame() m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = (wxMenu*) NULL; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; } bool wxMDIParentFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { m_clientWindow = NULL; m_currentChild = NULL; @@ -94,11 +94,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent, } wxFrame::Create( parent , id , title , pos , size , style , name ) ; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; OnCreateClient(); - return TRUE; + return true; } wxMDIParentFrame::~wxMDIParentFrame() @@ -252,7 +252,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, { SetName(name); - if ( id > -1 ) + if ( id != wxID_ANY ) m_windowId = id; else m_windowId = (int)NewControlId(); @@ -265,7 +265,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ; wxModelessWindows.Append(this); - return FALSE; + return false; } wxMDIChildFrame::~wxMDIChildFrame() @@ -378,7 +378,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); wxModelessWindows.Append(this); - return TRUE; + return true; } // Get size *available for subwindows* i.e. excluding menu bar. diff --git a/src/mac/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp index f08bf177a0..615f4c0c29 100644 --- a/src/mac/classic/menuitem.cpp +++ b/src/mac/classic/menuitem.cpp @@ -19,10 +19,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" - #include "wx/mac/uma.h" // ============================================================================ // implementation diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp index 6d8165101a..cb84142c9a 100644 --- a/src/mac/classic/window.cpp +++ b/src/mac/classic/window.cpp @@ -22,9 +22,9 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 8c203f29e7..e19d106905 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -36,6 +36,7 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/dcscreen.h" + #include "wx/menu.h" #endif #if wxUSE_DRAG_AND_DROP @@ -1095,7 +1096,6 @@ void wxWindowMGL::Clear() dc.Clear(); } -#include "wx/menu.h" void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect) { if ( m_eraseBackground == -1 ) diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 24c4eb0f9d..d2243a7edb 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -32,11 +32,11 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/utils.h" + #include "wx/menu.h" #endif #include "wx/statusbr.h" #include "wx/toolbar.h" -#include "wx/menu.h" #include "wx/settings.h" #include "wx/icon.h" diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp index 5404741cfe..1ddc29573e 100644 --- a/src/motif/mdi.cpp +++ b/src/motif/mdi.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.cpp +// Name: src/motif/mdi.cpp // Purpose: MDI classes // Author: Julian Smart // Modified by: @@ -18,7 +18,11 @@ #endif #include "wx/mdi.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/menu.h" +#endif + #include "wx/settings.h" #include "wx/icon.h" @@ -299,7 +303,7 @@ void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event) if (GetStatusBar()) { if (event.GetMenuId() == -1) - SetStatusText(""); + SetStatusText(wxEmptyString); else { wxMenuBar *menuBar = (wxMenuBar*) NULL; @@ -310,7 +314,7 @@ void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event) if (menuBar) { wxString helpString(menuBar->GetHelpString(event.GetMenuId())); - if (helpString != "") + if (!helpString.empty()) SetStatusText(helpString); } } diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index f07b0a4b2b..08bf34a5ff 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -25,10 +25,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/frame.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" - #ifdef __VMS__ #pragma message disable nosimpint #endif diff --git a/src/motif/window.cpp b/src/motif/window.cpp index c82cadf8bf..8e7eb18ab8 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -35,9 +35,9 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/layout.h" #include "wx/settings.h" #include "wx/scrolwin.h" diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index cd13e77512..f89a45c790 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -26,9 +26,10 @@ #if wxUSE_MENUS +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/frame.h" - #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" @@ -875,7 +876,7 @@ WXHMENU wxMenuBar::Create() HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); - // hMenu may be zero on Windows Mobile 5. So add the menus anyway. + // hMenu may be zero on Windows Mobile 5. So add the menus anyway. if (1) // (hMenu) { TBBUTTON tbButton; diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 085dc6e47f..8bcbd83aa0 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -26,7 +26,7 @@ #if wxUSE_MENUS -#include "wx/menu.h" +#include "wx/menuitem.h" #ifndef WX_PRECOMP #include "wx/font.h" @@ -37,10 +37,9 @@ #include "wx/accel.h" #include "wx/string.h" #include "wx/log.h" + #include "wx/menu.h" #endif -#include "wx/menuitem.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL @@ -79,7 +78,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ; bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & ) { const wxMenuItem * mitem = dynamic_cast(object) ; - if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().IsEmpty() ) + if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() ) { // we don't stream out the first two items for menus with a title, they will be reconstructed if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || mitem->GetMenu()->FindItemByPosition(1) == mitem ) diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index f47f5d2ee5..3f8db0640b 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/os2/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: David Webster // Modified by: @@ -12,10 +12,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/frame.h" - #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" @@ -70,7 +71,7 @@ USHORT wxMenu::m_nextMenuId = 0; // void wxMenu::Init() { - m_bDoBreak = FALSE; + m_bDoBreak = false; m_nStartRadioGroup = -1; // @@ -265,7 +266,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem, if (m_bDoBreak) { rItem.afStyle |= MIS_BREAK; - m_bDoBreak = FALSE; + m_bDoBreak = false; } // @@ -594,10 +595,8 @@ void wxMenu::SetTitle( const wxString& rLabel ) // event processing // --------------------------------------------------------------------------- -bool wxMenu::OS2Command( - WXUINT WXUNUSED(uParam) -, WXWORD vId -) +bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam), + WXWORD vId ) { // // Ignore commands from the menu title @@ -613,7 +612,7 @@ bool wxMenu::OS2Command( ) ); } - return TRUE; + return true; } // end of wxMenu::OS2Command // --------------------------------------------------------------------------- @@ -738,7 +737,7 @@ void wxMenuBar::Refresh() WXHMENU wxMenuBar::Create() { - HWND hFrame; + HWND hFrame; if (m_hMenu != 0 ) return m_hMenu; @@ -974,19 +973,17 @@ bool wxMenuBar::Insert( size_t nPos, return true; } // end of wxMenuBar::Insert -bool wxMenuBar::Append( - wxMenu* pMenu -, const wxString& rsTitle -) +bool wxMenuBar::Append( wxMenu* pMenu, + const wxString& rsTitle ) { - WXHMENU hSubmenu = pMenu ? pMenu->GetHMenu() : 0; + WXHMENU hSubmenu = pMenu ? pMenu->GetHMenu() : 0; - wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar")); + wxCHECK_MSG(hSubmenu, false, wxT("can't append invalid menu to menubar")); - wxString sTitle = wxPMTextToLabel(rsTitle); + wxString sTitle = wxPMTextToLabel(rsTitle); if (!wxMenuBarBase::Append(pMenu, sTitle)) - return FALSE; + return false; m_titles.Add(sTitle); @@ -1005,7 +1002,7 @@ bool wxMenuBar::Append( #endif // wxUSE_ACCEL Refresh(); } - return TRUE; + return true; } // end of wxMenuBar::Append wxMenu* wxMenuBar::Remove( diff --git a/src/palmos/menu.cpp b/src/palmos/menu.cpp index eba71c427b..7274757921 100644 --- a/src/palmos/menu.cpp +++ b/src/palmos/menu.cpp @@ -26,9 +26,10 @@ #if wxUSE_MENUS +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/frame.h" - #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp index f0dc626bdd..111a44c494 100644 --- a/src/palmos/menuitem.cpp +++ b/src/palmos/menuitem.cpp @@ -26,7 +26,7 @@ #if wxUSE_MENUS -#include "wx/menu.h" +#include "wx/menuitem.h" #ifndef WX_PRECOMP #include "wx/font.h" @@ -37,10 +37,9 @@ #include "wx/accel.h" #include "wx/string.h" #include "wx/log.h" + #include "wx/menu.h" #endif -#include "wx/menuitem.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 57e7fda1c5..b1d27062f1 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -25,10 +25,11 @@ #if wxUSE_MENUS +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/control.h" // for FindAccelIndex() - #include "wx/menu.h" #include "wx/settings.h" #include "wx/accel.h" #include "wx/log.h" diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp index 68ccc97db4..0b88fbed9a 100644 --- a/src/univ/themes/metal.cpp +++ b/src/univ/themes/metal.cpp @@ -1,4 +1,5 @@ -// Name: univ/themes/metal.cpp +/////////////////////////////////////////////////////////////////////////////// +// Name: src/univ/themes/metal.cpp // Purpose: wxUniversal theme implementing Win32-like LNF // Author: Vadim Zeitlin, Robert Roebling // Modified by: @@ -44,12 +45,12 @@ // for COLOR_* constants #include "wx/msw/private.h" #endif + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/notebook.h" #include "wx/spinbutt.h" #include "wx/settings.h" -#include "wx/menu.h" #include "wx/artprov.h" #include "wx/toplevel.h" diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index ed3e0f8d58..2e7413b2ce 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: univ/themes/win32.cpp +// Name: src/univ/themes/win32.cpp // Purpose: wxUniversal theme implementing Win32-like LNF // Author: Vadim Zeitlin // Modified by: @@ -48,12 +48,12 @@ // for COLOR_* constants #include "wx/msw/private.h" #endif + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/notebook.h" #include "wx/spinbutt.h" #include "wx/settings.h" -#include "wx/menu.h" #include "wx/artprov.h" #include "wx/toplevel.h" #include "wx/image.h" diff --git a/src/x11/window.cpp b/src/x11/window.cpp index c185b0e9e0..5497980639 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -36,9 +36,9 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp index 12d8b4a321..ee8530d615 100644 --- a/src/xrc/xh_menu.cpp +++ b/src/xrc/xh_menu.cpp @@ -21,10 +21,9 @@ #ifndef WX_PRECOMP #include "wx/frame.h" + #include "wx/menu.h" #endif -#include "wx/menu.h" - IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler) wxMenuXmlHandler::wxMenuXmlHandler() : -- 2.47.2