fixing bug 1841377

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 0fb4fae976c1ff259913f3b81bf0746f1568f39a..247c365f661f2009f3fabf33618bac61831c2601 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -21,6 +21,7 @@
     #include "wx/object.h"
     #include "wx/hash.h"
     #include "wx/memory.h"
     #include "wx/object.h"
     #include "wx/hash.h"
     #include "wx/memory.h"

+    #include "wx/crt.h"

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -187,7 +188,7 @@ wxClassInfo::~wxClassInfo()
     Unregister();
 }
 
     Unregister();
 }
 

-wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
+wxClassInfo *wxClassInfo::FindClass(const wxString& className)

 {
     if ( sm_classTable )
     {
 {
     if ( sm_classTable )
     {


@@ -197,7 +198,7 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
     {
         for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
         {
     {
         for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
         {

-            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+            if ( className == info->GetClassName() )

                 return info;
         }
 
                 return info;
         }
 


@@ -224,9 +225,11 @@ void wxClassInfo::Register()
             sm_classTable = classTable;
     }
 
             sm_classTable = classTable;
     }
 

+#ifdef __WXDEBUG__

     // reentrance guard - see note above
     static int entry = 0;
     wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance"));
     // 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
 
     // 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 +246,9 @@ void wxClassInfo::Register()
 
     sm_classTable->Put(m_className, (wxObject *)this);
 
 
     sm_classTable->Put(m_className, (wxObject *)this);
 

+#ifdef __WXDEBUG__

     --entry;
     --entry;

+#endif

 }
 
 void wxClassInfo::Unregister()
 }
 
 void wxClassInfo::Unregister()


@@ -259,7 +264,7 @@ void wxClassInfo::Unregister()
     }
 }
 
     }
 }
 

-wxObject *wxCreateDynamicObject(const wxChar *name)
+wxObject *wxCreateDynamicObject(const wxString& name)

 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)


@@ -284,6 +289,48 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
     }
 }
 
     }
 }
 

+// iterator interface
+wxClassInfo::const_iterator::value_type
+wxClassInfo::const_iterator::operator*() const
+{
+    return (wxClassInfo*)m_node->GetData();
+}
+
+wxClassInfo::const_iterator& wxClassInfo::const_iterator::operator++()
+{
+    m_node = m_table->Next();
+    return *this;
+}
+
+const wxClassInfo::const_iterator wxClassInfo::const_iterator::operator++(int)
+{
+    wxClassInfo::const_iterator tmp = *this;
+    m_node = m_table->Next();
+    return tmp;
+}
+
+wxClassInfo::const_iterator wxClassInfo::begin_classinfo()
+{
+    sm_classTable->BeginFind();
+
+    return const_iterator(sm_classTable->Next(), sm_classTable);
+}
+
+wxClassInfo::const_iterator wxClassInfo::end_classinfo()
+{
+    return const_iterator(NULL, NULL);
+}
+
+// ----------------------------------------------------------------------------
+// wxObjectRefData
+// ----------------------------------------------------------------------------
+
+void wxObjectRefData::DecRef()
+{
+    if ( --m_count == 0 )
+        delete this;
+}
+

 
 // ----------------------------------------------------------------------------
 // wxObject
 
 // ----------------------------------------------------------------------------
 // wxObject


@@ -306,7 +353,7 @@ void wxObject::Ref(const wxObject& clone)
     if ( clone.m_refData )
     {
         m_refData = clone.m_refData;
     if ( clone.m_refData )
     {
         m_refData = clone.m_refData;

-        ++(m_refData->m_count);
+        m_refData->IncRef();

     }
 }
 
     }
 }
 


@@ -316,8 +363,7 @@ void wxObject::UnRef()
     {
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
     {
         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;
     }
 }
         m_refData = NULL;
     }
 }