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

another segfault fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-16 20:37:49 +00:00
parent 783fab59e5
commit df16a53ef9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mgl/app.cpp
View File

@@ -461,13 +461,10 @@ void wxApp::CleanUp()
wxDeleteStockObjects(); wxDeleteStockObjects();
wxDeleteStockLists(); wxDeleteStockLists();
// Can't do this in wxModule, because fonts are needed by stock lists
delete wxTheFontsManager;
wxTheFontsManager = (wxFontsManager*) NULL;
delete wxTheApp; delete wxTheApp;
wxTheApp = (wxApp*) NULL; wxTheApp = (wxApp*) NULL;
// GL: I'm annoyed ... I don't know where to put this and I don't want to // GL: I'm annoyed ... I don't know where to put this and I don't want to
// create a module for that as it's part of the core. // create a module for that as it's part of the core.
#if wxUSE_THREADS #if wxUSE_THREADS
@@ -477,10 +474,16 @@ void wxApp::CleanUp()
wxSystemSettings::Done(); wxSystemSettings::Done();
delete[] wxBuffer;
wxClassInfo::CleanUpClasses(); wxClassInfo::CleanUpClasses();
// Can't do this in wxModule, because fonts are needed by stock lists
// (do it after deleting wxTheApp and cleaning modules up, since somebody
// may be deleting fonts that lately)
delete wxTheFontsManager;
wxTheFontsManager = (wxFontsManager*) NULL;
delete[] wxBuffer;
// check for memory leaks // check for memory leaks
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft(TRUE) > 0) if (wxDebugContext::CountObjectsLeft(TRUE) > 0)