Give the newly added wxGTK trunk STL builder a unique name.

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 1b28e9b47c688dcef4e43ee056ecd8a461235f31..4714c64802f5449c619f40dcc8254d77045b2505 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -61,8 +61,7 @@ public:
 
     virtual void OnExit()
     {
 
     virtual void OnExit()
     {

-        delete wxPluginLibrary::ms_classes;
-        wxPluginLibrary::ms_classes = NULL;
+        wxDELETE(wxPluginLibrary::ms_classes);

         wxPluginManager::ClearManifest();
     }
 
         wxPluginManager::ClearManifest();
     }
 


@@ -77,9 +76,32 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
         : m_linkcount(1)
         , m_objcount(0)
 {
         : m_linkcount(1)
         , m_objcount(0)
 {

-    m_before = wxClassInfo::GetFirst();
+    const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();

     Load( libname, flags );
     Load( libname, flags );

-    m_after = wxClassInfo::GetFirst();
+
+    // It is simple to know what is the last object we registered, it's just
+    // the new head of the wxClassInfo list:
+    m_ourLast = wxClassInfo::GetFirst();
+
+    // But to find the first wxClassInfo created by this library we need to
+    // iterate until we get to the previous head as we don't have the links in
+    // the backwards direction:
+    if ( m_ourLast != oldFirst )
+    {
+        for ( const wxClassInfo* info = m_ourLast; ; info = info->GetNext() )
+        {
+            if ( info->GetNext() == oldFirst )
+            {
+                m_ourFirst = info;
+                break;
+            }
+        }
+    }
+    else // We didn't register any classes at all.
+    {
+        m_ourFirst =
+        m_ourLast = NULL;
+    }

 
     if( m_handle != 0 )
     {
 
     if( m_handle != 0 )
     {


@@ -131,7 +153,10 @@ bool wxPluginLibrary::UnrefLib()
 
 void wxPluginLibrary::UpdateClasses()
 {
 
 void wxPluginLibrary::UpdateClasses()
 {

-    for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( !m_ourFirst )
+        return;
+
+    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )

     {
         if( info->GetClassName() )
         {
     {
         if( info->GetClassName() )
         {


@@ -139,6 +164,9 @@ void wxPluginLibrary::UpdateClasses()
             // we can quickly find the entry they correspond to.
             (*ms_classes)[info->GetClassName()] = this;
         }
             // we can quickly find the entry they correspond to.
             (*ms_classes)[info->GetClassName()] = this;
         }

+
+        if ( info == m_ourLast )
+            break;

     }
 }
 
     }
 }
 


@@ -148,9 +176,15 @@ void wxPluginLibrary::RestoreClasses()
     if (!ms_classes)
         return;
 
     if (!ms_classes)
         return;
 

-    for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( !m_ourFirst )
+        return;
+
+    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )

     {
         ms_classes->erase(ms_classes->find(info->GetClassName()));
     {
         ms_classes->erase(ms_classes->find(info->GetClassName()));

+
+        if ( info == m_ourLast )
+            break;

     }
 }
 
     }
 }
 


@@ -167,16 +201,22 @@ void wxPluginLibrary::RegisterModules()
     wxASSERT_MSG( m_linkcount == 1,
                   wxT("RegisterModules should only be called for the first load") );
 
     wxASSERT_MSG( m_linkcount == 1,
                   wxT("RegisterModules should only be called for the first load") );
 

-    for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( m_ourFirst )

     {
     {

-        if( info->IsKindOf(CLASSINFO(wxModule)) )
+        for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )

         {
         {

-            wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
+            if( info->IsKindOf(wxCLASSINFO(wxModule)) )
+            {
+                wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);

 
 

-            wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
+                wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
+
+                m_wxmodules.push_back(m);
+                wxModule::RegisterModule(m);
+            }

 
 

-            m_wxmodules.push_back(m);
-            wxModule::RegisterModule(m);
+            if ( info == m_ourLast )
+                break;

         }
     }
 
         }
     }