Include wx/menuitem.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

include/wx/wx.h

@@ -44,6 +44,7 @@
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/button.h"
+#include "wx/menuitem.h"
 #include "wx/menu.h"
 #include "wx/pen.h"
 #include "wx/brush.h"

src/cocoa/menuitem.mm

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/cocoa/menuitem.mm
 // Purpose:     wxMenuItem implementation
 // Author:      David Elliott
 // Modified by:
@@ -18,9 +18,13 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
+
+#if wxUSE_MENUS
+
+#include "wx/menuitem.h"
+
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
-    #include "wx/menuitem.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/log.h"
@@ -36,8 +40,6 @@
 #import <AppKit/NSCell.h> // NSOnState, NSOffState
 #import <AppKit/NSEvent.h> // modifier key masks
 
-#if wxUSE_MENUS
-
 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------

src/mac/carbon/frame.cpp

@@ -21,10 +21,9 @@
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
-#include "wx/menuitem.h"
-
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

src/mac/carbon/menu.cpp

@@ -26,11 +26,9 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
+    #include "wx/menuitem.h"
 #endif
 
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
 #include "wx/mac/uma.h"
 
 // other standard headers

src/mac/carbon/window.cpp

@@ -32,10 +32,10 @@
     #include "wx/toolbar.h"
     #include "wx/layout.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/tooltip.h"
-#include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 

src/mac/classic/frame.cpp

@@ -21,10 +21,9 @@
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
-#include "wx/menuitem.h"
-
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

src/mac/classic/menu.cpp

@@ -26,10 +26,9 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
+    #include "wx/menuitem.h"
 #endif
 
-#include "wx/menuitem.h"
-
 #include "wx/mac/uma.h"
 
 // other standard headers

src/mac/classic/window.cpp

@@ -31,12 +31,12 @@
     #include "wx/listbox.h"
     #include "wx/layout.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"
-#include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 

src/motif/menu.cpp

@@ -28,10 +28,9 @@
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
+    #include "wx/menuitem.h"
 #endif
 
-#include "wx/menuitem.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #define XtDisplay XTDISPLAY

src/motif/window.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/motif/windows.cpp
+// Name:        src/motif/window.cpp
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
@@ -39,10 +39,10 @@
     #include "wx/settings.h"
     #include "wx/scrolwin.h"
     #include "wx/layout.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/menuitem.h"
 #include "wx/evtloop.h"
 
 #if  wxUSE_DRAG_AND_DROP

src/msw/frame.cpp

@@ -38,6 +38,7 @@
     #include "wx/log.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -53,8 +54,6 @@
 
 #include "wx/generic/statusbr.h"
 
-#include "wx/menuitem.h"
-
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
     #include "wx/univ/colschem.h"

src/msw/ownerdrw.cpp

@@ -25,10 +25,10 @@
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/ownerdrw.h"
-#include "wx/menuitem.h"
 #include "wx/fontutil.h"
 #include "wx/module.h"
 

src/msw/window.cpp

@@ -47,6 +47,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
+    #include "wx/menuitem.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@@ -74,8 +75,6 @@
     #endif
 #endif
 
-#include "wx/menuitem.h"
-
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS

src/os2/frame.cpp

@@ -31,14 +31,13 @@
     #include "wx/mdi.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #include "wx/generic/statusbr.h"
 
-#include "wx/menuitem.h"
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------

src/os2/ownerdrw.cpp

@@ -23,11 +23,10 @@
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/ownerdrw.h"
-#include "wx/menuitem.h"
-
 
 // ============================================================================
 // implementation of wxOwnerDrawn class

src/os2/window.cpp

@@ -47,6 +47,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
+    #include "wx/menuitem.h"
     #include <stdio.h>
 #endif
 
@@ -58,8 +59,6 @@
     #include "wx/dnd.h"
 #endif
 
-#include "wx/menuitem.h"
-
 #include "wx/os2/private.h"
 
 #if wxUSE_TOOLTIPS

src/palmos/frame.cpp

@@ -38,12 +38,11 @@
     #include "wx/log.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
 #include "wx/generic/statusbr.h"
 
-#include "wx/menuitem.h"
-
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
     #include "wx/univ/colschem.h"

src/palmos/ownerdrw.cpp

@@ -24,10 +24,10 @@
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/ownerdrw.h"
-#include "wx/menuitem.h"
 #include "wx/fontutil.h"
 #include "wx/module.h"
 

src/palmos/window.cpp

@@ -45,6 +45,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/textctrl.h"
+    #include "wx/menuitem.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@@ -61,8 +62,6 @@
     #include "wx/access.h"
 #endif
 
-#include "wx/menuitem.h"
-
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif

src/x11/window.cpp

@@ -45,10 +45,10 @@
     #include "wx/listbox.h"
     #include "wx/scrolwin.h"
     #include "wx/layout.h"
+    #include "wx/menuitem.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/menuitem.h"
 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"