leave i386 compiler to default

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

diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index ff8813f87005395f4c601694245b71e1e3ce8bcd..cc9d54fa8a005b63209796a0ff6552c1848827e7 100644 (file)
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagpcx.h
+// Name:        wx/imagpcx.h

 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>

-// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,10 +9,6 @@
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 
 #ifndef _WX_IMAGPCX_H_
 #define _WX_IMAGPCX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagpcx.h"
-#endif
-

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


@@ -22,7 +17,7 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX

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

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


@@ -36,6 +31,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