X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5256c59dd7d9d2af9aaf5854b2bd39b87c7aafe..9859d369b49e35a1cad0f760173e165f974fb6cb:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 0fb4fae976..0289fc2ec6 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -224,9 +224,11 @@ void wxClassInfo::Register()
             sm_classTable = classTable;
     }
 
+#ifdef __WXDEBUG__
     // reentrance guard - see note above
     static int entry = 0;
     wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance"));
+#endif
 
     // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
     // link any object module twice mistakenly, or link twice against wx shared
@@ -243,7 +245,9 @@ void wxClassInfo::Register()
 
     sm_classTable->Put(m_className, (wxObject *)this);
 
+#ifdef __WXDEBUG__
     --entry;
+#endif
 }
 
 void wxClassInfo::Unregister()
@@ -285,6 +289,17 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 }
 
 
+// ----------------------------------------------------------------------------
+// wxObjectRefData
+// ----------------------------------------------------------------------------
+
+void wxObjectRefData::DecRef()
+{
+    if ( --m_count == 0 )
+        delete this;
+}
+
+
 // ----------------------------------------------------------------------------
 // wxObject
 // ----------------------------------------------------------------------------
@@ -306,7 +321,7 @@ void wxObject::Ref(const wxObject& clone)
     if ( clone.m_refData )
     {
         m_refData = clone.m_refData;
-        ++(m_refData->m_count);
+        m_refData->IncRef();
     }
 }
 
@@ -316,8 +331,7 @@ void wxObject::UnRef()
     {
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
-        if ( --m_refData->m_count == 0 )
-            delete m_refData;
+        m_refData->DecRef();
         m_refData = NULL;
     }
 }