Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 15871d6fc24a152025ce2c9b9df40fc2ca442e02..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$
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // RCS-ID:      $Id$


@@ -18,7 +18,7 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX

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

 {
 public:
     inline wxPCXHandler()
 {
 public:
     inline wxPCXHandler()


@@ -32,6 +32,7 @@ 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 );
 #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 );

+protected:

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