AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move per display data cleanup to wxApp::CleanUp where it belongs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2005-07-30 17:11:49 +00:00
parent f920436385
commit 8d1bf3c7ff
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/motif/app.cpp
View File

@ -102,10 +102,23 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
void wxApp::CleanUp() void wxApp::CleanUp()
{ {
wxAppBase::CleanUp();
delete wxWidgetHashTable; delete wxWidgetHashTable;
wxWidgetHashTable = NULL; wxWidgetHashTable = NULL;
wxAppBase::CleanUp(); delete m_mainLoop;
for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(),
end = m_perDisplayData->end();
it != end; ++it )
{
delete it->second->m_visualInfo;
XtDestroyWidget( it->second->m_topLevelWidget );
delete it->second;
}
delete m_perDisplayData;
} }
void wxApp::Exit() void wxApp::Exit()
@ -133,19 +146,6 @@ wxApp::wxApp()
wxApp::~wxApp() wxApp::~wxApp()
{ {
delete m_mainLoop;
for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(),
end = m_perDisplayData->end();
it != end; ++it )
{
delete it->second->m_visualInfo;
XtDestroyWidget( it->second->m_topLevelWidget );
delete it->second;
}
delete m_perDisplayData;
wxApp::SetInstance(NULL); wxApp::SetInstance(NULL);
} }