Use wxClientDataDictionary for client data.

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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 6d25bf9ba3c608443614ca6102fcdafafe6a86f1..67657d6d4f3984e715fb9ddc91c47c7b5211ad92 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 

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

 #pragma interface "imagtiff.h"
 #endif
 
 #pragma interface "imagtiff.h"
 #endif
 


@@ -24,24 +24,24 @@
 #if wxUSE_LIBTIFF
 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 #if wxUSE_LIBTIFF
 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
-

 public:
 public:

-
-  inline wxTIFFHandler()
-  {
-      m_name = "TIFF file";
-      m_extension = "tif";
-      m_type = wxBITMAP_TYPE_TIF;
-      m_mime = "image/tiff";
-  };
+    inline wxTIFFHandler()
+    {
+        m_name = wxT("TIFF file");
+        m_extension = wxT("tif");
+        m_type = wxBITMAP_TYPE_TIF;
+        m_mime = wxT("image/tiff");
+    }

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool DoCanRead( wxInputStream& stream );
-  virtual int GetImagesCount( wxInputStream& stream );
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+    virtual bool DoCanRead( wxInputStream& stream );
+    virtual int GetImageCount( wxInputStream& stream );

 #endif
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxTIFFHandler)

 };
 #endif
 
 };
 #endif