Default arg for Id

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index acf4956d168f8eca866e1b9e261a264cc32b4542..1443bcfa938280c580db7e2b24adf9a1b32bb6eb 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -333,7 +333,10 @@ name##PluginSentinel  m_pluginsentinel;
 
 // 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) \

- ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::ms_classInfo))
+    ((className *) wxCheckDynamicCast( \
+        wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+          wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+        &className::ms_classInfo))

 
 // 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.


@@ -413,7 +416,7 @@ inline void* wxCheckCast(void *ptr)
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 // ----------------------------------------------------------------------------
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 // ----------------------------------------------------------------------------

-// wxObject: the root class of wxWindows object hierarchy
+// wxObject: the root class of wxWidgets object hierarchy

 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject


@@ -544,7 +547,7 @@ public:
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {

-               return const_cast<wxClassInfo*>((const wxClassInfo*)m_classInfo);
+               return wx_const_cast(wxClassInfo *, m_classInfo);

     }
 
     wxObject* GetSuperClassInstance() const
     }
 
     wxObject* GetSuperClassInstance() const