X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62a9d04c7d9cd359f692f72db2adb781b17b4e69..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/xpmdecod.h?ds=sidebyside diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index f35b7f47ea..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$ @@ -10,15 +10,12 @@ #ifndef _WX_XPMDECOD_H_ #define _WX_XPMDECOD_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "xpmdecod.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.h" +#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 @@ -38,9 +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_GIFDECOD_H_ - +#endif // _WX_XPM_H_