Include wx/menu.h according to precompiled headers of wx/wx.h (with other minor clean...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm
index fc5e4b038cfad1667e76852743ee82ac1c58e9fa..27cc125141c11b41016a05e2d254cea5fb7411d5 100644 (file)
--- 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 1ffc0a1db170d62b9068219cf931ee2be4260e29..ad25c102e45bedea997b4f54fa9c9c1f6d476f5a 100644 (file)
--- 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 1aebe9aac213896677bd31a2c411ef78a1c437ba..696d588eef035abcc30e319811a5139ce34c429f 100644 (file)
--- 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 c06efa1a51a8b3f7723a9abed3d624301d3f000a..b6994bebaa5a7e7392544ed605b1d6b0827cc212 100644 (file)
--- 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 <glib.h>

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 0ef04d1e44e67c5bbf0d3280dc509d644666f306..70f600372d70d5bb77a4c2b380b9fbb015c7b4dc 100644 (file)
--- 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 <gdk/gdkx.h>
 
 #ifdef __WXGTK20__

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 870c4c9ccb057844172ab8e12964adb97c257d2a..ee7f1f9f464a5ac0bcbd2e37587b9b00ff5a154a 100644 (file)
--- 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 1deda790eb7f44f9f0167c07790af3fc4cb2bbd8..ce1cfdef46da5371a226296b9ecf554c7aaaf866 100644 (file)
--- 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 b95b07de757a60ce44433bdd9686ef66a8f0d02c..10cf8bbe39cd1051a831fa5bb83a98be832761e0 100644 (file)
--- 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 <glib.h>

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index a36bfe0a103bbeb14a019cafa941bbc619c53bdf..d3b99faf01f715be376ad46860e0fe74cfdaf576 100644 (file)
--- 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 70cf98208e9ee14ffa22e6635c2d70442eea13ef..8af3d252e013ef8e4168d8575969294a93580826 100644 (file)
--- 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 a1456b1ae2f309dc1aabfc88d6373298e1caf8a0..c5c2847bfc8232fac3f4006b8cc834cea973b81c 100644 (file)
--- 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 7d0eed086b7e7767a70f3381562890431c328510..b78fc0f7959e9dc34ab7be73bcfa17666c8c2780 100644 (file)
--- 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 252737418492981e1b2d84484d0229767861c572..82d28bc4c813adfe73c2026ec3264afc1d5d46ef 100644 (file)
--- 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 d5575233dc75862ad25e2d3443c0c8be3f164f25..d4268c6e97b765b6f4c21fef011dbb937b47b2c2 100644 (file)
--- 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 54d864df0e2db0629e78e99a3bd37828ca09c969..dd73be5b4c15a4276cdae35f087e6fcb0697bbc6 100644 (file)
--- 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 b5d1bffd6785491911a628dfdf5fa24451a1cceb..fff4f2e43a18771a68343335469a6759cc415dfb 100644 (file)
--- 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 b3464ad2cd030b5e43778a45767858072f52a26f..9bcd1d587b99dacb626cda0f9a6587169c47d225 100644 (file)
--- 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 0eb888060b574a6ff8228840d49a55fdbd877017..7929831fb4d96c9948b12843815421704ebc95aa 100644 (file)
--- 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 cc9afbef1d09f6b35f1fb2202947841764d206e0..ca4d3fe1fe8fb490bbb92cea0723a968215a324f 100644 (file)
--- 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 687f527adbee6a986b98d5b9cc259e25e4253936..1a04cf533c2c676c9bb5de057738d2fb6c831031 100644 (file)
--- 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 <alloc.h>

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index d6fe9edd1e2e6ca39ed664deb3ef6e3ff54fe96a..64658395c027cfb3f16459863ef55980cf28d941 100644 (file)
--- 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 4fe7e37496ea775f02510d6d109959f1974b0975..e0c3cebdd93eb09e2004afd07a159e505cbf3a06 100644 (file)
--- 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 cfbd7aa4a849acb201f27c0378a43309ae484170..8371e99ad975d4faf9b32139c5b7d959c2dd8f07 100644 (file)
--- 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 5af51c8fa867206136b036d6fa682537c5cfe3ae..aba551e2f3e9ee30acd9c1afe5927110aafe29ed 100644 (file)
--- 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 6cd7b8fb01ada98e672d474095e7b006d8f04f9b..4790dafe9889abf759ccf87835fc77fdc2ece2dc 100644 (file)
--- 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 2603ac21dde66ab5faa6dae72017bd12ec13c3d4..99298939e1f9ce614441e8fb92cfc10e495c7df2 100644 (file)
--- 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 f08bf177a0f61db0070bb1c820ab804c92bd4717..615f4c0c29b367675cf859c8033f9aa1864c40ac 100644 (file)
--- 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 6d8165101a710be57d7bcb8a6ceeeaa9ca9a0d13..cb84142c9aea10cea4f700db4d2dc57b240a68df 100644 (file)
--- 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 8c203f29e7d69c5ea0f317cfc787b7532e6b2868..e19d106905c5f7f28ba14630704e2aeb9e23cc25 100644 (file)
--- 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 24c4eb0f9da583fee49bf6d13bd15f82dcf4a6b8..d2243a7edb954673725034a6ac23acbbefb03950 100644 (file)
--- 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 5404741cfefea14713f64c1f1fbb35ee8a5fba47..1ddc29573e7db0a45ac79e3807a22eee02c7e73a 100644 (file)
--- 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 f07b0a4b2b7520b5093ecd2a79280b67a6591949..08bf34a5ffd5f809f936a6f59847205977883560 100644 (file)
--- 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 c82cadf8bfeab922acfcfc6e13f9efc578554e0d..8e7eb18ab85d2e55c0ae014bbf7a5eb9494b4cd2 100644 (file)
--- 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 cd13e775123433934dd00702ce6b9bd067258713..f89a45c7906955036c9181ec02e560f57a15accd 100644 (file)
--- 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 085dc6e47f280da58f1d5dbd1bad347c251d473f..8bcbd83aa0a85e47dd411e552e8e4ab2ca816ce8 100644 (file)
--- 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<const wxMenuItem*>(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 f47f5d2ee5058a652ff79aa5663f481ae3d394b9..3f8db0640b83172ee1b5fd336267d19f2a2dbff3 100644 (file)
--- 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 eba71c427b702ac768ec95124910bcbcc8b27523..727475792103bc3166e0ba14cd60a897758a9725 100644 (file)
--- 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 f0dc626bdd1eb7852a6f1f3f2e305fdf28814818..111a44c494ecb86d19434facbd4667a6992f8168 100644 (file)
--- 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 57e7fda1c5709a5c1834db8f1aa2c112a5a06bc7..b1d27062f11e527a3fd1d14781bce54e815a1086 100644 (file)
--- 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 68ccc97db4402d4a3d0a9b8dcc6d75bd0ff24b68..0b88fbed9ad9827d5a4a9fdc4d06954a3d0b4f83 100644 (file)
--- 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 ed3e0f8d58c6c6a47dcb56068c930f418026999d..2e7413b2ce33c600c2d51624a00ccc39f1dee2ca 100644 (file)
--- 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 c185b0e9e0b3dda91ca036f1a21c41d5114d27a2..54979806398664bbd8a86ea96b7a3f1f17c13e6b 100644 (file)
--- 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 12d8b4a3211921d26aafe53d9c2d658b86925547..ee8530d61525cc5572fcd97c63d07569d70e1c08 100644 (file)
--- 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() :