X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5462b02b862e82dba395ca2d1464358b36c9318..cb41a69b152026d6c586d21148e34913291cd733:/src/common/init.cpp?ds=sidebyside

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 7b836cd88e..e00daeb701 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.10.99
-// RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -410,6 +409,11 @@ static void DoCommonPostCleanup()
     delete wxMessageOutput::Set(NULL);
 
 #if wxUSE_LOG
+    // call this first as it has a side effect: in addition to flushing all
+    // logs for this thread, it also flushes everything logged from other
+    // threads
+    wxLog::FlushActive();
+
     // and now delete the last logger as well
     //
     // we still don't disable log target auto-vivification even if any log
@@ -468,6 +472,9 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
+#if 0 // defined(__WXOSX__) && wxOSX_USE_COCOA_OR_IPHONE
+        // everything done in OnRun using native callbacks
+#else
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
@@ -483,7 +490,7 @@ int wxEntryReal(int& argc, wxChar **argv)
         } callOnExit;
 
         WX_SUPPRESS_UNUSED_WARN(callOnExit);
-
+#endif
         // app execution
         return wxTheApp->OnRun();
     }