X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/xpmdecod.h?ds=sidebyside diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 549e7eba73..db2f2ef15b 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -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,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 };