Updated Scintilla to 1.52 (on the trunk this time too)

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 1533483fff8227c8a93ff3945ffa6faf3a993703..40d3ca7c7e05a88b2ffa89a35ef42a2638c56ce8 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagpcx.h"
 #endif
 
@@ -24,23 +24,23 @@
 #if wxUSE_PCX
 class WXDLLEXPORT 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 );
+    virtual bool DoCanRead( wxInputStream& stream );
 #endif // wxUSE_STREAMS
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPCXHandler)
 };
 #endif // wxUSE_PCX