another segfault fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
783fab59e5
commit
df16a53ef9
@ -461,13 +461,10 @@ void wxApp::CleanUp()
|
||||
wxDeleteStockObjects();
|
||||
wxDeleteStockLists();
|
||||
|
||||
// Can't do this in wxModule, because fonts are needed by stock lists
|
||||
delete wxTheFontsManager;
|
||||
wxTheFontsManager = (wxFontsManager*) NULL;
|
||||
|
||||
delete wxTheApp;
|
||||
wxTheApp = (wxApp*) NULL;
|
||||
|
||||
|
||||
// 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.
|
||||
#if wxUSE_THREADS
|
||||
@ -477,10 +474,16 @@ void wxApp::CleanUp()
|
||||
|
||||
wxSystemSettings::Done();
|
||||
|
||||
delete[] wxBuffer;
|
||||
|
||||
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
|
||||
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
|
||||
if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
|
||||
|
Loading…
Reference in New Issue
Block a user