don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 1443bcfa938280c580db7e2b24adf9a1b32bb6eb..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();
@@ -547,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