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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 5f6ef4a99f1fd65015ece4ab3dabab0882509323..9bcc46f7f4347bc3a86473889173d12ce07b9bb7 100644 (file)
--- a/include/wx/wx.h
+++ b/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"

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index c1248355e83151afaef4b19b7abf57afe8ee6ab2..140e2ead441e98b323076ad265bf430ce8856e0f 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index f842f5bae81664e3464ea330e03e3d947bfde74e..64a2eea64bddc06013ada75f1b91df8c1b0c52c3 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/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;

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index e59bb00f778929f145bdd9533c17d97ae8135c14..1b7571af3d40bb24ff1a4508b43a30d7686ffacf 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index f93ae305b30b70067362a3cfce83addb269d886d..7b4445cc308a214b1d2372cdfbc3532a901be7d8 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/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"
 

diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index 97fb4ed367f363874121d9afb88596cc33191c02..8b2b03b8b58034ed62b11aac7cc933550af557e0 100644 (file)
--- a/src/mac/classic/frame.cpp
+++ b/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;

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 70287633aec16133ccb3b5d8c4dd7b6bc416fbeb..a075a91e7cff226aa3b796c141fe59d2c767a2f2 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/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

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 47b675ade29a5d2d272e1bef01632e3a2560994a..1015c2ff601736f22b61eddd1a872f47aa571ca4 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/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"
 

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index d40bdc74bffe38ef7d2287640a52857c37bb28d5..0831f468640ab1f57bd139d289dc6800c66a4306 100644 (file)
--- a/src/motif/menu.cpp
+++ b/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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 0d8d17439472ba0954a0477989de68d1a6536260..d5b4b718541e690c12fbd59d15d741cf065667b7 100644 (file)
--- a/src/motif/window.cpp
+++ b/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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 42a71529a7e7a3b2c8b6b399e45824d9e9f41c9e..800cd97d862c93fdfd0097c589608b6fdf389e47 100644 (file)
--- a/src/msw/frame.cpp
+++ b/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"

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 94eca7820cb06e7ed7e3c99c2315bea638295ff0..e30c64687e3caa725636674384738dc8661cba43 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/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"
 

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4dcdf623f0e0278dbcb4fafabaa658a446948c92..f57fe1e2b383d4bb1844ebfa7da0e81f035702a0 100644 (file)
--- a/src/msw/window.cpp
+++ b/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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index f08d1f2d8600f1b07f0029c0a7c8887bea262f1e..18399f06ece2486a3a79eef06e7c06f7cafe9c4a 100644 (file)
--- a/src/os2/frame.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 609253e30abae7c95372375cc225d30cc59fc844..64abe8b8ce8e052932f05817935eb83a6dfa79a4 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 068003159de052a26552ba6b451bc0f7ac722a1f..c295593ddfe41759221f062065ce0e37f833c0bc 100644 (file)
--- a/src/os2/window.cpp
+++ b/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

diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp
index ad66236bf54dd1f4264bcd358c4002e0a16b132a..827dd5a3077310907691e0136a6cf902510f04ce 100644 (file)
--- a/src/palmos/frame.cpp
+++ b/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"

diff --git a/src/palmos/ownerdrw.cpp b/src/palmos/ownerdrw.cpp
index 414718895ae10f414f5fee94ac6e57deab9151e4..939e416970c56a6b65edce8c2226a350adfb4f5d 100644 (file)
--- a/src/palmos/ownerdrw.cpp
+++ b/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"
 

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index 26f50b413504880adaff58b58d97cf422f4d2e05..2839a44221c91991e54b17d0c865851e1ea657d9 100644 (file)
--- a/src/palmos/window.cpp
+++ b/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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index dcd3dffb8076c30458d9f1e260466bd11a607c7d..7c5cc615f21c2869ffb4623a8459a3769ec73b1d 100644 (file)
--- a/src/x11/window.cpp
+++ b/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"