undid previous commit, the person who reported it retracted his claim

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index 8ac4cdd554310ccdf7c48d602970a3d6063da807..658fa3d62232ca287969d7723502cfe3f5695e64 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGXPM_H_
 #define _WX_IMAGXPM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "imagxpm.h"
 #endif
 
@@ -21,7 +21,6 @@
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
-#if wxUSE_XPM
 class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxXPMHandler)
@@ -37,12 +36,11 @@ public:
   };
 
 #if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+  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
 };
-#endif // wxUSE_XPM
 
 
 #endif