From 7cf41a5d66bec0a1297f1417852647aa353a148f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 14 Jun 2006 17:09:39 +0000 Subject: [PATCH] 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 | 1 + src/cocoa/brush.mm | 3 +-- src/cocoa/pen.mm | 3 +-- src/common/gdicmn.cpp | 2 +- src/gtk/brush.cpp | 5 ++++- src/gtk/glcanvas.cpp | 2 +- src/gtk/pen.cpp | 5 ++++- src/gtk1/brush.cpp | 5 ++++- src/gtk1/glcanvas.cpp | 2 +- src/gtk1/pen.cpp | 5 ++++- src/html/htmltag.cpp | 2 +- src/mgl/colour.cpp | 4 ++-- src/mgl/pen.cpp | 2 +- src/mgl/settings.cpp | 6 +++++- src/msw/colour.cpp | 4 ++-- src/os2/checklst.cpp | 2 +- src/palmos/colour.cpp | 4 ++-- src/x11/brush.cpp | 3 +-- src/x11/pen.cpp | 3 +-- 19 files changed, 38 insertions(+), 25 deletions(-) diff --git a/include/wx/wx.h b/include/wx/wx.h index 59bda754d3..e50e3f9fc7 100644 --- 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/colour.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 59cd8dea7f..de0760c16a 100644 --- a/src/cocoa/brush.mm +++ b/src/cocoa/brush.mm @@ -15,10 +15,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/colour.h" #endif //WX_PRECOMP -#include "wx/colour.h" - #import class WXDLLEXPORT wxBrushRefData: public wxGDIRefData diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm index 6ebb658ccd..d133d90fcb 100644 --- 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" + #include "wx/colour.h" #endif //WX_PRECOMP -#include "wx/colour.h" - #import // ======================================================================== diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index bd0a76b366..a81555a5cc 100644 --- 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/colour.h" #endif -#include "wx/colour.h" #include "wx/font.h" WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index 3d4549539f..d1223107d4 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/brush.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index 3c28dee504..1a49e90d90 100644 --- 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" + #include "wx/colour.h" #endif // WX_PRECOMP -#include "wx/colour.h" #include "wx/module.h" extern "C" diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index 26e47769b1..498f38025d 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/pen.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index d07c3ed0f7..392418c11e 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/brush.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index 6fa3c8444b..ec920d0800 100644 --- 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" + #include "wx/colour.h" #endif // WX_PRECOMP -#include "wx/colour.h" #include "wx/module.h" extern "C" diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index b88a212c19..53464758d1 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/pen.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index ed4aaab496..6686cb9cba 100644 --- a/src/html/htmltag.cpp +++ b/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 // for vsscanf #include diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp index 504aeabf0c..4232f86476 100644 --- 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" -#include "wx/colour.h" - #ifdef __BORLANDC__ #pragma hdrstop #endif +#include "wx/colour.h" + #include "wx/gdicmn.h" IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index bc20908091..35f6247489 100644 --- a/src/mgl/pen.cpp +++ b/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" //----------------------------------------------------------------------------- diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index 465cf23591..b0e7a2be4e 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -14,7 +14,11 @@ #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" diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index b48c44724f..8d667f730e 100644 --- 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" -#include "wx/colour.h" - #ifdef __BORLANDC__ #pragma hdrstop #endif +#include "wx/colour.h" + #include "wx/gdicmn.h" #include "wx/msw/private.h" diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index e17acfbe35..b9f6e93e02 100644 --- 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/colour.h" #endif -#include "wx/colour.h" #include "wx/font.h" #include "wx/ownerdrw.h" diff --git a/src/palmos/colour.cpp b/src/palmos/colour.cpp index 750742787f..c028e61493 100644 --- 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" -#include "wx/colour.h" - #ifdef __BORLANDC__ #pragma hdrstop #endif +#include "wx/colour.h" + #include "wx/gdicmn.h" #include diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index 12822c183d..685c12b747 100644 --- 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" + #include "wx/colour.h" #endif -#include "wx/colour.h" - //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index a6497da927..23cf2ca01e 100644 --- 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" + #include "wx/colour.h" #endif -#include "wx/colour.h" - //----------------------------------------------------------------------------- // wxPen //-----------------------------------------------------------------------------