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

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 065d1851ad0b70318d0d4406bdef420fcd008a97..d2aff268ff43ee0bdc4403582778b184ca0a6563 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -26,9 +26,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/palette.h"
 #endif // WX_PRECOMP
 
-#include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/module.h"

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 65f93c999673e7aab47b601b81b7fdf0471dc5f9..158de63121ff05e39e801ea15f0f6a85438dacff 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -30,13 +30,13 @@
     #include "wx/dc.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
+    #include "wx/palette.h"
 #endif
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
-#include "wx/palette.h"
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 695375657ce5bf68dcf0d77ef9049a11f78786a3..b5936f21fb74430668eda7f2d254548ee5d34910 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -37,14 +37,15 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE
+
+#include "wx/quantize.h"
+
 #ifndef WX_PRECOMP
     #include "wx/palette.h"
 #endif
 
-#if wxUSE_IMAGE
-
 #include "wx/image.h"
-#include "wx/quantize.h"
 
 #ifdef __WXMSW__
 #include "wx/msw/private.h"

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e405233ceb1fe4cba3b165a06185355f15e8730a..32acc4f1376dec0ef1432ffc5c14d86d3e632b6d 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -10,13 +10,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/bitmap.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/palette.h"
 #endif
 
-#include "wx/bitmap.h"
-#include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 492e8751bb0186f950a96d90dcd6f6e72a6cf0c0..9cf27b8065a8b24d02607cd2adceccda84c3f96c 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/palette.h"
 #endif // WX_PRECOMP
 
-#include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 441eac5ef1cec7d213acacfff1478a3864d022d4..8521da8756f0e796ccb6c47236a8c5a7bba1a7c3 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -24,12 +24,12 @@
     #include "wx/menu.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
+    #include "wx/palette.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
-#include "wx/palette.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index d73df4365aa02dbf9a5bc1240af50615226186a4..f9465f986565cba0c4745962bb2a98f00b37bf15 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -28,12 +28,12 @@
     #include "wx/menu.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
+    #include "wx/palette.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
-#include "wx/palette.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index c958a25a2a5dee0d9022a3d04080f0002df552f2..aeb874150e0a8495e467ac1c0bc7c0c5ba631ccf 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -18,8 +18,9 @@
 
 #if wxUSE_PALETTE
 
+#include "wx/palette.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/palette.h"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/palmos/palette.cpp b/src/palmos/palette.cpp
index f89c8b4eae0bd85380b9c73022e1e1be406a815f..51ac2c83a02d75825d0463c3b1dd02e4da58b48c 100644 (file)
--- a/src/palmos/palette.cpp
+++ b/src/palmos/palette.cpp
@@ -18,8 +18,9 @@
 
 #if wxUSE_PALETTE
 
+#include "wx/palette.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/palette.h"
 #endif
 
 #include "wx/palmos/private.h"