Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index df340cd7b0ea5661929e806ea352ac28d212078e..f7307ba5e11a4b22a2015db52fb1b35e92c8a4e6 100644 (file)
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagiff.h
+// Name:        wx/imagiff.h

 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann
 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann

-// RCS-ID:      $Id$

 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,10 +9,6 @@
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 
 #ifndef _WX_IMAGE_IFF_H_
 #define _WX_IMAGE_IFF_H_
 

-#ifdef __GNUG__
-#pragma interface "imagiff.h"
-#endif
-

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


@@ -22,10 +17,8 @@
 
 #if wxUSE_IMAGE && wxUSE_IFF
 
 
 #if wxUSE_IMAGE && wxUSE_IFF
 

-class WXDLLEXPORT wxIFFHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxIFFHandler : public wxImageHandler

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
-

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


@@ -33,13 +26,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);
+protected:

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

+
+    DECLARE_DYNAMIC_CLASS(wxIFFHandler)

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