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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 59bda754d392d01e03a45ffb3066ec791b8bdf18..e50e3f9fc73da325575f4483e76a0788849d3004 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -34,6 +34,7 @@
 #include "wx/toplevel.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/toplevel.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"

+#include "wx/colour.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index 59cd8dea7fea304137f4affa5b1d526c2f68bf1a..de0760c16a9d801bbe581f609084ba16fa03a1b2 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/colour.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/colour.h"
-

 #import <AppKit/NSColor.h>
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 #import <AppKit/NSColor.h>
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index 6ebb658ccde6c8c2c0c62cc5ee2bfdc17b9a9659..d133d90fcb1a219376afcc8f5093fbaf5ba9bbba 100644 (file)
--- a/src/cocoa/pen.mm
+++ b/src/cocoa/pen.mm
@@ -14,10 +14,9 @@
 #ifndef WX_PRECOMP
     #include "wx/pen.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/pen.h"
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/colour.h"
-

 #import <AppKit/NSColor.h>
 
 // ========================================================================
 #import <AppKit/NSColor.h>
 
 // ========================================================================

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index bd0a76b366be6c70e4f389f04e88db229b7cd4e3..a81555a5cc105b8c7afb3a67fcb02eca8772a798 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -27,9 +27,9 @@
     #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"

 #include "wx/font.h"
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 #include "wx/font.h"
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 3d4549539f78738f0d508de042b949add2b8e8c8..d1223107d4cf7d3559138d69c8fde6033f3cdcfb 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 3c28dee504b8843cd7836afcc640aee011081eba..1a49e90d9024b5aef1caee4c0625ff34f95bef48 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -19,9 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"

+    #include "wx/colour.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/colour.h"

 #include "wx/module.h"
 
 extern "C"
 #include "wx/module.h"
 
 extern "C"

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 26e47769b10191540e55c1b123980c74154a6d54..498f38025d824acafccfcd34be884bb0dc8f3a7e 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index d07c3ed0f7dcf08c1c6668e1892cee2e14b2ed9c..392418c11e77db11adc06a6ce59e42df63b8073f 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 6fa3c8444b0c06d70049bd2eeb953f746e9174b7..ec920d0800d87f4885b3fad3b86d8e95c7a7460e 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -19,9 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"

+    #include "wx/colour.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/colour.h"

 #include "wx/module.h"
 
 extern "C"
 #include "wx/module.h"
 
 extern "C"

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index b88a212c19ec02b2c998e90755a02625a80504e1..53464758d119455e813ac6bb52824eefebeb1f56 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index ed4aaab49625f60ebfde36944b82d90361bf5825..6686cb9cba08f95b2fd03173ab609d701da19fe2 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -18,10 +18,10 @@
 #include "wx/html/htmltag.h"
 
 #ifndef WXPRECOMP
 #include "wx/html/htmltag.h"
 
 #ifndef WXPRECOMP

+    #include "wx/colour.h"

 #endif
 
 #include "wx/html/htmlpars.h"
 #endif
 
 #include "wx/html/htmlpars.h"

-#include "wx/colour.h"

 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 
 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index 504aeabf0c70329d257542060aeffef043ef49f0..4232f86476e39ede8f4994d8236da9019e2e1e0e 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/colour.h"
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#include "wx/colour.h"
+

 #include "wx/gdicmn.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #include "wx/gdicmn.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index bc20908091ee573f7ff5fe4a0ea5ca65d8a38806..35f6247489365cfa544a65573f1e20f80481856b 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"

 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 465cf23591c3d4a5bb8e2ef58cd26e2cdbb9e31a..b0e7a2be4e328a1c8a7f2afe33ce75282d6b063c 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -14,7 +14,11 @@
 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+

 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/module.h"

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index b48c44724f6ee3adc00eb0748bcd77b4fb0a5d30..8d667f730e86f9ac6d70e55f65ae22e8d1705463 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/colour.h"
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#include "wx/colour.h"
+

 #include "wx/gdicmn.h"
 #include "wx/msw/private.h"
 
 #include "wx/gdicmn.h"
 #include "wx/msw/private.h"
 

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index e17acfbe359f5ce1d7751b6aff4f5c39eb580047..b9f6e93e02ecaa86cbe7d5ffa6677ddf13eba069 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -29,9 +29,9 @@
     #include "wx/settings.h"
     #include "wx/listbox.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/listbox.h"
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"

 #include "wx/font.h"
 #include "wx/ownerdrw.h"
 
 #include "wx/font.h"
 #include "wx/ownerdrw.h"
 

diff --git a/src/palmos/colour.cpp b/src/palmos/colour.cpp
index 750742787f27e48caca6887f070cf38ad8e10267..c028e61493f6276a0e1eca29fc5c4ed78760b509 100644 (file)
--- a/src/palmos/colour.cpp
+++ b/src/palmos/colour.cpp
@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/colour.h"
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#include "wx/colour.h"
+

 #include "wx/gdicmn.h"
 
 #include <string.h>
 #include "wx/gdicmn.h"
 
 #include <string.h>

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index 12822c183dfec20355a9aeaa7634637c12e966ad..685c12b74740aca2040390b46239cc47085bea45 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"
-

 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index a6497da9275a56038834cdefac4c5f7065d8a552..23cf2ca01e3f0439131e304a67753e8669f422ea 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"

+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"
-

 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------