From 0bca03736369e836cce9297509505c5972e775dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 14 Jun 2006 10:02:19 +0000 Subject: [PATCH] Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wx.h | 1 + src/cocoa/bitmap.mm | 8 +++++--- src/cocoa/icon.mm | 3 +-- src/cocoa/pen.mm | 4 +++- src/common/appcmn.cpp | 1 - src/common/ctrlcmn.cpp | 5 +---- src/common/fs_mem.cpp | 20 +++++++++++--------- src/common/gdicmn.cpp | 2 +- src/common/imagbmp.cpp | 2 +- src/common/image.cpp | 5 +++-- src/common/imagjpeg.cpp | 3 +-- src/common/imagpng.cpp | 5 +++-- src/common/imagtiff.cpp | 13 ++++++------- src/common/rgncmn.cpp | 8 +------- src/gtk/menu.cpp | 3 +-- src/gtk/notebook.cpp | 2 +- src/gtk1/menu.cpp | 3 +-- src/gtk1/notebook.cpp | 2 +- src/mac/carbon/bmpbuttn.cpp | 4 ++-- src/mac/carbon/clipbrd.cpp | 2 +- src/mac/carbon/toolbar.cpp | 2 -- src/mac/classic/bmpbuttn.cpp | 2 +- src/mac/classic/clipbrd.cpp | 2 +- src/mac/classic/toolbar.cpp | 1 - src/mgl/pen.cpp | 6 +++++- src/motif/clipbrd.cpp | 2 +- src/motif/utils.cpp | 2 +- src/msw/bitmap.cpp | 3 ++- src/msw/dib.cpp | 2 +- src/msw/gdiimage.cpp | 2 +- src/os2/checklst.cpp | 2 +- src/palmos/dib.cpp | 2 +- src/palmos/gdiimage.cpp | 2 +- src/univ/topluniv.cpp | 2 +- src/unix/taskbarx11.cpp | 2 +- src/x11/brush.cpp | 2 +- src/x11/pen.cpp | 2 +- src/x11/utilsx.cpp | 23 ++++++++++++++--------- src/xrc/xh_bmp.cpp | 9 ++++++--- src/xrc/xmlres.cpp | 4 ++-- 40 files changed, 87 insertions(+), 83 deletions(-) diff --git a/include/wx/wx.h b/include/wx/wx.h index 2ce5db4d08..59bda754d3 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -33,6 +33,7 @@ #include "wx/panel.h" #include "wx/toplevel.h" #include "wx/frame.h" +#include "wx/bitmap.h" #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm index dd08e3387a..08e8d435fe 100644 --- a/src/cocoa/bitmap.mm +++ b/src/cocoa/bitmap.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/cocoa/bitmap.cpp +// Name: src/cocoa/bitmap.mm // Purpose: wxBitmap // Author: David Elliott // Modified by: @@ -10,6 +10,9 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/utils.h" @@ -17,7 +20,7 @@ #include "wx/icon.h" #include "wx/colour.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" + #include "wx/image.h" #include "wx/xpmdecod.h" #include "wx/rawbmp.h" @@ -666,4 +669,3 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) m_cocoaNSBitmapImageRep = [maskRep retain]; return true; } - diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index d385c6d9c7..9c5e15c950 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -14,10 +14,9 @@ #include "wx/icon.h" #ifndef WX_PRECOMP + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" - #include "wx/cocoa/autorelease.h" #import diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm index fcad9b39f2..6ebb658ccd 100644 --- a/src/cocoa/pen.mm +++ b/src/cocoa/pen.mm @@ -10,10 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP #include "wx/pen.h" + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" + #include "wx/colour.h" #import diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index d37a9be4ac..516a0acf10 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -31,7 +31,6 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/msgdlg.h" - #include "wx/bitmap.h" #include "wx/confbase.h" #include "wx/utils.h" #endif diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 5992745979..46532a9cda 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -32,11 +32,8 @@ #include "wx/log.h" #include "wx/radiobut.h" #include "wx/statbmp.h" -#endif - -#if wxUSE_STATBMP #include "wx/bitmap.h" -#endif // wxUSE_STATBMP +#endif const wxChar wxControlNameStr[] = wxT("control"); diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 7475dfd1e9..7b83991f0a 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -1,7 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fs_mem.cpp +// Name: src/common/fs_mem.cpp // Purpose: in-memory file system // Author: Vaclav Slavik +// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -9,24 +10,26 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_FILESYSTEM && wxUSE_STREAMS #include "wx/fs_mem.h" -#if wxUSE_GUI - #include "wx/image.h" - #include "wx/bitmap.h" -#endif // wxUSE_GUI - #ifndef WXPRECOMP #include "wx/intl.h" #include "wx/log.h" #include "wx/hash.h" + #if wxUSE_GUI + #include "wx/bitmap.h" + #endif // wxUSE_GUI #endif +#if wxUSE_GUI + #include "wx/image.h" +#endif // wxUSE_GUI + #include "wx/mstream.h" class MemFSHashObj : public wxObject @@ -172,7 +175,7 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename) /*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata) { - AddFile(filename, (const void*) textdata.mb_str(), textdata.Length()); + AddFile(filename, (const void*) textdata.mb_str(), textdata.length()); } @@ -239,4 +242,3 @@ wxMemoryFSHandler::AddFile(const wxString& filename, #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP - diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 512fa5e23e..bd0a76b366 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -26,10 +26,10 @@ #include "wx/icon.h" #include "wx/cursor.h" #include "wx/settings.h" + #include "wx/bitmap.h" #endif #include "wx/colour.h" -#include "wx/bitmap.h" #include "wx/font.h" WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 77d8d7b63f..102e48d838 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -19,10 +19,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif #include "wx/imagbmp.h" -#include "wx/bitmap.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" diff --git a/src/common/image.cpp b/src/common/image.cpp index 2117d2a209..8711e3d1cd 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -16,15 +16,16 @@ #if wxUSE_IMAGE +#include "wx/image.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" #include "wx/hash.h" #include "wx/utils.h" + #include "wx/bitmap.h" #endif -#include "wx/image.h" -#include "wx/bitmap.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 14b2d18835..4db84ee61b 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -22,10 +22,9 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" - // NB: Some compilers define boolean type in Windows headers // (e.g. Watcom C++, but not Open Watcom). // This causes a conflict with jmorecfg.h header from libjpeg, so we have diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 07f0c8ad54..8261210c81 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -24,13 +24,14 @@ #if wxUSE_IMAGE && wxUSE_LIBPNG +#include "wx/imagpng.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif -#include "wx/imagpng.h" -#include "wx/bitmap.h" #include "png.h" #include "wx/filefn.h" #include "wx/wfstream.h" diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 1b108699a8..4db167ecbb 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -22,10 +22,9 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" - extern "C" { #include "tiff.h" @@ -36,11 +35,11 @@ extern "C" #include "wx/module.h" #ifndef TIFFLINKAGEMODE - #if defined(__WATCOMC__) && defined(__WXMGL__) - #define TIFFLINKAGEMODE cdecl - #else - #define TIFFLINKAGEMODE LINKAGEMODE - #endif + #if defined(__WATCOMC__) && defined(__WXMGL__) + #define TIFFLINKAGEMODE cdecl + #else + #define TIFFLINKAGEMODE LINKAGEMODE + #endif #endif //----------------------------------------------------------------------------- diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp index a32f24e8cf..6b7bac3a5c 100644 --- a/src/common/rgncmn.cpp +++ b/src/common/rgncmn.cpp @@ -20,18 +20,14 @@ #ifndef WX_PRECOMP #include "wx/dcmemory.h" + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" - #if wxUSE_IMAGE #include "wx/image.h" #endif -//--------------------------------------------------------------------------- - - wxBitmap wxRegion::ConvertToBitmap() const { @@ -156,5 +152,3 @@ bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp), } #endif - -//--------------------------------------------------------------------------- diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index ae0598e5ed..f27623a980 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -16,10 +16,9 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 8c22e6af9e..2e144a6a0b 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -20,10 +20,10 @@ #include "wx/utils.h" #include "wx/panel.h" #include "wx/msgdlg.h" + #include "wx/bitmap.h" #endif #include "wx/imaglist.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" // FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index fecfe0b787..f19e78a481 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -16,10 +16,9 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 8acf3f1fd9..4f08d0c1d5 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -20,10 +20,10 @@ #include "wx/utils.h" #include "wx/panel.h" #include "wx/msgdlg.h" + #include "wx/bitmap.h" #endif #include "wx/imaglist.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" #include "wx/gtk1/private.h" diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 2df9569de4..f6badadfeb 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -17,12 +17,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/bitmap.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #include "wx/mac/uma.h" -#include "wx/bitmap.h" bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index 0b9c1a831d..d0ea791e8b 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -22,9 +22,9 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/frame.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" #include "wx/metafile.h" #ifndef __DARWIN__ diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 9b1ef2d3c9..b4702c6daf 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -19,8 +19,6 @@ #include "wx/wx.h" #endif -#include "wx/bitmap.h" - #include "wx/mac/uma.h" #include "wx/geometry.h" diff --git a/src/mac/classic/bmpbuttn.cpp b/src/mac/classic/bmpbuttn.cpp index be7783beb6..5ed94c3cb1 100644 --- a/src/mac/classic/bmpbuttn.cpp +++ b/src/mac/classic/bmpbuttn.cpp @@ -17,12 +17,12 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/bitmap.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #include "wx/mac/uma.h" -#include "wx/bitmap.h" bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp index 09bb87c8c1..2f82e1b74e 100644 --- a/src/mac/classic/clipbrd.cpp +++ b/src/mac/classic/clipbrd.cpp @@ -19,9 +19,9 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/frame.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" #include "wx/metafile.h" #ifndef __DARWIN__ diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp index e45400efe0..b1db448182 100644 --- a/src/mac/classic/toolbar.cpp +++ b/src/mac/classic/toolbar.cpp @@ -21,7 +21,6 @@ #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/bitmap.h" IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index a98e011a9e..bc20908091 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -15,7 +15,11 @@ #endif #include "wx/pen.h" -#include "wx/bitmap.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" +#endif + #include "wx/colour.h" #include "wx/mgl/private.h" diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index 5684992b09..7a5763a69b 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -28,9 +28,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/utils.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" #include "wx/dataobj.h" #include "wx/ptr_scpd.h" diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index efa8473ed1..632f36eff4 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -29,10 +29,10 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcmemory.h" + #include "wx/bitmap.h" #endif #include "wx/apptrait.h" -#include "wx/bitmap.h" #include "wx/evtloop.h" #include diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 789fc53acf..af05803527 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include @@ -32,7 +34,6 @@ #include "wx/app.h" #include "wx/palette.h" #include "wx/dcmemory.h" - #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/log.h" #endif diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index efa5b11d4a..09b10aaeda 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -36,9 +36,9 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" #include "wx/file.h" #include diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 65b239a09c..df4910d8cc 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -28,11 +28,11 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif // WX_PRECOMP #include "wx/msw/private.h" -#include "wx/bitmap.h" #include "wx/msw/gdiimage.h" #if wxUSE_WXDIB diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index 305237d43b..e17acfbe35 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -28,11 +28,11 @@ #include "wx/dcscreen.h" #include "wx/settings.h" #include "wx/listbox.h" + #include "wx/bitmap.h" #endif #include "wx/colour.h" #include "wx/font.h" -#include "wx/bitmap.h" #include "wx/ownerdrw.h" #define INCL_PM diff --git a/src/palmos/dib.cpp b/src/palmos/dib.cpp index 157bf03f95..65eecf37da 100644 --- a/src/palmos/dib.cpp +++ b/src/palmos/dib.cpp @@ -30,9 +30,9 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" #include "wx/file.h" #include "wx/image.h" diff --git a/src/palmos/gdiimage.cpp b/src/palmos/gdiimage.cpp index 4fdb574a6b..8175ecdcca 100644 --- a/src/palmos/gdiimage.cpp +++ b/src/palmos/gdiimage.cpp @@ -28,9 +28,9 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" #endif // WX_PRECOMP -#include "wx/bitmap.h" #include "wx/palmos/gdiimage.h" #if wxUSE_WXDIB diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp index b4bede1c71..401881eb91 100644 --- a/src/univ/topluniv.cpp +++ b/src/univ/topluniv.cpp @@ -26,10 +26,10 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/bitmap.h" #endif #include "wx/univ/renderer.h" -#include "wx/bitmap.h" #include "wx/image.h" #include "wx/cshelp.h" #include "wx/evtloop.h" diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index e3ac3d5987..4eef00ff18 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -29,9 +29,9 @@ #include "wx/dcclient.h" #include "wx/statbmp.h" #include "wx/sizer.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" #include "wx/image.h" #ifdef __VMS diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index ce9e17d9dc..12822c183d 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -16,9 +16,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/bitmap.h" #endif -#include "wx/bitmap.h" #include "wx/colour.h" //----------------------------------------------------------------------------- diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index c89e957e6b..a6497da927 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -16,10 +16,10 @@ #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/bitmap.h" #endif #include "wx/colour.h" -#include "wx/bitmap.h" //----------------------------------------------------------------------------- // wxPen diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp index 27eb3c2725..ff17f168e7 100644 --- a/src/x11/utilsx.cpp +++ b/src/x11/utilsx.cpp @@ -20,15 +20,20 @@ #include "wx/x11/privx.h" #ifdef HAVE_XSHAPE -#ifdef __VMS -# include "wx/vms_x_fix.h" -# include -#else -# include -#endif -#include "wx/region.h" -#include "wx/bitmap.h" -#include "wx/dcmemory.h" + + #ifndef WX_PRECOMP + #include "wx/bitmap.h" + #endif + + #ifdef __VMS + #include "wx/vms_x_fix.h" + #include + #else + #include + #endif + + #include "wx/region.h" + #include "wx/dcmemory.h" #endif // ---------------------------------------------------------------------------- diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index 4e61d5074e..a91318801b 100644 --- a/src/xrc/xh_bmp.cpp +++ b/src/xrc/xh_bmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_bmp.cpp +// Name: src/xrc/xh_bmp.cpp // Purpose: XRC resource for wxBitmap and wxIcon // Author: Vaclav Slavik // Created: 2000/09/09 @@ -18,12 +18,15 @@ #if wxUSE_XRC #include "wx/xrc/xh_bmp.h" -#include "wx/bitmap.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler) wxBitmapXmlHandler::wxBitmapXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { } diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 18c84d6664..789761a6e1 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -26,6 +26,7 @@ #include "wx/frame.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/bitmap.h" #endif #ifndef __WXWINCE__ @@ -38,7 +39,6 @@ #include "wx/tokenzr.h" #include "wx/fontenum.h" #include "wx/module.h" -#include "wx/bitmap.h" #include "wx/image.h" #include "wx/fontmap.h" #include "wx/artprov.h" @@ -643,7 +643,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with) } } - if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() ) + if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() ) dest.SetContent(with.GetContent()); } -- 2.45.2