Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 2ce5db4d0883dfc4a81539d9028e3b26e8692b4f..59bda754d392d01e03a45ffb3066ec791b8bdf18 100644 (file)
--- 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 dd08e3387af500bd253589935d870e7789d3b897..08e8d435fef3d8f3acd48059580cb7f63f112483 100644 (file)
--- 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 d385c6d9c7741458c1d32bc927c5956d26132eed..9c5e15c9509632f5db293c935adb06dee4d1628d 100644 (file)
--- 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 <AppKit/NSImage.h>

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index fcad9b39f2331145bea8723628eb23339f2ea6a7..6ebb658ccde6c8c2c0c62cc5ee2bfdc17b9a9659 100644 (file)
--- 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 <AppKit/NSColor.h>

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index d37a9be4acf8876816e714ce6535e72fbd338427..516a0acf1029ef1ee4484e10168ec4633bd06223 100644 (file)
--- 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 59927459797f65b99660a109f68f5043e272c536..46532a9cda5ef460ac42a556655f9c0c8ec5751d 100644 (file)
--- 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 7475dfd1e9aa3881ffdd23afc4a7e380f8b3e652..7b83991f0a359bb26a0ebcfccdfea47783f72bcb 100644 (file)
--- 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 512fa5e23ea53d66400e2b28a10c804796f7d665..bd0a76b366be6c70e4f389f04e88db229b7cd4e3 100644 (file)
--- 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 77d8d7b63f115305ca81fd0e130806e51a948bfd..102e48d8385cc79bf398d6de5c6780006a45dad6 100644 (file)
--- 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 2117d2a2094c8f8b6d5be2b8118e42503c2f5d6e..8711e3d1cd47ae69f068b917f5b44731594ee09f 100644 (file)
--- 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 14b2d188350e551d7726b38ed74b63ea30320d1c..4db84ee61bde18b61028b1e709a456e81e4bf6d8 100644 (file)
--- 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 07f0c8ad544162471b8a5a02917e9879cac30072..8261210c817b8192d74f8f7edc7da38de7dc7961 100644 (file)
--- 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 1b108699a8a6d61f0c37644a1b54f41df19a65fa..4db167ecbb838b1ecc01afe8be721ec0aa970659 100644 (file)
--- 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 a32f24e8cf25a6089db563e2c8bf1e4233a6db0f..6b7bac3a5c4e7d7c350a626797e4b37a37e40cf4 100644 (file)
--- 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 ae0598e5ed19d97aae86dfad9d7d9b993145b7d2..f27623a98089824be06b8ac7edaeeec5fffab133 100644 (file)
--- 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 8c22e6af9e96ffe8aa94b8bc40268b825e692e48..2e144a6a0b72b18f9cd0d4b0ffadee663b76b58c 100644 (file)
--- 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 fecfe0b787e510f689f97fed5ba7398fa8e235a7..f19e78a48110f248d96a55a1ce76189a09d08339 100644 (file)
--- 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 8acf3f1fd9f1ced142cc9100debbb1c2c7496f80..4f08d0c1d55846e0fa14cbc6e3b761f4fd9e1257 100644 (file)
--- 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 2df9569de4235680e07a6ec2a0c0027c354c2fd4..f6badadfeb5a52c9df4c259f3628de0ff1085c1f 100644 (file)
--- 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 0b9c1a831d5c0cd61615b8e54afb974bf2017480..d0ea791e8b9a7509530637a118b2b23e64473557 100644 (file)
--- 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 9b1ef2d3c96c09f3fcbf603de35525a815277546..b4702c6dafb929bed83eaafd37a7fa80a9375b3f 100644 (file)
--- 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 be7783beb6ead258b154817dc642bd7702acd2d8..5ed94c3cb13f5173d57edeb7d7b60cdee35439db 100644 (file)
--- 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 09bb87c8c1f90af7428682c0393a247cea79409f..2f82e1b74ef2cf9d060a84a788b81f081b2e45ab 100644 (file)
--- 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 e45400efe08189442312989d9a857873aac4e113..b1db44818235612d25b5d5ef526a1a6da03f0169 100644 (file)
--- 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 a98e011a9e26aecc5e738147944a09cbcbaa37c4..bc20908091ee573f7ff5fe4a0ea5ca65d8a38806 100644 (file)
--- 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 5684992b09ef37d32ceddf3ea9daf0048aaea9a8..7a5763a69b26d9c2c6c15859ec1b7cdd8a98508a 100644 (file)
--- 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 efa8473ed12929a3e801af892f2e830cd1866bb2..632f36eff4c0b56771f47c6c6354d64ab983acf5 100644 (file)
--- 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 <string.h>

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 789fc53acf710b193e92fe921ada32ae80224731..af05803527087fee9fa54d648d481d0be8c50215 100644 (file)
--- 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 <stdio.h>
 
@@ -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 efa5b11d4ab006df47b8fc78bc9daf63e3e6abe2..09b10aaedacf9f1fdc82229cde44caaa2a630d63 100644 (file)
--- 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 <stdio.h>

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 65b239a09c805527314b6ab75e0ef05911e48e79..df4910d8ccb331b50226b35b2448b5200866f5b4 100644 (file)
--- 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 305237d43b77f4acdf05da1632406f92fe244457..e17acfbe359f5ce1d7751b6aff4f5c39eb580047 100644 (file)
--- 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 157bf03f95a9fdd3d7bce182f8fa9f576df5aa83..65eecf37da38093af28bdb3e7777a06828987ff5 100644 (file)
--- 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 4fdb574a6b019b7c7a007ef96762f4ad565755da..8175ecdcca4b2094d0a019a72f27b1824976e7e3 100644 (file)
--- 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 b4bede1c7196b7d6a767345ae5af1a16532a650b..401881eb917cdcd4e392defa2660edce66991eaa 100644 (file)
--- 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 e3ac3d59871b1ffddbeb835394d13e33a8dfd16f..4eef00ff184b814f021e62e1310aea87f4000337 100644 (file)
--- 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 ce9e17d9dc838781bb617f6e83b1d325ad8bde6e..12822c183dfec20355a9aeaa7634637c12e966ad 100644 (file)
--- 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 c89e957e6bb0fe67c3ac9625504710ed129eb0ef..a6497da9275a56038834cdefac4c5f7065d8a552 100644 (file)
--- 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 27eb3c2725867a1ce771d4da5719873de6ead3cf..ff17f168e78011fdfd805eec992301fed6928383 100644 (file)
--- 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 <X11/shape.h>
-#else
-# include <X11/extensions/shape.h>
-#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 <X11/shape.h>
+    #else
+        #include <X11/extensions/shape.h>
+    #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 4e61d5074e7b371abaa3ae043bbb2b50f3e869ff..a91318801b5307ebbd3a1e59abfac9d4cffad85c 100644 (file)
--- 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 18c84d66645e1108d12fcd89e597a8a4b31ca928..789761a6e1fba0d46785caaad5ea4e56564857fc 100644 (file)
--- 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());
 }