X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/552796e07e1f40137c7ef97923fdf90860cc034e..3ac1094bead05e30462122d00e4859725d2ea59f:/include/wx/xpmdecod.h?ds=inline diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index bf75164ac3..5fd3ebe509 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,8 +14,8 @@ #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 @@ -35,10 +35,13 @@ public: 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(wx_const_cast(const char* const*, xpm_data)); } +#endif }; #endif // wxUSE_IMAGE && wxUSE_XPM #endif // _WX_XPM_H_ -