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

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 51c77dbb4c066f4e441a317f014f73b17bd23f3b..5aa6984d2844fa3bd23d401f9c4d6aa6734f09ac 100644 (file)
--- a/include/wx/image.h
+++ b/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_
-

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 089ce8ccad9423cc579bb4025047698f501a9c97..d78b7eca02977148e9566a0e51fcfb6087266d98 100644 (file)
--- a/include/wx/wx.h
+++ b/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"

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 60e9955f5cba4dcaa41726f80d1b130417aab281..563154c89e1d28e58ef37ec01f530f12361e58d8 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/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__

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 99614d76382fa9e8b461a2ad4a487c98df13d7fa..d935c9304bccb53f2544ddec5b21f1ceaac9dfd9 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -36,12 +36,9 @@
     #include "wx/dcscreen.h"
     #include "wx/toolbar.h"
     #include "wx/mdi.h"
+    #include "wx/image.h"
 #endif
 
-//#include "wx/dcbuffer.h"
-
-#include "wx/image.h"
-
 WX_CHECK_BUILD_OPTIONS("wxAUI")
 
 #include "wx/arrimpl.cpp"

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 08e8d435fef3d8f3acd48059580cb7f63f112483..6152fa12e8abcdbd8f6b5cad5080ff7e4aa6b306 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/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"
 

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index d97e28b4559b2706e10a0751155e34e5a4726a3a..04873a0698cc262f0575e7c55adff64e88a81ce2 100644 (file)
--- a/src/common/artprov.cpp
+++ b/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
 // ===========================================================================

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 35f10467b9182d37502393e2fe3f7ca807337593..314e609089c8c76089b425dad8e6df69357413ba 100644 (file)
--- a/src/common/artstd.cpp
+++ b/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
 
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+
 #include "wx/artprov.h"
-#include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index e36107a2ac4b42cd3f489545b58f7a16727dc0b0..c0a5d145514c80a3b5a1eefb64985ebb8ce5bb72 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/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)

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 7b83991f0a359bb26a0ebcfccdfea47783f72bcb..ae176a802dcc2089b92d490632d3f986605cd60a 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -23,13 +23,10 @@
     #include "wx/hash.h"
     #if wxUSE_GUI
         #include "wx/bitmap.h"
+        #include "wx/image.h"
     #endif // wxUSE_GUI
 #endif
 
-#if wxUSE_GUI
-    #include "wx/image.h"
-#endif // wxUSE_GUI
-
 #include "wx/mstream.h"
 
 class MemFSHashObj : public wxObject

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index afdb96b826136783a03c2797e75ee99a8d16dfe1..4a0b326a6491259fc9feb0d4a2686e17e6706858 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/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
 

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index bc437495c03bbe7c8249f318aee13d46e43f76bf..060d9c78b0f8bda9f23a03b4d724a5eb6fe3f7cc 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -11,16 +11,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE
+
 #ifndef WX_PRECOMP
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
-#if wxUSE_IMAGE
-
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 89c1e5f7845985856b7411fb641f91e4b698250f..b81b9770557a854d4cd6a03c93d544444a274fc4 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -22,10 +22,9 @@
     #include "wx/brush.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 // DoFloodFill
 // Fills with the colour extracted from fillBrush, starting at x,y until either
 // a color different from the start pixel is reached (wxFLOOD_SURFACE)

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index b5936f21fb74430668eda7f2d254548ee5d34910..cb30f645997a6f3917ddaaa9010c0c6062fd68e5 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -43,12 +43,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/palette.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #ifdef __WXMSW__
-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"
 #endif
 
 #include <stdlib.h>

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 6b7bac3a5c4e7d7c350a626797e4b37a37e40cf4..0732bd75c6c93317048490cdec358ff64cd4b59e 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 54878f1ebdf6722042fbe26771c4762dd6223877..7814a7b4ae2604fd193f79e69c5fe6fa986a56b6 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index a5fdfa8f15c0a4d44e31d2485c384c4e3f1956f8..fa9bcb9fc7a75b664a5523e143de652fd09a63d4 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/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>

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index 49e3210bb9b96dbb4939e545de6b7b61eef4b71a..e56e4ddce29cca089e41e30e70449d2a6377aade 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -37,10 +37,9 @@
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 // ----------------------------------------------------------------------------
 // wxButtonToolBarTool: our implementation of wxToolBarToolBase
 // ----------------------------------------------------------------------------

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 33bd3d37ddcddcfb9b637fb3b32ca0d522a0535f..232dcccf8115e69b2a3b254ce6cd1033d7bce795 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/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"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index b5ea30a32186d9d98adc60e43d08cde42263f828..cf1e8c5e11e704b8d7e77798d79e471ecd5bd106 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/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"
@@ -120,7 +120,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
         wxString path, name;
         path.Printf(wxT("%c:\\"), driveBuffer[i]);
         name.Printf(wxT("%c:"), driveBuffer[i]);
-        
+
         // Do not use GetVolumeInformation to further decorate the
         // name, since it can cause severe delays on network drives.
 

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index b40140c453e6da513a7d19e132e65d277c9aa98c..40b92e410b8c3b4ab435d3cf2e664761b88891e3 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/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"
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 2cc89ab085d97c43382166dc0ec02585af0b7fd1..4fbf79d9df726de15425241b44e9bca2cf7c533c 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -23,10 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 //-----------------------------------------------------------------------------
 //  wxImageList
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 3169d499144ff4223d763828c843c592299407e3..c9f6bbc8277df4e7858ebdac3b9c49b9d1bf1acf 100644 (file)
--- a/src/gtk/app.cpp
+++ b/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__

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e420d57b51fb7ce56e63e2f69268d6d4ad8be887..a90312de4d929811cbac317acbfe0afcc142ddfb 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/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()

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 8ed810899780af1660a6f7c78420cedaf4dfe5fc..88ba70ce97f82425409e16e9eeee54f669ccc2e1 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/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)
     }
 

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 06b60cd00053343915f171f6dbe9234abeb3fa15..805f66d495d09bba4b48d84874cbead6f5464389 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/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"
 

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 467858c6284502f758e0229dabbcb186e39eaa89..65f7a464413dc7ab4d857aa4116f6554163fc16e 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/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__

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index bd4abefa09942aebc5b98c12e3b88acc08c4c1f1..41161ec1e7726d2dd5d67a21d48303c17fec28c5 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/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>

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index fc029b856552cd6872003222d5c5133f89620de8..e93e1d7047cfedcac67efbed49c2ab36f81941f0 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/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)
     }
 

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index a5b9b4a5d0bfc3ea5f682d53ad9b3f9ef962c728..6dd1e9f48d671f3997a957bd502d4c5f5d08207f 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/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"
 

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index c7586333b0e3cfbc63e818f8533619cdb4fafb9b..d4a9eaebeea782bc32e80223a6b06288326ef1fe 100644 (file)
--- a/src/html/m_image.cpp
+++ b/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"
 

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index e118e82fc7c9216385796d3d672020fff8265ba5..07b483b7d063fd325b6da18bd33968f9e08be773 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -16,10 +16,9 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index e2b19004cc524812615518b434c5e9d9eedda4b7..cc22e4492140111da43f35dee059dbbcb73c7f98 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 67d88107125a78679a2c018eec1427a1c2ddd682..94d1b3d1fb51f1d0ffc66daaf4008d7c963b93c2 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/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"

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 041084127d8304d951d9125e14c34d25aa982837..ead5d2fd39ca50696b715f3a6b2a3d7a043248fd 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 6f8ecf23dfa9a95c91c47bd524a24b5e1c71a2bf..4b75c0fdbfae9865a62c3aeb96d544a45ffc84a1 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/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
@@ -1487,7 +1487,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
 
     wxMacUniCharBuffer unibuf( str ) ;
     UniCharCount chars = unibuf.GetChars() ;
-    
+
     status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
@@ -1504,12 +1504,12 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     ATSUTextMeasurement ascent, descent ;
 
     ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ;
-    
+
     if (m_font.GetNoAntiAliasing())
     {
         layoutOptions |= kATSLineNoAntiAliasing ;
     }
-    
+
     Fixed atsuAngle = IntToFixed( iAngle ) ;
 
     ATSUAttributeTag atsuTags[] =
@@ -1517,28 +1517,28 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         kATSULineLayoutOptionsTag ,
         kATSULineRotationTag ,
     } ;
-    
+
     ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         sizeof( ATSLineLayoutOptions ) ,
         sizeof( Fixed ) ,
     } ;
-    
+
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         &layoutOptions ,
         &atsuAngle ,
     } ;
-    
+
     status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag) - ( abs(iAngle) > 0.001 ? 0 : 1),
             atsuTags, atsuSizes, atsuValues ) ;
 
     status = ::ATSUMeasureText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         &textBefore , &textAfter, &ascent , &descent );
     wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-    
+
     if ( m_backgroundMode == wxSOLID )
-    {      
+    {
         // background painting must be done by hand, cannot be done by ATSUI
         wxCoord x2 , y2 ;
         PolyHandle polygon = OpenPoly();
@@ -1613,10 +1613,10 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
-    
+
     wxMacUniCharBuffer unibuf( str ) ;
     UniCharCount chars = unibuf.GetChars() ;
-    
+
     status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
@@ -1626,30 +1626,30 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height
     wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
 
     ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ;
-    
+
     if (m_font.GetNoAntiAliasing())
     {
         layoutOptions |= kATSLineNoAntiAliasing ;
     }
-    
+
     ATSUAttributeTag atsuTags[] =
     {
         kATSULineLayoutOptionsTag ,
     } ;
-    
+
     ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         sizeof( ATSLineLayoutOptions ) ,
     } ;
-    
+
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         &layoutOptions ,
     } ;
-    
+
     status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
             atsuTags, atsuSizes, atsuValues ) ;
-            
+
     ATSUTextMeasurement textBefore, textAfter ;
     ATSUTextMeasurement textAscent, textDescent ;
 
@@ -1691,10 +1691,10 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
-    
+
     wxMacUniCharBuffer unibuf( text ) ;
     UniCharCount chars = unibuf.GetChars() ;
-    
+
     status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
@@ -1704,30 +1704,30 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
 
     ATSLineLayoutOptions layoutOptions = kATSLineNoLayoutOptions ;
-    
+
     if (m_font.GetNoAntiAliasing())
     {
         layoutOptions |= kATSLineNoAntiAliasing ;
     }
-    
+
     ATSUAttributeTag atsuTags[] =
     {
         kATSULineLayoutOptionsTag ,
     } ;
-    
+
     ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         sizeof( ATSLineLayoutOptions ) ,
     } ;
-    
+
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
     {
         &layoutOptions ,
     } ;
-    
+
     status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
             atsuTags, atsuSizes, atsuValues ) ;
-            
+
     for ( int pos = 0; pos < (int)chars ; pos ++ )
     {
         unsigned long actualNumberOfBounds = 0;

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index beddc49b5cca55526b2768cec4cbac30a104e06c..ff20b5cc6ba4675870597591202366748b9e0518 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/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__

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 3473bf72baf3c9f993e1185c103a0ee4d4155010..26113eac7a92baeeec07f49a29895e182d5e86a5 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/mac/carbon/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
@@ -180,7 +184,7 @@ bool wxIcon::LoadFile(
                     desiredHeight = loadimage.GetHeight() ;
                 if ( desiredWidth != loadimage.GetWidth() || desiredHeight != loadimage.GetHeight() )
                     loadimage.Rescale( desiredWidth , desiredHeight ) ;
-    
+
                 wxBitmap bmp( loadimage );
                 CopyFromBitmap( bmp ) ;
 

diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp
index 04c71a729aabc68bfd0a40fc7740b4039b0d92c9..054cdeb73407a1ac2eb82ffe21d60d4e71f6cd58 100644 (file)
--- a/src/mac/carbon/imaglist.cpp
+++ b/src/mac/carbon/imaglist.cpp
@@ -20,10 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 04c84ae3cdb8a29914bfd3f505186aff6af87387..3764fd37cecbf256f87093945c3c7b14202e7df7 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/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"
 
 
@@ -82,7 +82,7 @@ bool wxNotebook::Create( wxWindow *parent,
 
     if (! (style & wxBK_ALIGN_MASK))
         style |= wxBK_TOP;
-    
+
     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index 54cc8bba0193f87f806c229c5116b2933ae16756..beae4cbe2d0b4cfd734ad12f351b5199dce97a88 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/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"

diff --git a/src/mac/classic/cursor.cpp b/src/mac/classic/cursor.cpp
index 8442483bc6911eacd4fb9279bfb72cece24a1684..d299c18b340260bc48184e8b77b71d54f319ef49 100644 (file)
--- a/src/mac/classic/cursor.cpp
+++ b/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"

diff --git a/src/mac/classic/dataobj.cpp b/src/mac/classic/dataobj.cpp
index 0c26a14a5b8f2dac9656c468cfd0c0bedb666a0e..3ba0b99de71c9bb41c6ad6a6d86de77a9f4712d4 100644 (file)
--- a/src/mac/classic/dataobj.cpp
+++ b/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>
 
@@ -170,7 +170,7 @@ bool wxDataObject::IsSupportedFormat(
 
 bool wxFileDataObject::GetDataHere( void* pBuf ) const
 {
-    wxString                        sFilenames;
+    wxString sFilenames;
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
@@ -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;
     }
 

diff --git a/src/mac/classic/dc.cpp b/src/mac/classic/dc.cpp
index 8d1e1762df203e22d8c78fd8724888d8925e59d9..273aa554bdbfd79b126b674a10d150311d739feb 100644 (file)
--- a/src/mac/classic/dc.cpp
+++ b/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 {}

diff --git a/src/mac/classic/notebmac.cpp b/src/mac/classic/notebmac.cpp
index 4ef04c7b47ce5c80da203e95f28c732c8c3fb8c3..3bf911dd74b9c58608b5a107186276fb582246c2 100644 (file)
--- a/src/mac/classic/notebmac.cpp
+++ b/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
@@ -189,7 +189,7 @@ bool wxNotebook::Create(wxWindow *parent,
 
     if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
         style |= wxBK_TOP;
-    
+
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
     int tabstyle = kControlTabSmallNorthProc ;

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 5eb34733e82acd77fa29d8626204bb526c21173e..d2795dffb063f9f21a5671736a3ddb29143f51df 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/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"

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 11c30421c7d75f157938b61edf9cc651c0ad5d5b..afb0b8a83fced02d2d1ec5906a7a86a79cf00d9f 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/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
 

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 94bd4419e5f3cbf25bbad5bf660058f057447169..4be5fd8223384730644674b955c3b7cd1fb17a11 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -47,10 +47,9 @@
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index af05803527087fee9fa54d648d481d0be8c50215..a07199e234054d006f2735c3263b6d4650430028 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -36,19 +36,19 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
+    #include "wx/rawbmp.h"
 #endif
 
 // missing from mingw32 header

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index fd05a25f537711935ca0b12be3c6899cb0ce1d3b..b82972500eaeb3ba14bd02d360e8308c21374792 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/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"
 

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index b50ffa10523344bcbfb0ea59119bfde7e4930bb5..47a2aca746e60aa5f5b2dc3d289f507083dc5991 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/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;
     }
 }
-
-

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 09b10aaedacf9f1fdc82229cde44caaa2a630d63..ee17d5d2b1a48b4a8d8bf469d151b8834c1fb192 100644 (file)
--- a/src/msw/dib.cpp
+++ b/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__

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 75d271d05c8c51fbdbebb3c57ae9632f3d93abfb..06675c2b0f9fde7d572328bbb63f8521fc82d0c1 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/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"

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 7a42766424145339a5e2a97e26742925e07a2593..d9ffadf717c40af7e26d83acb561178d6deba7d0 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/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"
 

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index e0680382eb061d618993d244e7c4a21dcb1e57b0..bb524d5b45011c5a6f884c6efa2f8715511085b4 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/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"

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index f28404d38b126fcfa7e2e2cfae08ab8a3c7894ab..7a64abe8e55068eb0217862fae2496fb208880c7 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/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"
 

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 6c4cb2fd22ba6ba52829761bc4fc44bbf7827c7a..c7d256e0f7ae18aac41228c3b712d02fc1c23eb0 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/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"
 
 // ----------------------------------------------------------------------------

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index fec983bf6018ea5503968e1969f3be5946c02a1a..24fbc16ea100bc79880c54c8d923f50b03481e51 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/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"
 

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 3dfd2b17e5a1ebc14580f2d1752cde35f246a743..c07595d1561cced39a15f7ace38fcda5da64cb5e 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/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;
     }
 

diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index b24f6d23f524d09af0c202da893ec276a8b6a6a7..75ae168b583bedaa909c2aea25bdaf6b7813e38b 100644 (file)
--- a/src/palmos/bitmap.cpp
+++ b/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

diff --git a/src/palmos/cursor.cpp b/src/palmos/cursor.cpp
index de3a5ef23173d9b6c18f6baa649c8b35db410bed..ddec4ac7c6295254edadbbfb0166b5043bb41d85 100644 (file)
--- a/src/palmos/cursor.cpp
+++ b/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

diff --git a/src/palmos/dib.cpp b/src/palmos/dib.cpp
index 65eecf37da38093af28bdb3e7777a06828987ff5..4b0aaf7ad148b96a812cda8afc077d38cbae30a7 100644 (file)
--- a/src/palmos/dib.cpp
+++ b/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"
 
 // ----------------------------------------------------------------------------

diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp
index b96507dd2358744dd9a0eabbfef518276f7b2a13..ad2a6dc855c6b409d2413ee33d95042f63e7c224 100644 (file)
--- a/src/palmos/dragimag.cpp
+++ b/src/palmos/dragimag.cpp
@@ -36,10 +36,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #include "wx/palmos/dragimag.h"
 #include "wx/palmos/private.h"
 

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index cda4d045a1023baf9edf15cd9d293745f0533868..56e99ae7dd0d34b0edca259815c4bc7ef39dde33 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -33,10 +33,9 @@
     #include "wx/dc.h"
     #include "wx/log.h"
     #include "wx/gauge.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/image.h"
-
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
@@ -875,4 +874,3 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
 }
 
 #endif // wxUSE_GAUGE
-

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 33299177722ac7b79beecd9795f2efe06c70a66c..e731e6b50e75abf80db271686488c1d04aa5bb1b 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/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

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 6c87d6b89493863dd942ae12032e4fcc13759025..2558a59fe1375de450f99ac4b780add2a518b674 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/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

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index bdd436fc04c64afc0f81dbcb7b82325b4fa927cd..a6d53027834ae887af453e34206e5310f41c037a 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 401881eb917cdcd4e392defa2660edce66991eaa..b4ed44b881931d1a9a0e879f15e9c8751d5847ba 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/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"
 

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 4eef00ff184b814f021e62e1310aea87f4000337..9535ee340e02b02775fe47331d91caa128b7753d 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -30,10 +30,9 @@
     #include "wx/statbmp.h"
     #include "wx/sizer.h"
     #include "wx/bitmap.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #ifdef __VMS
 #pragma message disable nosimpint
 #endif

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index b81271298defa297c8993040b29dd15af4f330f9..b8ec41fabd0a05069cc06aff691ae344f3b07414 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 91951610bb987cd7c7f2be96a40d2ee9cfea8e35..7236c231b7c6311a69c94428397f4af363df8479 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -20,10 +20,9 @@
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
 #include "wx/x11/private.h"
 
 /* No point in using libXPM for NanoX */

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index d1562f99bf4f99f98c907f5c67c8a7a1eaa0611d..1f2d5aaf0990a8bb7238a6934d7a239f5976475a 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/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();

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 37787a903d75b339f579f3786a82c5da65c5f169..c7dc8b92762df18a5dd12df433101ba68ab23708 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/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"
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 4d5f2d6b71c79ec4b06a6773d707204a7513e3e0..8743a5c135c1f481940252b024ebd35ccc084a20 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/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"