X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2980921209fdf004244a72ebf88658987e2a986..caf412d6f29b50344ab91f627c17cda88ee0257d:/src/common/dynload.cpp

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index ebff36b860..80d809e528 100644
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -87,6 +87,7 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
 
     if( m_handle != 0 )
     {
+        UpdateClasses();
         RegisterModules();
     }
     else
@@ -101,6 +102,7 @@ wxPluginLibrary::~wxPluginLibrary()
     if( m_handle != 0 )
     {
         UnregisterModules();
+        RestoreClasses();
     }
 }
 
@@ -131,6 +133,27 @@ bool wxPluginLibrary::UnrefLib()
 // Private methods
 // ------------------------
 
+void wxPluginLibrary::UpdateClasses()
+{
+    for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    {
+        if( info->m_className )
+        {
+            // Hash all the class names into a local table too so
+            // we can quickly find the entry they correspond to.
+            (*ms_classes)[info->m_className] = this;
+        }
+    }
+}
+
+void wxPluginLibrary::RestoreClasses()
+{
+    for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    {
+        ms_classes->erase(ms_classes->find(info->m_className));
+    }
+}
+
 void wxPluginLibrary::RegisterModules()
 {
     // Plugin libraries might have wxModules, Register and initialise them if