Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

include/wx/image.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        image.h
+// Name:        wx/image.h
 // Purpose:     wxImage class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -11,6 +11,9 @@
 #define _WX_IMAGE_H_
 
 #include "wx/defs.h"
+
+#if wxUSE_IMAGE
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
@@ -20,8 +23,6 @@
 #  include "wx/stream.h"
 #endif
 
-#if wxUSE_IMAGE
-
 // on some systems (Unixware 7.x) index is defined as a macro in the headers
 // which breaks the compilation below
 #undef index
@@ -425,4 +426,3 @@ extern WXDLLEXPORT_DATA(wxImage)    wxNullImage;
 
 #endif
   // _WX_IMAGE_H_
-

include/wx/wx.h

@@ -40,6 +40,7 @@
 #include "wx/gdiobj.h"
 #include "wx/region.h"
 #include "wx/bitmap.h"
+#include "wx/image.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/dc.h"

src/aui/dockart.cpp

@@ -25,13 +25,13 @@
 
 #if wxUSE_AUI
 
-#include "wx/image.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/image.h"
 #endif
 
 #ifdef __WXMAC__

src/aui/framemanager.cpp

@@ -36,11 +36,8 @@
     #include "wx/dcscreen.h"
     #include "wx/toolbar.h"
     #include "wx/mdi.h"
-#endif
-
-//#include "wx/dcbuffer.h"
-
     #include "wx/image.h"
+#endif
 
 WX_CHECK_BUILD_OPTIONS("wxAUI")
 

src/cocoa/bitmap.mm

@@ -19,9 +19,9 @@
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/colour.h"
+    #include "wx/image.h"
 #endif //WX_PRECOMP
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 #include "wx/rawbmp.h"
 

src/common/artprov.cpp

@@ -24,15 +24,12 @@
     #include "wx/list.h"
     #include "wx/log.h"
     #include "wx/hashmap.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/artprov.h"
 #include "wx/module.h"
 
-#if wxUSE_IMAGE
-    #include "wx/image.h"
-#endif
-
 // ===========================================================================
 // implementation
 // ===========================================================================

src/common/artstd.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        artstd.cpp
+// Name:        src/common/artstd.cpp
 // Purpose:     stock wxArtProvider instance with default wxWin art
 // Author:      Vaclav Slavik
 // Modified by:
@@ -20,8 +20,11 @@
     #pragma hdrstop
 #endif
 
-#include "wx/artprov.h"
+#ifndef WX_PRECOMP
     #include "wx/image.h"
+#endif
+
+#include "wx/artprov.h"
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider

src/common/bmpbase.cpp

@@ -28,9 +28,9 @@
     #include "wx/utils.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/image.h"
 #include "wx/module.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)

src/common/fs_mem.cpp

@@ -23,12 +23,9 @@
     #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
+#endif
 
 #include "wx/mstream.h"
 

src/common/iconbndl.cpp

@@ -23,9 +23,6 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
-#endif
-
-#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_)
     #include "wx/image.h"
 #endif
 

src/common/imagall.cpp

@@ -14,13 +14,12 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/image.h"
-
 #if wxUSE_IMAGE
 
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers

src/common/imagfill.cpp

@@ -22,9 +22,8 @@
     #include "wx/brush.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 // DoFloodFill
 // Fills with the colour extracted from fillBrush, starting at x,y until either

src/common/quantize.cpp

@@ -43,9 +43,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/palette.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"

src/common/rgncmn.cpp

@@ -21,12 +21,8 @@
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
     #include "wx/bitmap.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_IMAGE
     #include "wx/image.h"
-#endif
-
+#endif //WX_PRECOMP
 
 
 wxBitmap wxRegion::ConvertToBitmap() const

src/common/tbarbase.cpp

@@ -32,11 +32,8 @@
     #include "wx/control.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
-#endif
-
-#if wxUSE_IMAGE
     #include "wx/image.h"
-#endif // wxUSE_IMAGE
+#endif
 
 // ----------------------------------------------------------------------------
 // wxWidgets macros

src/common/xpmdecod.cpp

@@ -107,9 +107,9 @@ license is as follows:
     #if wxUSE_STREAMS
         #include "wx/stream.h"
     #endif
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include <string.h>
 
 #include <ctype.h>

src/generic/buttonbar.cpp

@@ -37,9 +37,8 @@
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // wxButtonToolBarTool: our implementation of wxToolBarToolBase

src/generic/dcpsg.cpp

@@ -26,9 +26,9 @@
     #include "wx/utils.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/image.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"

src/generic/dirctrlg.cpp

@@ -36,6 +36,7 @@
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
     #include "wx/gdicmn.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/module.h"
@@ -45,7 +46,6 @@
 #include "wx/dir.h"
 #include "wx/artprov.h"
 #include "wx/mimetype.h"
-#include "wx/image.h"
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"

src/generic/dragimgg.cpp

@@ -36,14 +36,11 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
 
-#if wxUSE_IMAGE_IN_DRAGIMAGE
-#include "wx/image.h"
-#endif
-
 #include "wx/generic/dragimgg.h"
 
 // ----------------------------------------------------------------------------

src/generic/imaglist.cpp

@@ -23,9 +23,8 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 //-----------------------------------------------------------------------------
 //  wxImageList

src/gtk/app.cpp

@@ -28,12 +28,12 @@
     #include "wx/memory.h"
     #include "wx/font.h"
     #include "wx/gdicmn.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"
-#include "wx/image.h"
 #include "wx/thread.h"
 
 #ifdef __WXGPE__

src/gtk/bitmap.cpp

@@ -18,10 +18,10 @@
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/filefn.h"
-#include "wx/image.h"
 
 #include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()

src/gtk/dataobj.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/uri.h"
 
 #include <gdk/gdk.h>
@@ -236,7 +236,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
         filenames += wxT("\r\n");
     }
 
-    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );
 
     return true;
 }
@@ -248,7 +248,7 @@ size_t wxFileDataObject::GetDataSize() const
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
         // This is junk in UTF-8
-        res += m_filenames[i].Len();
+        res += m_filenames[i].length();
         res += 5 + 2; // "file:" (5) + "\r\n" (2)
     }
 

src/gtk/dcclient.cpp

@@ -20,9 +20,9 @@
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h" // for floating-point functions
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
 

src/gtk1/app.cpp

@@ -28,12 +28,12 @@
     #include "wx/memory.h"
     #include "wx/font.h"
     #include "wx/gdicmn.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"
-#include "wx/image.h"
 #include "wx/thread.h"
 
 #ifdef __WXGPE__

src/gtk1/bitmap.cpp

@@ -18,10 +18,10 @@
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/filefn.h"
-#include "wx/image.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

src/gtk1/dataobj.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/uri.h"
 
 #include <gdk/gdk.h>
@@ -224,7 +224,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
         filenames += wxT("\r\n");
     }
 
-    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );
 
     return true;
 }
@@ -236,7 +236,7 @@ size_t wxFileDataObject::GetDataSize() const
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
         // This is junk in UTF-8
-        res += m_filenames[i].Len();
+        res += m_filenames[i].length();
         res += 5 + 2; // "file:" (5) + "\r\n" (2)
     }
 

src/gtk1/dcclient.cpp

@@ -20,9 +20,9 @@
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h" // for floating-point functions
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
 

src/html/m_image.cpp

@@ -23,13 +23,13 @@
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 #include "wx/html/htmlwin.h"
 
-#include "wx/image.h"
 #include "wx/gifdecod.h"
 #include "wx/artprov.h"
 

src/html/m_layout.cpp

@@ -16,9 +16,8 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
-#endif
-
     #include "wx/image.h"
+#endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"

src/mac/carbon/bitmap.cpp

@@ -17,9 +17,9 @@
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"
 

src/mac/carbon/cursor.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/mac/private.h"

src/mac/carbon/dataobj.cpp

@@ -20,10 +20,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/tokenzr.h"
 

src/mac/carbon/dc.cpp

@@ -21,10 +21,10 @@
     #include "wx/dcmemory.h"
     #include "wx/dcprint.h"
     #include "wx/region.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/image.h"
 
 #ifdef __MSL__
     #if __MSL__ >= 0x6000

src/mac/carbon/dccg.cpp

@@ -21,10 +21,10 @@
     #include "wx/dcmemory.h"
     #include "wx/dcprint.h"
     #include "wx/region.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/image.h"
 
 
 #ifdef __MSL__

src/mac/carbon/icon.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/mac/carbon/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"
+
+#ifndef WX_PRECOMP
     #include "wx/image.h"
+#endif
+
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

src/mac/carbon/imaglist.cpp

@@ -20,9 +20,8 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 

src/mac/carbon/notebmac.cpp

@@ -19,11 +19,11 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/string.h"
 #include "wx/imaglist.h"
-#include "wx/image.h"
 #include "wx/mac/uma.h"
 
 

src/mac/classic/bitmap.cpp

@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/rawbmp.h"

src/mac/classic/cursor.cpp

@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/mac/private.h"

src/mac/classic/dataobj.cpp

@@ -26,11 +26,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/mac/private.h"
 #include <Scrap.h>
 
@@ -178,7 +178,7 @@ bool wxFileDataObject::GetDataHere( void* pBuf ) const
         sFilenames += (wxChar)0;
     }
 
-    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);
+    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1);
     return true;
 }
 
@@ -188,7 +188,7 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
-        nRes += m_filenames[i].Len();
+        nRes += m_filenames[i].length();
         nRes += 1;
     }
 

src/mac/classic/dc.cpp

@@ -19,10 +19,10 @@
     #include "wx/dcmemory.h"
     #include "wx/dcprint.h"
     #include "wx/region.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/image.h"
 
 #if __MSL__ >= 0x6000
 namespace std {}

src/mac/classic/notebmac.cpp

@@ -25,10 +25,10 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/imaglist.h"
-#include "wx/image.h"
 #include "wx/mac/uma.h"
 // ----------------------------------------------------------------------------
 // macros

src/mgl/bitmap.cpp

@@ -21,11 +21,10 @@
     #include "wx/utils.h"
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/filefn.h"
-#include "wx/image.h"
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/mgl/private.h"

src/motif/cursor.cpp

@@ -22,9 +22,6 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
-#endif
-
-#if wxUSE_IMAGE
     #include "wx/image.h"
 #endif
 

src/motif/dcclient.cpp

@@ -47,9 +47,8 @@
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/msw/bitmap.cpp

@@ -36,6 +36,7 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -44,7 +45,6 @@
     #include "wx/msw/dib.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #ifdef wxHAVE_RAW_BITMAP

src/msw/bmpbuttn.cpp

@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/image.h"
 
 #include "wx/msw/uxtheme.h"
 

src/msw/cursor.cpp

@@ -33,10 +33,10 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/image.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h" // IDC_HAND
@@ -421,5 +421,3 @@ void wxSetCursor(const wxCursor& cursor)
             *gs_globalCursor = cursor;
     }
 }
-
-

src/msw/dib.cpp

@@ -37,6 +37,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif //WX_PRECOMP
 
 #include "wx/file.h"
@@ -48,7 +49,6 @@
     #include <memory.h>
 #endif
 
-#include "wx/image.h"
 #include "wx/msw/dib.h"
 
 #ifdef __WXWINCE__

src/msw/dragimag.cpp

@@ -36,10 +36,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/image.h"
 
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"

src/msw/imaglist.cpp

@@ -32,12 +32,10 @@
     #include "wx/dcmemory.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-
+    #include "wx/image.h"
     #include <stdio.h>
 #endif
 
-#include "wx/image.h"
-
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 

src/msw/statbox.cpp

@@ -32,12 +32,11 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/sysopt.h"
-#include "wx/image.h"
-#include "wx/sysopt.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"

src/msw/tbar95.cpp

@@ -38,10 +38,10 @@
     #include "wx/dcmemory.h"
     #include "wx/control.h"
     #include "wx/app.h"         // for GetComCtl32Version
+    #include "wx/image.h"
 #endif
 
 #include "wx/sysopt.h"
-#include "wx/image.h"
 
 #include "wx/msw/private.h"
 

src/os2/bitmap.cpp

@@ -24,11 +24,11 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 // ----------------------------------------------------------------------------

src/os2/cursor.cpp

@@ -20,11 +20,11 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/os2/private.h"
 #include "wx/os2/wxrsc.h"
-#include "wx/image.h"
 
 #include "assert.h"
 

src/os2/dataobj.cpp

@@ -25,11 +25,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
-#include "wx/image.h"
 
 #include "wx/os2/private.h"
 
@@ -229,7 +229,7 @@ bool wxFileDataObject::GetDataHere( void* pBuf ) const
         sFilenames += (wxChar)0;
     }
 
-    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);
+    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1);
     return true;
 }
 
@@ -239,7 +239,7 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
-        nRes += m_filenames[i].Len();
+        nRes += m_filenames[i].length();
         nRes += 1;
     }
 

src/palmos/bitmap.cpp

@@ -36,13 +36,13 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #ifdef wxHAVE_RAW_BITMAP

src/palmos/cursor.cpp

@@ -33,10 +33,10 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 // private classes

src/palmos/dib.cpp

@@ -31,11 +31,11 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif //WX_PRECOMP
 
 #include "wx/file.h"
 
-#include "wx/image.h"
 #include "wx/palmos/dib.h"
 
 // ----------------------------------------------------------------------------

src/palmos/dragimag.cpp

@@ -36,9 +36,8 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 #include "wx/palmos/dragimag.h"
 #include "wx/palmos/private.h"

src/univ/ctrlrend.cpp

@@ -33,9 +33,8 @@
     #include "wx/dc.h"
     #include "wx/log.h"
     #include "wx/gauge.h"
-#endif // WX_PRECOMP
-
     #include "wx/image.h"
+#endif // WX_PRECOMP
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
@@ -875,4 +874,3 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
 }
 
 #endif // wxUSE_GAUGE
-

src/univ/themes/gtk.cpp

@@ -46,12 +46,12 @@
 
     #include "wx/settings.h"
     #include "wx/toplevel.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#include "wx/image.h"
 #ifdef wxUSE_TOGGLEBTN
 #include "wx/tglbtn.h"
 #endif // wxUSE_TOGGLEBTN

src/univ/themes/win32.cpp

@@ -50,12 +50,12 @@
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/toplevel.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#include "wx/image.h"
 #ifdef wxUSE_TOGGLEBTN
 #include "wx/tglbtn.h"
 #endif // wxUSE_TOGGLEBTN

src/univ/toolbar.cpp

@@ -35,12 +35,11 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dc.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/univ/renderer.h"
 
-#include "wx/image.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/univ/topluniv.cpp

@@ -27,10 +27,10 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/univ/renderer.h"
-#include "wx/image.h"
 #include "wx/cshelp.h"
 #include "wx/evtloop.h"
 

src/unix/taskbarx11.cpp

@@ -30,9 +30,8 @@
     #include "wx/statbmp.h"
     #include "wx/sizer.h"
     #include "wx/bitmap.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 #ifdef __VMS
 #pragma message disable nosimpint

src/unix/utilsx11.cpp

@@ -20,10 +20,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/iconbndl.h"
-#include "wx/image.h"
 
 #ifdef __VMS
 #pragma message disable nosimpint

src/x11/bitmap.cpp

@@ -20,9 +20,8 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/math.h"
-#endif
-
     #include "wx/image.h"
+#endif
 
 #include "wx/x11/private.h"
 

src/x11/dataobj.cpp

@@ -18,10 +18,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/mstream.h"
-#include "wx/image.h"
 
 #include "wx/x11/private.h"
 
@@ -199,7 +199,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
         filenames += (wxChar) 0;
     }
 
-    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );
 
     return true;
 }
@@ -210,7 +210,7 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
-        res += m_filenames[i].Len();
+        res += m_filenames[i].length();
         res += 1;
     }
 
@@ -232,8 +232,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             break;
         wxString file( filenames );  // this returns the first file
         AddFile( file );
-        pos += file.Len()+1;
-        filenames += file.Len()+1;
+        pos += file.length()+1;
+        filenames += file.length()+1;
     }
 #else // 1
     m_filenames.Empty();

src/x11/dcclient.cpp

@@ -19,9 +19,9 @@
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
 

src/xrc/xmlres.cpp

@@ -27,6 +27,7 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -39,7 +40,6 @@
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"
-#include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"