Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OnExit() is called for modules which were initialized even if the init of

Browse Source 
the subsequent modules fails


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-17 22:44:04 +00:00
parent 4a9968f92d
commit 8aa4edd248
2 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/common/module.cpp
View File

@@ -22,19 +22,22 @@
#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);
}
// Collect up all module-derived classes, create an instance of each,
// and register them.
bool wxModule::RegisterModules(void)
void wxModule::RegisterModules()
{
wxNode *node;
wxClassInfo* classInfo;
@@ -44,36 +47,48 @@ bool wxModule::RegisterModules(void)
while (node)
{
classInfo = (wxClassInfo *)node->Data();
if ((classInfo != (& (wxModule::sm_classwxModule))) &&
classInfo->IsKindOf(CLASSINFO(wxModule)))
if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
(classInfo != (& (wxModule::sm_classwxModule))) )
{
wxModule* module = (wxModule*) classInfo->CreateObject();
wxModule* module = (wxModule *)classInfo->CreateObject();
RegisterModule(module);
}
node = wxClassInfo::sm_classTable->Next();
}
}
bool wxModule::InitializeModules()
{
// Initialize user-defined modules
wxModuleList::Node *node;
for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
{
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;
}
bool wxModule::InitializeModules(void)
void wxModule::CleanUpModules()
{
// Initialize user-defined modules
for (wxNode *node = m_modules.First(); node; node = node->Next())
// Cleanup user-defined modules
wxModuleList::Node *node;
for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
{
if (!((wxModule*)(node->Data()))->Init())
return FALSE;
node->GetData()->Exit();
}
return TRUE;
}
void wxModule::CleanUpModules(void)
{
// Cleanup user-defined modules
for(wxNode* node = m_modules.Last(); node; node = node->Previous())
{
((wxModule*)(node->Data()))->Exit();
delete (wxModule*)(node->Data());
}
m_modules.DeleteContents(TRUE);
m_modules.Clear();
}