X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/775c6f0cd21023a0bcb409b25b57504abb4b6dc4..307b0b97ee4c88f7fab8b48e463da54b72b41367:/include/wx/imagxpm.h?ds=sidebyside diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index 8ac4cdd554..658fa3d622 100644 --- 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