From 155ecd4c4221d3bbc7aa93d472d11948f21d21ab Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Mon, 3 Jul 2006 19:02:54 +0000
Subject: [PATCH] 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 | 8 +++---
include/wx/wx.h | 1 +
src/aui/dockart.cpp | 2 +-
src/aui/framemanager.cpp | 5 +---
src/cocoa/bitmap.mm | 2 +-
src/common/artprov.cpp | 5 +---
src/common/artstd.cpp | 7 +++--
src/common/bmpbase.cpp | 2 +-
src/common/fs_mem.cpp | 5 +---
src/common/iconbndl.cpp | 3 ---
src/common/imagall.cpp | 9 +++----
src/common/imagfill.cpp | 3 +--
src/common/quantize.cpp | 5 ++--
src/common/rgncmn.cpp | 6 +----
src/common/tbarbase.cpp | 5 +---
src/common/xpmdecod.cpp | 2 +-
src/generic/buttonbar.cpp | 3 +--
src/generic/dcpsg.cpp | 2 +-
src/generic/dirctrlg.cpp | 4 +--
src/generic/dragimgg.cpp | 5 +---
src/generic/imaglist.cpp | 3 +--
src/gtk/app.cpp | 2 +-
src/gtk/bitmap.cpp | 2 +-
src/gtk/dataobj.cpp | 6 ++---
src/gtk/dcclient.cpp | 2 +-
src/gtk1/app.cpp | 2 +-
src/gtk1/bitmap.cpp | 2 +-
src/gtk1/dataobj.cpp | 6 ++---
src/gtk1/dcclient.cpp | 2 +-
src/html/m_image.cpp | 2 +-
src/html/m_layout.cpp | 3 +--
src/mac/carbon/bitmap.cpp | 2 +-
src/mac/carbon/cursor.cpp | 2 +-
src/mac/carbon/dataobj.cpp | 2 +-
src/mac/carbon/dc.cpp | 50 ++++++++++++++++++------------------
src/mac/carbon/dccg.cpp | 2 +-
src/mac/carbon/icon.cpp | 12 ++++++---
src/mac/carbon/imaglist.cpp | 3 +--
src/mac/carbon/notebmac.cpp | 4 +--
src/mac/classic/bitmap.cpp | 2 +-
src/mac/classic/cursor.cpp | 2 +-
src/mac/classic/dataobj.cpp | 8 +++---
src/mac/classic/dc.cpp | 2 +-
src/mac/classic/notebmac.cpp | 4 +--
src/mgl/bitmap.cpp | 3 +--
src/motif/cursor.cpp | 3 ---
src/motif/dcclient.cpp | 3 +--
src/msw/bitmap.cpp | 6 ++---
src/msw/bmpbuttn.cpp | 2 +-
src/msw/cursor.cpp | 4 +--
src/msw/dib.cpp | 2 +-
src/msw/dragimag.cpp | 2 +-
src/msw/imaglist.cpp | 4 +--
src/msw/statbox.cpp | 3 +--
src/msw/tbar95.cpp | 2 +-
src/os2/bitmap.cpp | 2 +-
src/os2/cursor.cpp | 2 +-
src/os2/dataobj.cpp | 6 ++---
src/palmos/bitmap.cpp | 2 +-
src/palmos/cursor.cpp | 2 +-
src/palmos/dib.cpp | 2 +-
src/palmos/dragimag.cpp | 3 +--
src/univ/ctrlrend.cpp | 4 +--
src/univ/themes/gtk.cpp | 2 +-
src/univ/themes/win32.cpp | 2 +-
src/univ/toolbar.cpp | 3 +--
src/univ/topluniv.cpp | 2 +-
src/unix/taskbarx11.cpp | 3 +--
src/unix/utilsx11.cpp | 2 +-
src/x11/bitmap.cpp | 3 +--
src/x11/dataobj.cpp | 10 ++++----
src/x11/dcclient.cpp | 2 +-
src/xrc/xmlres.cpp | 2 +-
73 files changed, 131 insertions(+), 168 deletions(-)
diff --git a/include/wx/image.h b/include/wx/image.h
index 51c77dbb4c..5aa6984d28 100644
--- 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 089ce8ccad..d78b7eca02 100644
--- 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 60e9955f5c..563154c89e 100644
--- 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 99614d7638..d935c9304b 100644
--- 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 08e8d435fe..6152fa12e8 100644
--- 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 d97e28b455..04873a0698 100644
--- 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 35f10467b9..314e609089 100644
--- 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 e36107a2ac..c0a5d14551 100644
--- 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 7b83991f0a..ae176a802d 100644
--- 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 afdb96b826..4a0b326a64 100644
--- 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 bc437495c0..060d9c78b0 100644
--- 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 89c1e5f784..b81b977055 100644
--- 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 b5936f21fb..cb30f64599 100644
--- 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 6b7bac3a5c..0732bd75c6 100644
--- 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 54878f1ebd..7814a7b4ae 100644
--- 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 a5fdfa8f15..fa9bcb9fc7 100644
--- 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 49e3210bb9..e56e4ddce2 100644
--- 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 33bd3d37dd..232dcccf81 100644
--- 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 b5ea30a321..cf1e8c5e11 100644
--- 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 b40140c453..40b92e410b 100644
--- 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 2cc89ab085..4fbf79d9df 100644
--- 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 3169d49914..c9f6bbc827 100644
--- 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 e420d57b51..a90312de4d 100644
--- 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 8ed8108997..88ba70ce97 100644
--- 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 06b60cd000..805f66d495 100644
--- 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 467858c628..65f7a46441 100644
--- 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 bd4abefa09..41161ec1e7 100644
--- 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 fc029b8565..e93e1d7047 100644
--- 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 a5b9b4a5d0..6dd1e9f48d 100644
--- 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 c7586333b0..d4a9eaebee 100644
--- 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 e118e82fc7..07b483b7d0 100644
--- 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 e2b19004cc..cc22e44921 100644
--- 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 67d8810712..94d1b3d1fb 100644
--- 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 041084127d..ead5d2fd39 100644
--- 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 6f8ecf23df..4b75c0fdbf 100644
--- 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 beddc49b5c..ff20b5cc6b 100755
--- 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 3473bf72ba..26113eac7a 100644
--- 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 04c71a729a..054cdeb734 100644
--- 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 04c84ae3cd..3764fd37ce 100644
--- 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 54cc8bba01..beae4cbe2d 100644
--- 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 8442483bc6..d299c18b34 100644
--- 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 0c26a14a5b..3ba0b99de7 100644
--- 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 8d1e1762df..273aa554bd 100644
--- 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 4ef04c7b47..3bf911dd74 100644
--- 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 5eb34733e8..d2795dffb0 100644
--- 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 11c30421c7..afb0b8a83f 100644
--- 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 94bd4419e5..4be5fd8223 100644
--- 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 af05803527..a07199e234 100644
--- 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 fd05a25f53..b82972500e 100644
--- 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 b50ffa1052..47a2aca746 100644
--- 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 09b10aaeda..ee17d5d2b1 100644
--- 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 75d271d05c..06675c2b0f 100644
--- 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 7a42766424..d9ffadf717 100644
--- 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 e0680382eb..bb524d5b45 100644
--- 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 f28404d38b..7a64abe8e5 100644
--- 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 6c4cb2fd22..c7d256e0f7 100644
--- 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 fec983bf60..24fbc16ea1 100644
--- 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 3dfd2b17e5..c07595d156 100644
--- 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 b24f6d23f5..75ae168b58 100644
--- 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 de3a5ef231..ddec4ac7c6 100644
--- 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 65eecf37da..4b0aaf7ad1 100644
--- 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 b96507dd23..ad2a6dc855 100644
--- 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 cda4d045a1..56e99ae7dd 100644
--- 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 3329917772..e731e6b50e 100644
--- 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 6c87d6b894..2558a59fe1 100644
--- 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 bdd436fc04..a6d5302783 100644
--- 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 401881eb91..b4ed44b881 100644
--- 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 4eef00ff18..9535ee340e 100644
--- 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 b81271298d..b8ec41fabd 100644
--- 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 91951610bb..7236c231b7 100644
--- 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 d1562f99bf..1f2d5aaf09 100644
--- 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 37787a903d..c7dc8b9276 100644
--- 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 4d5f2d6b71..8743a5c135 100644
--- 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"
--
2.47.2