X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/module.cpp diff --git a/src/common/module.cpp b/src/common/module.cpp index bd2b82d782..8397312756 100644 --- a/src/common/module.cpp +++ b/src/common/module.cpp @@ -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); } // 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) + wxNode *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::sm_classwxModule))) ) { - 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::Node *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::Node *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::Node *node; + for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) { - ((wxModule*)(node->Data()))->Exit(); - delete (wxModule*)(node->Data()); + node->GetData()->Exit(); } + + m_modules.DeleteContents(TRUE); m_modules.Clear(); }