From 25466131acbbca2186d01fb852d61f50ba968fb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 19 Jun 2006 07:12:50 +0000 Subject: [PATCH] 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 | 1 + src/cocoa/menuitem.mm | 10 ++++++---- src/mac/carbon/frame.cpp | 3 +-- src/mac/carbon/menu.cpp | 4 +--- src/mac/carbon/window.cpp | 2 +- src/mac/classic/frame.cpp | 3 +-- src/mac/classic/menu.cpp | 3 +-- src/mac/classic/window.cpp | 2 +- src/motif/menu.cpp | 3 +-- src/motif/window.cpp | 4 ++-- src/msw/frame.cpp | 3 +-- src/msw/ownerdrw.cpp | 2 +- src/msw/window.cpp | 3 +-- src/os2/frame.cpp | 3 +-- src/os2/ownerdrw.cpp | 3 +-- src/os2/window.cpp | 3 +-- src/palmos/frame.cpp | 3 +-- src/palmos/ownerdrw.cpp | 2 +- src/palmos/window.cpp | 3 +-- src/x11/window.cpp | 2 +- 20 files changed, 26 insertions(+), 36 deletions(-) diff --git a/include/wx/wx.h b/include/wx/wx.h index 5f6ef4a99f..9bcc46f7f4 100644 --- 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 c1248355e8..140e2ead44 100644 --- 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 // NSOnState, NSOffState #import // modifier key masks -#if wxUSE_MENUS - // ---------------------------------------------------------------------------- // functions prototypes // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index f842f5bae8..64a2eea64b 100644 --- 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 e59bb00f77..1b7571af3d 100644 --- 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 f93ae305b3..7b4445cc30 100644 --- 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 97fb4ed367..8b2b03b8b5 100644 --- 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 70287633ae..a075a91e7c 100644 --- 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 47b675ade2..1015c2ff60 100644 --- 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 d40bdc74bf..0831f46864 100644 --- 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 0d8d174394..d5b4b71854 100644 --- 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 42a71529a7..800cd97d86 100644 --- 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 94eca7820c..e30c64687e 100644 --- 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 4dcdf623f0..f57fe1e2b3 100644 --- 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 f08d1f2d86..18399f06ec 100644 --- 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 609253e30a..64abe8b8ce 100644 --- 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 068003159d..c295593ddf 100644 --- 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 #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 ad66236bf5..827dd5a307 100644 --- 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 414718895a..939e416970 100644 --- 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 26f50b4135..2839a44221 100644 --- 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 dcd3dffb80..7c5cc615f2 100644 --- 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" -- 2.47.2