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

diff --git a/src/osx/cocoa/anybutton.mm b/src/osx/cocoa/anybutton.mm
index c90127bcea52ac6a2e72db970446a836cae8d8db..866866f3501885c3b6b79df07da00dc5b95a6d6f 100644 (file)
--- a/src/osx/cocoa/anybutton.mm
+++ b/src/osx/cocoa/anybutton.mm
@@ -10,11 +10,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/button.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+#include "wx/object.h"

 #endif
 
 #endif
 

+#include "wx/button.h"
+

 #include "wx/osx/private.h"
 
 wxSize wxAnyButton::DoGetBestSize() const
 #include "wx/osx/private.h"
 
 wxSize wxAnyButton::DoGetBestSize() const

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 3e4288ba8e4debc5134e0aa92857aa3b6e273cb5..8ed183958e6d1dee3ddc97eaf4698801e7fd596e 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -11,11 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/button.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+#include "wx/object.h"

 #endif
 
 #endif
 

+#include "wx/button.h"
+

 #include "wx/osx/private.h"
 
 #if wxUSE_MARKUP
 #include "wx/osx/private.h"
 
 #if wxUSE_MARKUP

diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm
index ecfa2e2b916489a4fc01626588caa5c0f965417e..c697420bd81d6c0c113a273605de146fb07d98b9 100644 (file)
--- a/src/osx/cocoa/dnd.mm
+++ b/src/osx/cocoa/dnd.mm
@@ -11,6 +11,10 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#ifndef WX_PRECOMP
+#include "wx/object.h"
+#endif
+

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index dd7894fa6076c7f28ca1d0599d0636013531c558..a253e011aa3a11dd49d544448b277117e69730ec 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -13,12 +13,11 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

-#include "wx/toolbar.h"
-

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
 #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"
 #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 60cd4da9d8d6edc2556508835e0ee00b8304847c..2819bca848de13852f864c3b5f20e6af6f0b2d5c 100644 (file)
--- a/src/osx/uiaction_osx.cpp
+++ b/src/osx/uiaction_osx.cpp
@@ -11,7 +11,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/object.h"
+#endif

 
 #if wxUSE_UIACTIONSIMULATOR
 
 
 #if wxUSE_UIACTIONSIMULATOR