wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing...

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

diff --git a/include/wx/object.h b/include/wx/object.h
index f42eaa5eb351ec7bf3d4166151bfb551b9090756..84e258463a1b486bdea61b26241dbf9116b0faf8 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -73,7 +73,7 @@ public:
         , m_baseInfo1(baseInfo1)
         , m_baseInfo2(baseInfo2)
         , m_next(sm_first)
-        { 
+        {
             sm_first = this;
             Register();
         }
@@ -114,7 +114,7 @@ public:
     wxDEPRECATED( static void CleanUpClasses() );
 #endif
     static void     CleanUp();
-    
+
 public:
     const wxChar            *m_className;
     int                      m_objectSize;
@@ -140,8 +140,8 @@ private:
     static wxClassInfo *GetBaseByName(const wxChar *name);
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
-   
-protected: 
+
+protected:
     // registers the class
     void Register();
     void Unregister();
@@ -333,7 +333,10 @@ name##PluginSentinel  m_pluginsentinel;
 
 // 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.
@@ -413,7 +416,7 @@ inline void* wxCheckCast(void *ptr)
 #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
@@ -544,7 +547,11 @@ public:
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {
-               return wx_const_cast(wxClassInfo *, m_classInfo);
+#ifdef _MSC_VER
+        return (wxClassInfo*) m_classInfo;
+#else
+        return wx_const_cast(wxClassInfo *, m_classInfo);
+#endif
     }
 
     wxObject* GetSuperClassInstance() const