use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index df340cd7b0ea5661929e806ea352ac28d212078e..8097d8e65654f792ae6da54ed5903806d872b931 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_
 
-#ifdef __GNUG__
-#pragma interface "imagiff.h"
-#endif
-
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------
@@ -24,8 +20,6 @@
 
 class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
-
 public:
     wxIFFHandler()
     {
@@ -33,13 +27,16 @@ public:
         m_extension = wxT("iff");
         m_type = wxBITMAP_TYPE_IFF;
         m_mime = wxT("image/x-iff");
-    };
+    }
 
 #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
+
+    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
 };
 
 #endif // wxUSE_IMAGE && wxUSE_IFF