X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8ddd9176a46065ab74d6ced1ed480e5affb4e1e2:/src/common/init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 21b2e37216..a225bf6833 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -6,7 +6,7 @@
 // Created:     04.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -312,7 +312,7 @@ bool wxEntryStart(int& argc, char **argv)
 // clean up
 // ----------------------------------------------------------------------------
 
-// cleanup done before destroying wxTheApp 
+// cleanup done before destroying wxTheApp
 static void DoCommonPreCleanup()
 {
 #if wxUSE_LOG
@@ -325,13 +325,13 @@ static void DoCommonPreCleanup()
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif // wxUSE_LOG
-
-    wxModule::CleanUpModules();
 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {
+    wxModule::CleanUpModules();
+
     wxClassInfo::CleanUp();
 
     // we can't do this in wxApp itself because it doesn't know if argv had
@@ -369,12 +369,19 @@ void wxEntryCleanup()
 // wxEntry
 // ----------------------------------------------------------------------------
 
-#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WXMSW__
     #define wxEntryReal wxEntry
-#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+#endif // !__WXMSW__
 
 int wxEntryReal(int& argc, wxChar **argv)
 {
+#if wxUSE_LOG
+    // Create a non-GUI log target, to be used until GUI (if any) is ready.
+    // Target will be reset by wxAppConsole::Initialize, when GUI logging will work.
+    wxLog::GetActiveTarget();
+#endif
+
     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {
@@ -412,41 +419,6 @@ int wxEntryReal(int& argc, wxChar **argv)
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
 }
 
-// wrap real wxEntry in a try-except block to be able to call
-// OnFatalException() if necessary
-#if defined(__WXMSW__) && wxUSE_ON_FATAL_EXCEPTION
-
-#ifdef __WXWINCE__
-// For ExitThread
-#include "wx/msw/private.h"
-#endif
-
-extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
-
-int wxEntry(int& argc, wxChar **argv)
-{
-    __try
-    {
-        return wxEntryReal(argc, argv);
-    }
-    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
-    {
-#ifdef __WXWINCE__
-        ::ExitThread(3); // the same exit code as abort()
-#else
-        ::ExitProcess(3); // the same exit code as abort()
-#endif
-
-#if !defined(_MSC_VER) || _MSC_VER < 1300
-        // this code is unreachable but put it here to suppress warnings
-        // from some compilers
-        return -1;
-#endif
-    }
-}
-
-#endif // __WXMSW__ && wxUSE_ON_FATAL_EXCEPTION
-
 #if wxUSE_UNICODE
 
 // as with wxEntryStart, we provide an ANSI wrapper