update mac gl, after rev 50900

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 3591d7570e3e54e0cf368783dc17e2335fcdfad7..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_
 
 #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"
 
 //-----------------------------------------------------------------------------


@@ -34,12 +30,12 @@ public:
     }
 
 #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);
+protected:

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

-private:

     DECLARE_DYNAMIC_CLASS(wxIFFHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIFFHandler)
 };