wxOS2 build fixes after wxColourBase introduction.

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index f9c0dab41136315cef300932ffedee117c7486a0..0e8693dca09334adaa6af82997be45017ccff431 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 

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

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


@@ -24,23 +20,24 @@
 #if wxUSE_PCX
 class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {
 #if wxUSE_PCX
 class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
-

 public:
 public:

-
-  inline wxPCXHandler()
-  {
-      m_name = "PCX file";
-      m_extension = "pcx";
-      m_type = wxBITMAP_TYPE_PCX;
-      m_mime = "image/pcx";
-  };
+    inline wxPCXHandler()
+    {
+        m_name = wxT("PCX file");
+        m_extension = wxT("pcx");
+        m_type = wxBITMAP_TYPE_PCX;
+        m_mime = wxT("image/pcx");
+    }

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool DoCanRead( wxInputStream& stream );
+    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
 #endif // wxUSE_STREAMS

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPCXHandler)

 };
 #endif // wxUSE_PCX
 
 };
 #endif // wxUSE_PCX