X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/xpmdecod.h diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 5fd3ebe509..db2f2ef15b 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_BASE wxInputStream; // wxXPMDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMDecoder +class WXDLLIMPEXP_CORE wxXPMDecoder { public: // constructor, destructor, etc. @@ -30,15 +30,20 @@ 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(wx_const_cast(const char* const*, xpm_data)); } + wxImage ReadData(char** xpm_data) + { return ReadData(const_cast(xpm_data)); } #endif };