Rebake from clean wx tree.

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 76807996b2a20353d77aa52cb1da81a6d3847028..c3e1b3ed9b6c61b22de21c0b2b930559c0e807f5 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagpcx.h"
-#endif
-
 #include "wx/image.h"
 
 
@@ -22,7 +18,7 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX
-class WXDLLEXPORT wxPCXHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxPCXHandler : public wxImageHandler
 {
 public:
     inline wxPCXHandler()
@@ -34,8 +30,9 @@ 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 // wxUSE_STREAMS