X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..158b668823e14d9b42c9e7fe0281d35924192c68:/include/wx/imagxpm.h diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index 7ffcaa926d..f8825308c2 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 @@ -23,23 +23,23 @@ class WXDLLEXPORT wxXPMHandler : public wxImageHandler { - DECLARE_DYNAMIC_CLASS(wxXPMHandler) - public: - - inline wxXPMHandler() - { - m_name = wxT("XPM file"); - m_extension = wxT("xpm"); - m_type = wxBITMAP_TYPE_XPM; - m_mime = wxT("image/xpm"); - }; + inline wxXPMHandler() + { + m_name = wxT("XPM file"); + m_extension = wxT("xpm"); + m_type = wxBITMAP_TYPE_XPM; + m_mime = wxT("image/xpm"); + } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); - virtual bool DoCanRead( wxInputStream& stream ); + 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 + +private: + DECLARE_DYNAMIC_CLASS(wxXPMHandler) };