( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
}
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
// Initializes parent pointers and hash table for fast searching.
- wxDEPRECATED( static void InitializeClasses() );
+ wxDEPRECATED( static void InitializeClasses() );
// Cleans up hash table used for fast searching.
- wxDEPRECATED( static void CleanUpClasses() );
+ wxDEPRECATED( static void CleanUpClasses() );
#endif
static void CleanUp();
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
inline void wxClassInfo::InitializeClasses() {}
inline void wxClassInfo::CleanUpClasses() {}
#endif
#define wxDynamicCastThis(className) \
(IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
-#ifdef HAVE_CONST_CAST
-#define wxConstCast(obj, className) const_cast<className *>(obj)
-#else
-#define wxConstCast(obj, className) ((className *)(obj))
-#endif
-
-
#ifdef __WXDEBUG__
-inline void wxCheckCast(void *ptr)
+inline void* wxCheckCast(void *ptr)
{
wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+ return ptr;
}
#define wxStaticCast(obj, className) \
- (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))
#else // !__WXDEBUG__
#define wxStaticCast(obj, className) ((className *)(obj))