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

@@ -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"

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;
 }
-

src/cocoa/icon.mm

@@ -14,9 +14,8 @@
 #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
     #include "wx/bitmap.h"
+#endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 

src/cocoa/pen.mm

@@ -10,10 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/pen.h"
-#endif //WX_PRECOMP
     #include "wx/bitmap.h"
+#endif //WX_PRECOMP
+
 #include "wx/colour.h"
 
 #import <AppKit/NSColor.h>

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

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");
 

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
 /////////////////////////////////////////////////////////////////////////////
@@ -16,17 +17,19 @@
 
 #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
-

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;

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"

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"

src/common/imagjpeg.cpp

@@ -22,9 +22,8 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
-#endif
-
     #include "wx/bitmap.h"
+#endif
 
 // NB: Some compilers define boolean type in Windows headers
 //     (e.g. Watcom C++, but not Open Watcom).

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"

src/common/imagtiff.cpp

@@ -22,9 +22,8 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
-#endif
-
     #include "wx/bitmap.h"
+#endif
 
 extern "C"
 {

src/common/rgncmn.cpp

@@ -20,18 +20,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
-#endif //WX_PRECOMP
-
     #include "wx/bitmap.h"
+#endif //WX_PRECOMP
 
 #if wxUSE_IMAGE
     #include "wx/image.h"
 #endif
 
 
-//---------------------------------------------------------------------------
-
-
 
 wxBitmap wxRegion::ConvertToBitmap() const
 {
@@ -156,5 +152,3 @@ bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp),
 }
 
 #endif
-
-//---------------------------------------------------------------------------

src/gtk/menu.cpp

@@ -16,9 +16,8 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
-#endif
-
     #include "wx/bitmap.h"
+#endif
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"

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

src/gtk1/menu.cpp

@@ -16,9 +16,8 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
-#endif
-
     #include "wx/bitmap.h"
+#endif
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"

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"

src/mac/carbon/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,

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__

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"
 

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,

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__

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)
 

src/mgl/pen.cpp

@@ -15,7 +15,11 @@
 #endif
 
 #include "wx/pen.h"
+
+#ifndef WX_PRECOMP
     #include "wx/bitmap.h"
+#endif
+
 #include "wx/colour.h"
 #include "wx/mgl/private.h"
 

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"
 

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>

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

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>

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

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

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"

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

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"

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

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"
 
 //-----------------------------------------------------------------------------

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

src/x11/utilsx.cpp

@@ -20,14 +20,19 @@
 #include "wx/x11/privx.h"
 
 #ifdef HAVE_XSHAPE
+
+    #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/bitmap.h"
     #include "wx/dcmemory.h"
 #endif
 

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,7 +18,10 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
+
+#ifndef WX_PRECOMP
     #include "wx/bitmap.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
 

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());
 }