From c64755ed1ad825e3a5b6ddc71bc77e8f25fc5999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 19 May 2006 19:47:45 +0000 Subject: [PATCH] Include wx/brush.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/brush.mm | 5 ++++- src/common/gdicmn.cpp | 2 +- src/mac/carbon/app.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/msw/brush.cpp | 3 ++- src/msw/combobox.cpp | 2 +- src/palmos/combobox.cpp | 6 +++--- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm index 4dc2963998..59cd8dea7f 100644 --- 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 diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index b323e03a1b..65f93c9996 100644 --- 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 cf9ec7f9dc..441eac5ef1 100644 --- 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 e1d1cbee1f..d73df4365a 100644 --- 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 cf939a5ff2..5e49333dc0 100644 --- 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 18c6b0da34..2648bd8024 100644 --- 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 2a0c230f71..9ede2abaf1 100644 --- 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 -