From 559a723c1dcf8b3929ab3122fb04429d4abdda8e Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Sat, 20 May 2006 19:43:09 +0000 Subject: [PATCH] Include wx/palette.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/bmpbase.cpp | 2 +- src/common/gdicmn.cpp | 2 +- src/common/quantize.cpp | 7 ++++--- src/gtk/bitmap.cpp | 5 +++-- src/gtk1/bitmap.cpp | 2 +- src/mac/carbon/app.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/msw/palette.cpp | 3 ++- src/palmos/palette.cpp | 3 ++- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 065d1851ad..d2aff268ff 100644 --- 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 65f93c9996..158de63121 100644 --- 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 695375657c..b5936f21fb 100644 --- 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 e405233ceb..32acc4f137 100644 --- 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 492e8751bb..9cf27b8065 100644 --- 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 441eac5ef1..8521da8756 100644 --- 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 d73df4365a..f9465f9865 100644 --- 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 c958a25a2a..aeb874150e 100644 --- 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 f89c8b4eae..51ac2c83a0 100644 --- 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" -- 2.45.2