fix for wxDynamicCast making it safe to pass factory functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/object.h b/include/wx/object.h
index 316d8d569c707f87270503b858f3828d97c505ac..93d89717b4af4f306bb13a0cf9856583fe006e3b 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -171,9 +171,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \

-        ((obj) && ((obj)->IsKindOf(&className::sm_class##className)) \
-        ? (className *)(obj) \
-        : (className *)0)
+    (className *) wxCheckDynamicCast((obj), &className::sm_class##className)

 
 // The 'this' pointer is always true, so use this version to cast the this
 // pointer and avoid compiler warnings.
 
 // The 'this' pointer is always true, so use this version to cast the this
 // pointer and avoid compiler warnings.


@@ -295,6 +293,11 @@ private:
     int m_count;
 };
 
     int m_count;
 };
 

+inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
+{
+    return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : 0;
+}
+

 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__TFILE__,__LINE__)
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__TFILE__,__LINE__)