Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 1533483fff8227c8a93ff3945ffa6faf3a993703..ac1c8c94400b83acb7849d7415fcce578f0466af 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagpcx.h
+// Name:        wx/imagpcx.h
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // RCS-ID:      $Id$
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
-#ifdef __GNUG__
-#pragma interface "imagpcx.h"
-#endif
-
 #include "wx/image.h"
 
 
@@ -22,25 +18,26 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX
-class WXDLLEXPORT wxPCXHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxPCXHandler : public wxImageHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
-
 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
-  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 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
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPCXHandler)
 };
 #endif // wxUSE_PCX