From d6eb3ff8a1a25e54aa9269ff3da25969f9681ae0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 19 Jan 2012 15:01:01 +0000 Subject: [PATCH] solving include order problems for stl and xti git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/anybutton.mm | 5 +++-- src/osx/cocoa/button.mm | 5 +++-- src/osx/cocoa/dnd.mm | 4 ++++ src/osx/cocoa/toolbar.mm | 3 +-- src/osx/uiaction_osx.cpp | 6 +++++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/osx/cocoa/anybutton.mm b/src/osx/cocoa/anybutton.mm index c90127bcea..866866f350 100644 --- a/src/osx/cocoa/anybutton.mm +++ b/src/osx/cocoa/anybutton.mm @@ -10,11 +10,12 @@ #include "wx/wxprec.h" -#include "wx/button.h" - #ifndef WX_PRECOMP +#include "wx/object.h" #endif +#include "wx/button.h" + #include "wx/osx/private.h" wxSize wxAnyButton::DoGetBestSize() const diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm index 3e4288ba8e..8ed183958e 100644 --- a/src/osx/cocoa/button.mm +++ b/src/osx/cocoa/button.mm @@ -11,11 +11,12 @@ #include "wx/wxprec.h" -#include "wx/button.h" - #ifndef WX_PRECOMP +#include "wx/object.h" #endif +#include "wx/button.h" + #include "wx/osx/private.h" #if wxUSE_MARKUP diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm index ecfa2e2b91..c697420bd8 100644 --- a/src/osx/cocoa/dnd.mm +++ b/src/osx/cocoa/dnd.mm @@ -11,6 +11,10 @@ #include "wx/wxprec.h" +#ifndef WX_PRECOMP +#include "wx/object.h" +#endif + #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index dd7894fa60..a253e011aa 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -13,12 +13,11 @@ #if wxUSE_TOOLBAR -#include "wx/toolbar.h" - #ifndef WX_PRECOMP #include "wx/wx.h" #endif +#include "wx/toolbar.h" #include "wx/app.h" #include "wx/osx/private.h" #include "wx/geometry.h" diff --git a/src/osx/uiaction_osx.cpp b/src/osx/uiaction_osx.cpp index 60cd4da9d8..2819bca848 100644 --- a/src/osx/uiaction_osx.cpp +++ b/src/osx/uiaction_osx.cpp @@ -11,7 +11,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" +#include "wx/wxprec.h" + +#ifndef WX_PRECOMP +#include "wx/object.h" +#endif #if wxUSE_UIACTIONSIMULATOR -- 2.45.2