X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d8e0096cd998ef0c3c282fec593d4ccd12e3eb4..3603e5658fbd0693f71bbe62ed0239b4f96fd4e0:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index ca3c6fdc75..844aec1f42 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -128,8 +128,7 @@ void wxAppBase::CleanUp() wxDeleteStockLists(); - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + wxDELETE(wxTheColourDatabase); wxAppConsole::CleanUp(); } @@ -399,7 +398,11 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) wxLog *wxGUIAppTraitsBase::CreateLogTarget() { #if wxUSE_LOGGUI +#ifndef __WXOSX_IPHONE__ return new wxLogGui; +#else + return new wxLogStderr; +#endif #else // we must have something! return new wxLogStderr; @@ -465,11 +468,6 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) wxString msgDlg = msg; #if wxUSE_STACKWALKER - // on Unix stack frame generation may take some time, depending on the - // size of the executable mainly... warn the user that we are working - wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait")); - fflush(stderr); - const wxString stackTrace = GetAssertStackTrace(); if ( !stackTrace.empty() ) msgDlg << wxT("\n\nCall stack:\n") << stackTrace;