Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 93c3822466759dc17a71694d7d22c0d3083be5d3..ed43fad66abb49f488674a3f3ba37d9b42c7c9d7 100644 (file)
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagiff.h
+// Name:        wx/imagiff.h
 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann
 // RCS-ID:      $Id$
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagiff.h"
-#endif
-
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------
@@ -22,7 +18,7 @@
 
 #if wxUSE_IMAGE && wxUSE_IFF
 
-class WXDLLEXPORT wxIFFHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxIFFHandler : public wxImageHandler
 {
 public:
     wxIFFHandler()
@@ -34,12 +30,12 @@ public:
     }
 
 #if wxUSE_STREAMS
-    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 LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1);
+    virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true);
+protected:
     virtual bool DoCanRead(wxInputStream& stream);
 #endif
 
-private:
     DECLARE_DYNAMIC_CLASS(wxIFFHandler)
 };