X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6391d30221084cbd7146f8076141b697891b9d4..f357c0d42c17bf5be30e65e68cd99c474678da71:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 7148e579b3..bbbf5350e3 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -136,6 +136,31 @@ void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName),
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
+wxClassInfo::~wxClassInfo()
+{
+    // remove this object from the linked list of all class infos: if we don't
+    // do it, loading/unloading a DLL containing static wxClassInfo objects is
+    // not going to work
+    if ( this == sm_first )
+    {
+        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 *wxClassInfo::FindClass(const wxChar *className)
 {
     if ( sm_classTable )