gcc is too aggressively hiding these inlines on wxCriticialSection on osx, expose...

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index c4ae5e262b85eab23f31b5816125b12ceeb20e78..77181f8f6c771c1c6eb1a71efc6363fb75c0bca5 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -10,18 +10,15 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 

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

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

+#if wxUSE_XPM

 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     inline wxXPMHandler()
 {
 public:
     inline wxXPMHandler()


@@ -33,8 +30,9 @@ public:
     }
 
 #if wxUSE_STREAMS
     }
 
 #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 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
 
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 


@@ -42,6 +40,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 

+#endif // wxUSE_XPM

 
 #endif
   // _WX_IMAGXPM_H_
 
 #endif
   // _WX_IMAGXPM_H_