X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/270bae200da5680a55b3f5eced49a9d32d49c80f..17beda75ef9780ebef5044e41889a9b598dcf186:/src/common/init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 08a51de755..ee45254523 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -55,6 +55,10 @@
     #endif // wxCrtSetDbgFlag
 #endif // __WINDOWS__
 
+#if wxUSE_UNICODE && defined(__WXOSX__)
+    #include <locale.h>
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -406,6 +410,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