added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 7522d068541b532cfc0cc8f944aa1658261c4c53..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_
 
 #ifndef _WX_IMAGE_H_
 #define _WX_IMAGE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "image.h"
 #endif
 
 #pragma interface "image.h"
 #endif
 


@@ -43,7 +43,9 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
 public:
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
 public:

-    wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
+    wxImageHandler()
+        : m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0)
+        { }

 
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );
 
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );


@@ -51,7 +53,7 @@ public:
 
     virtual int GetImageCount( wxInputStream& stream );
 
 
     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
 
     bool CanRead( const wxString& name );
 #endif // wxUSE_STREAMS
 


@@ -67,6 +69,9 @@ public:
 protected:
 #if wxUSE_STREAMS
     virtual bool DoCanRead( wxInputStream& stream ) = 0;
 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;
 #endif // wxUSE_STREAMS
 
     wxString  m_name;


@@ -116,9 +121,9 @@ public:
     wxImage( const wxImage* image );
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
     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
 #ifdef __WXGTK__
     wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
 #endif


@@ -243,9 +248,9 @@ public:
         return *this;
     }
 
         return *this;
     }
 

-    bool operator == (const wxImage& image)
+    bool operator == (const wxImage& image) const

         { return m_refData == image.m_refData; }
         { 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; }
         { return m_refData != image.m_refData; }
 
     static wxList& GetHandlers() { return sm_handlers; }