Small speed up to fonts and support for scaling.

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index 6df67faa3c9e11ebdc649dfce081b66525fabc62..257fd9773bcdb45ad3713dcf86d2235794bc2b32 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGE_H_
 #define _WX_IMAGE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "image.h"
 #endif
 
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 {
 public:
     wxImageHandler()
-        : m_name(""), m_extension(""), m_mime(), m_type(0)
+        : m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0)
         { }
 
 #if wxUSE_STREAMS
@@ -53,7 +53,7 @@ public:
 
     virtual int GetImageCount( wxInputStream& stream );
 
-    bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+    bool CanRead( wxInputStream& stream ) { return CallDoCanRead(stream); }
     bool CanRead( const wxString& name );
 #endif // wxUSE_STREAMS
 
@@ -69,6 +69,9 @@ public:
 protected:
 #if wxUSE_STREAMS
     virtual bool DoCanRead( wxInputStream& stream ) = 0;
+
+    // save the stream position, call DoCanRead() and restore the position
+    bool CallDoCanRead(wxInputStream& stream);
 #endif // wxUSE_STREAMS
 
     wxString  m_name;
@@ -118,9 +121,9 @@ public:
     wxImage( const wxImage* image );
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-    // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
-    wxImage( const wxBitmap &bitmap );
-    wxBitmap ConvertToBitmap() const;
+    // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
+    wxDEPRECATED( wxImage(const wxBitmap &bitmap) );
+    wxDEPRECATED( wxBitmap ConvertToBitmap() const );
 #ifdef __WXGTK__
     wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
 #endif
@@ -245,9 +248,9 @@ public:
         return *this;
     }
 
-    bool operator == (const wxImage& image)
+    bool operator == (const wxImage& image) const
         { return m_refData == image.m_refData; }
-    bool operator != (const wxImage& image)
+    bool operator != (const wxImage& image) const
         { return m_refData != image.m_refData; }
 
     static wxList& GetHandlers() { return sm_handlers; }