X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/452418c4b0763eb611432e84f077c9766e282057..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/xpmdecod.h?ds=sidebyside diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 96cdab7732..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$ @@ -14,14 +14,14 @@ #if wxUSE_IMAGE && wxUSE_XPM -class WXDLLIMPEXP_CORE wxImage; -class WXDLLIMPEXP_BASE wxInputStream; +class WXDLLIMPEXP_FWD_CORE wxImage; +class WXDLLIMPEXP_FWD_BASE wxInputStream; // -------------------------------------------------------------------------- // wxXPMDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMDecoder +class WXDLLIMPEXP_CORE wxXPMDecoder { public: // constructor, destructor, etc. @@ -30,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* 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_XPM_H_ -