oops, more fixes needed

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

diff --git a/src/common/module.cpp b/src/common/module.cpp
index bd2b82d782331cd235936b87fcc8902b53def181..eee9507ee1e2513404289f35434282fcc7c08ce4 100644 (file)
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "module.h"
 #endif
 
@@ -21,53 +21,79 @@
 #endif
 
 #include "wx/module.h"
+#include "wx/hash.h"
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxModuleList);
 
 IMPLEMENT_CLASS(wxModule, wxObject)
 
-wxList wxModule::m_modules;
+wxModuleList wxModule::m_modules;
 
 void wxModule::RegisterModule(wxModule* module)
 {
-  m_modules.Append(module);
+    m_modules.Append(module);
+}
+
+void wxModule::UnregisterModule(wxModule* module)
+{
+    m_modules.DeleteObject(module);
+    delete module;
 }
 
 // Collect up all module-derived classes, create an instance of each,
 // and register them.
-bool wxModule::RegisterModules(void)
+void wxModule::RegisterModules()
 {
-    wxClassInfo* classInfo = wxClassInfo::first;
-    while (classInfo)
+    wxHashTable::compatibility_iterator node;
+    wxClassInfo* classInfo;
+
+    wxClassInfo::sm_classTable->BeginFind();
+    node = wxClassInfo::sm_classTable->Next();
+    while (node)
     {
-        if ((classInfo != (& (wxModule::classwxModule))) &&
-            classInfo->IsKindOf(CLASSINFO(wxModule)))
+        classInfo = (wxClassInfo *)node->GetData();
+        if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
+            (classInfo != (& (wxModule::ms_classInfo))) )
         {
-            wxModule* module = (wxModule*) classInfo->CreateObject();
+            wxModule* module = (wxModule *)classInfo->CreateObject();
             RegisterModule(module);
         }
-        classInfo = classInfo->next;
+        node = wxClassInfo::sm_classTable->Next();
     }
-    return TRUE;
 }
 
-bool wxModule::InitializeModules(void)
+bool wxModule::InitializeModules()
 {
-  // Initialize user-defined modules
-    for (wxNode *node = m_modules.First(); node; node = node->Next())
+    // Initialize user-defined modules
+    wxModuleList::compatibility_iterator node;
+    for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {
-      if (!((wxModule*)(node->Data()))->Init())
-        return FALSE;
+        if ( !node->GetData()->Init() )
+        {
+            // clean up already initialized modules - process in reverse order
+            wxModuleList::compatibility_iterator n;
+            for ( n = node->GetPrevious(); n; n = n->GetPrevious() )
+            {
+                n->GetData()->OnExit();
+            }
+
+            return FALSE;
+        }
     }
+
     return TRUE;
 }
 
-void wxModule::CleanUpModules(void)
+void wxModule::CleanUpModules()
 {
-  // Cleanup user-defined modules
-    for(wxNode* node = m_modules.Last(); node; node = node->Previous())
+    // Cleanup user-defined modules
+    wxModuleList::compatibility_iterator node;
+    for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
     {
-      ((wxModule*)(node->Data()))->Exit();
-      delete (wxModule*)(node->Data());
+        node->GetData()->Exit();
     }
-    m_modules.Clear();
+
+    WX_CLEAR_LIST(wxModuleList, m_modules);
 }