Fix linking problems with MSVC 5.

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 8091ce4d43468013250b89abd1f7205bd858a93e..3591d7570e3e54e0cf368783dc17e2335fcdfad7 100644 (file)
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -1,52 +1,48 @@
-//
-// imgiff.h    - image handler for Amiga IFF images
-//               parts of the source taken by xv source code.
-//
-// (c) Steffen Gutmann, 2002
-//
-// Creation date: 08.01.2002
-// Last modified: 08.01.2002
-//
-
-#ifndef WX_IMAGE_IFF_H
-#define WX_IMAGE_IFF_H
-
-#ifdef __GNUG__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagiff.h
+// Purpose:     wxImage handler for Amiga IFF images
+// Author:      Steffen Gutmann
+// RCS-ID:      $Id$
+// Copyright:   (c) Steffen Gutmann, 2002
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_IMAGE_IFF_H_
+#define _WX_IMAGE_IFF_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "imagiff.h"
 #endif
 
 #include "wx/image.h"
 #pragma interface "imagiff.h"
 #endif
 
 #include "wx/image.h"

-#define wxUSE_IFF 1

 
 //-----------------------------------------------------------------------------
 // wxIFFHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxIFFHandler
 //-----------------------------------------------------------------------------
 

-#if wxUSE_IFF
+#if wxUSE_IMAGE && wxUSE_IFF

 
 class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {
 
 class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
-

 public:
 public:

-

     wxIFFHandler()
     {
     wxIFFHandler()
     {

-       m_name = "IFF file";
-       m_extension = "iff";
-       m_type = wxBITMAP_TYPE_ANY;
-       // m_mime = "image/iff";
-    };
+        m_name = wxT("IFF file");
+        m_extension = wxT("iff");
+        m_type = wxBITMAP_TYPE_IFF;
+        m_mime = wxT("image/x-iff");
+    }

 
 #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 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);
 #endif
     virtual bool DoCanRead(wxInputStream& stream);
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIFFHandler)

 };
 };

-#endif

 
 

-#endif
+#endif // wxUSE_IMAGE && wxUSE_IFF

 
 

+#endif // _WX_IMAGE_IFF_H_