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

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

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index 4dc296399820fa749bcaf125966b9cc505c50488..59cd8dea7fea304137f4affa5b1d526c2f68bf1a 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -10,10 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/brush.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
-    #include "wx/brush.h"
 #endif //WX_PRECOMP
+
 #include "wx/colour.h"
 
 #import <AppKit/NSColor.h>

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index b323e03a1b844668729b1c60e230a016fe45f261..65f93c999673e7aab47b601b81b7fdf0471dc5f9 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -29,9 +29,9 @@
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/pen.h"
+    #include "wx/brush.h"
 #endif
 
-#include "wx/brush.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index cf9ec7f9dc658c0ff4b3a5ad8c7d683c3f8ba91a..441eac5ef1cec7d213acacfff1478a3864d022d4 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -23,10 +23,10 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/pen.h"
+    #include "wx/brush.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index e1d1cbee1f57324de5e4e6ef4df5c0c46b36ae84..d73df4365aa02dbf9a5bc1240af50615226186a4 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -27,10 +27,10 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/pen.h"
+    #include "wx/brush.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/palette.h"

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index cf939a5ff25fc6ed5872740ac8959aae16708195..5e49333dc036dd26480766b4d759118d1014b017 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -24,11 +24,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/brush.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/brush.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 18c6b0da34509f7c8ff9d8e8f93c2b9a92019ded..2648bd802455fccd4cdc86455c78684e06acfcad 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -34,9 +34,9 @@
     // for wxEVT_COMMAND_TEXT_ENTER
     #include "wx/textctrl.h"
     #include "wx/app.h"
+    #include "wx/brush.h"
 #endif
 
-#include "wx/brush.h"
 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 

diff --git a/src/palmos/combobox.cpp b/src/palmos/combobox.cpp
index 2a0c230f7180d418602a2f7e7cabe5b7d47a72a2..9ede2abaf1ea3ac5c7366431a982f6488aed285e 100644 (file)
--- a/src/palmos/combobox.cpp
+++ b/src/palmos/combobox.cpp
@@ -26,15 +26,16 @@
 
 #if wxUSE_COMBOBOX
 
+#include "wx/combobox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/log.h"
     // for wxEVT_COMMAND_TEXT_ENTER
     #include "wx/textctrl.h"
+    #include "wx/brush.h"
 #endif
 
-#include "wx/combobox.h"
-#include "wx/brush.h"
 #include "wx/clipbrd.h"
 #include "wx/palmos/private.h"
 
@@ -280,4 +281,3 @@ bool wxComboBox::CanRedo() const
 
 
 #endif // wxUSE_COMBOBOX
-