X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/303c6f20d21a99cc421c80ed7b50193e5e0762d8..5953e7c7d67c212f3513de0d660888c5668441ea:/include/wx/object.h?ds=inline diff --git a/include/wx/object.h b/include/wx/object.h index da5f418eb6..0f2f72b3f7 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -319,8 +319,8 @@ name##PluginSentinel m_pluginsentinel; // be replaced by it as long as there are any compilers not supporting it #define wxDynamicCast(obj, className) \ ((className *) wxCheckDynamicCast( \ - wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \ - wx_const_cast(className *, wx_static_cast(const className *, obj)))), \ + const_cast(static_cast(\ + const_cast(static_cast(obj)))), \ &className::ms_classInfo)) // The 'this' pointer is always true, so use this version @@ -339,7 +339,7 @@ inline void* wxCheckCast(void *ptr) #else // !__WXDEBUG__ #define wxStaticCast(obj, className) \ - wx_const_cast(className *, wx_static_cast(const className *, obj)) + const_cast(static_cast(obj)) #endif // __WXDEBUG__ @@ -626,8 +626,8 @@ public: #ifdef _MSC_VER return (wxClassInfo*) m_classInfo; #else - wxDynamicClassInfo *nonconst = wx_const_cast(wxDynamicClassInfo *, m_classInfo); - return wx_static_cast(wxClassInfo *, nonconst); + wxDynamicClassInfo *nonconst = const_cast(m_classInfo); + return static_cast(nonconst); #endif }