fix the bug which prevented the same wxFile/DirDialog object from being used twice...

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 076cc115a949d4cefef04117cb0467dab3ed2b2c..4d0e52c715a5d766586c823df016fd087de893dd 100644 (file)
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "imagiff.h"
-#endif
-

 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------


@@ -24,8 +20,6 @@
 
 class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {
 
 class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {

-    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
-

 public:
     wxIFFHandler()
     {
 public:
     wxIFFHandler()
     {


@@ -33,13 +27,16 @@ public:
         m_extension = wxT("iff");
         m_type = wxBITMAP_TYPE_IFF;
         m_mime = wxT("image/x-iff");
         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=-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);

     virtual bool DoCanRead(wxInputStream& stream);
 #endif
     virtual bool DoCanRead(wxInputStream& stream);
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIFFHandler)

 };
 
 #endif // wxUSE_IMAGE && wxUSE_IFF
 };
 
 #endif // wxUSE_IMAGE && wxUSE_IFF