We surely don't need two debugging sections,

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 7c161ab1135b867e9f64a6bb4e0801980ed16783..be4a7bbc3fb85282cc724c8773de2699e43c0276 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,7 +13,7 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "object.h"
 #endif
 
@@ -74,26 +74,7 @@ public:
         , m_next(sm_first)
         { sm_first = this; }
 
-    ~wxClassInfo()
-    {
-        if (sm_first == this)
-        {
-            sm_first = m_next;
-        }
-        else
-        {
-            wxClassInfo * info = sm_first;
-            while (info)
-            {
-                if (info->m_next == this)
-                {
-                    info->m_next = m_next;
-                    break;
-                }
-                info = info->m_next;
-            }
-        }
-    }
+    ~wxClassInfo();
 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
@@ -322,7 +303,7 @@ name##PluginSentinel  m_pluginsentinel;
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
- (className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className)
+ ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className))
 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
@@ -520,7 +501,7 @@ protected:
 
 class WXDLLEXPORT wxObjectRefData
 {
-    friend class wxObject;
+    friend class WXDLLEXPORT wxObject;
 
 public:
     wxObjectRefData() : m_count(1) { }