X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..c5c1ea964817e562d1c4b0d89b3937fce28c3f10:/include/wx/imagxpm.h diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index f8825308c2..46903ea921 100644 --- a/include/wx/imagxpm.h +++ b/include/wx/imagxpm.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaggif.h +// Name: wx/imagxpm.h // Purpose: wxImage XPM handler // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -10,18 +10,15 @@ #ifndef _WX_IMAGXPM_H_ #define _WX_IMAGXPM_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "imagxpm.h" -#endif - #include "wx/image.h" +#if wxUSE_XPM //----------------------------------------------------------------------------- // wxXPMHandler //----------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxXPMHandler : public wxImageHandler { public: inline wxXPMHandler() @@ -33,8 +30,9 @@ 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 ); + 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 @@ -42,7 +40,6 @@ private: DECLARE_DYNAMIC_CLASS(wxXPMHandler) }; +#endif // wxUSE_XPM -#endif - // _WX_IMAGXPM_H_ - +#endif // _WX_IMAGXPM_H_