X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29b7b6caad34b77411878205baaa2ea15e2afa02..f1b63efe8993c6c0460354bc2da7331526d43efa:/include/wx/xpmdecod.h diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index e6e5b30d35..00e33a728f 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. @@ -38,11 +38,10 @@ public: 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 }; #endif // wxUSE_IMAGE && wxUSE_XPM #endif // _WX_XPM_H_ -