X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70bf3295928711b17e5931a492104c160546544e..54cb21d692f6d62911820c3c6bc063af90d11e47:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index b40f7d305d..ffb1e3777b 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -36,6 +36,9 @@ #define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) +#define wxIMAGE_OPTION_MAX_WIDTH wxString(_T("MaxWidth")) +#define wxIMAGE_OPTION_MAX_HEIGHT wxString(_T("MaxHeight")) + // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT // // NB: don't change these values, they correspond to libjpeg constants @@ -233,8 +236,8 @@ public: bool Create( const char* const* xpmData ); #ifdef __BORLANDC__ // needed for Borland 5.5 - wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); } - bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); } + wxImage( char** xpmData ) { Create(const_cast(xpmData)); } + bool Create( char** xpmData ) { return Create(const_cast(xpmData)); } #endif void Destroy();