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

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

include/wx/wx.h

@@ -34,6 +34,7 @@
 #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"

src/cocoa/brush.mm

@@ -15,9 +15,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
-#endif //WX_PRECOMP
-
     #include "wx/colour.h"
+#endif //WX_PRECOMP
 
 #import <AppKit/NSColor.h>
 

src/cocoa/pen.mm

@@ -14,9 +14,8 @@
 #ifndef WX_PRECOMP
     #include "wx/pen.h"
     #include "wx/bitmap.h"
-#endif //WX_PRECOMP
-
     #include "wx/colour.h"
+#endif //WX_PRECOMP
 
 #import <AppKit/NSColor.h>
 

src/common/gdicmn.cpp

@@ -27,9 +27,9 @@
     #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
+    #include "wx/colour.h"
 #endif
 
-#include "wx/colour.h"
 #include "wx/font.h"
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;

src/gtk/brush.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"
+
+#ifndef WX_PRECOMP
     #include "wx/colour.h"
+#endif
 
 #include <gdk/gdk.h>
 

src/gtk/glcanvas.cpp

@@ -19,9 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/colour.h"
 #endif // WX_PRECOMP
 
-#include "wx/colour.h"
 #include "wx/module.h"
 
 extern "C"

src/gtk/pen.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"
+
+#ifndef WX_PRECOMP
     #include "wx/colour.h"
+#endif
 
 #include <gdk/gdk.h>
 

src/gtk1/brush.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"
+
+#ifndef WX_PRECOMP
     #include "wx/colour.h"
+#endif
 
 #include <gdk/gdk.h>
 

src/gtk1/glcanvas.cpp

@@ -19,9 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/colour.h"
 #endif // WX_PRECOMP
 
-#include "wx/colour.h"
 #include "wx/module.h"
 
 extern "C"

src/gtk1/pen.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"
+
+#ifndef WX_PRECOMP
     #include "wx/colour.h"
+#endif
 
 #include <gdk/gdk.h>
 

src/html/htmltag.cpp

@@ -18,10 +18,10 @@
 #include "wx/html/htmltag.h"
 
 #ifndef WXPRECOMP
+    #include "wx/colour.h"
 #endif
 
 #include "wx/html/htmlpars.h"
-#include "wx/colour.h"
 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 

src/mgl/colour.cpp

@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/colour.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#include "wx/colour.h"
+
 #include "wx/gdicmn.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

src/mgl/pen.cpp

@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
+    #include "wx/colour.h"
 #endif
 
-#include "wx/colour.h"
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------

src/mgl/settings.cpp

@@ -14,7 +14,11 @@
 #endif
 
 #include "wx/settings.h"
+
+#ifndef WX_PRECOMP
     #include "wx/colour.h"
+#endif
+
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/module.h"

src/msw/colour.cpp

@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/colour.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#include "wx/colour.h"
+
 #include "wx/gdicmn.h"
 #include "wx/msw/private.h"
 

src/os2/checklst.cpp

@@ -29,9 +29,9 @@
     #include "wx/settings.h"
     #include "wx/listbox.h"
     #include "wx/bitmap.h"
+    #include "wx/colour.h"
 #endif
 
-#include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/ownerdrw.h"
 

src/palmos/colour.cpp

@@ -12,12 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/colour.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#include "wx/colour.h"
+
 #include "wx/gdicmn.h"
 
 #include <string.h>

src/x11/brush.cpp

@@ -17,9 +17,8 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"
-#endif
-
     #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxBrush

src/x11/pen.cpp

@@ -17,9 +17,8 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/bitmap.h"
-#endif
-
     #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxPen