X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/424f5e27007ebf54b3b186e48d05d1c039c8e6ea..1bcef6701be81d1f4473eb5a297bdf20fa292d98:/include/wx/xpmdecod.h diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 13c1e86b9e..db2f2ef15b 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xpmdecod.h +// Name: wx/xpmdecod.h // Purpose: wxXPMDecoder, XPM reader for wxImage and wxBitmap // Author: Vaclav Slavik // CVS-ID: $Id$ @@ -10,22 +10,18 @@ #ifndef _WX_XPMDECOD_H_ #define _WX_XPMDECOD_H_ -#ifdef __GNUG__ -#pragma interface "xpmdecod.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_IMAGE && wxUSE_XPM -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxInputStream; +class WXDLLIMPEXP_FWD_CORE wxImage; +class WXDLLIMPEXP_FWD_BASE wxInputStream; // -------------------------------------------------------------------------- // wxXPMDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMDecoder +class WXDLLIMPEXP_CORE wxXPMDecoder { public: // constructor, destructor, etc. @@ -34,15 +30,23 @@ public: #if wxUSE_STREAMS // Is the stream XPM file? + // NOTE: this function modifies the current stream position bool CanRead(wxInputStream& stream); + // Read XPM file from the stream, parse it and create image from it wxImage ReadFile(wxInputStream& stream); #endif + // Read directly from XPM data (as passed to wxBitmap ctor): - wxImage ReadData(const char **xpm_data); -}; + wxImage ReadData(const char* const* xpm_data); +#ifdef __BORLANDC__ + // needed for Borland 5.5 + wxImage ReadData(char** xpm_data) + { return ReadData(const_cast(xpm_data)); } +#endif +}; -#endif // wxUSE_IMAGE && wxUSE_XPM -#endif // _WX_GIFDECOD_H_ +#endif // wxUSE_IMAGE && wxUSE_XPM +#endif // _WX_XPM_H_