X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c822d4ca200bec478dd36d755054e02911d7900d..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/common/bmpbase.cpp?ds=sidebyside diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 88e77178e9..34bf85608e 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -32,6 +32,11 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT) IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT) #endif +#if wxUSE_EXTENDED_RTTI +//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) +//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl) +#endif + // ---------------------------------------------------------------------------- // wxBitmapBase // ---------------------------------------------------------------------------- @@ -151,11 +156,11 @@ wxBitmap::wxBitmap(const char* const* bits) #if wxUSE_IMAGE && wxUSE_XPM wxImage image(bits); - wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data")); + wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data")); *this = wxBitmap(image); #else - wxFAIL_MSG(_T("creating bitmaps from XPMs not supported")); + wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported")); #endif // wxUSE_IMAGE && wxUSE_XPM } #endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))