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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 0000d789a4..774cbd2273 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -35,6 +35,7 @@
 
 #include "wx/ptr_scpd.h"
 #include "wx/module.h"
+#include "wx/except.h"
 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
     #include "wx/msw/msvcrt.h"
@@ -206,8 +207,6 @@ static void FreeConvertedArgs()
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {
-    wxClassInfo::InitializeClasses();
-
     return true;
 }
 
@@ -331,7 +330,7 @@ static void DoCommonPreCleanup()
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {
-    wxClassInfo::CleanUpClasses();
+    wxClassInfo::CleanUp();
 
     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated
@@ -395,20 +394,24 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
 
-    // app initialization
-    if ( !wxTheApp->CallOnInit() )
+    wxTRY
     {
-        // don't call OnExit() if OnInit() failed
-        return -1;
-    }
+        // app initialization
+        if ( !wxTheApp->CallOnInit() )
+        {
+            // don't call OnExit() if OnInit() failed
+            return -1;
+        }
 
-    // app execution
-    int retValue = wxTheApp->OnRun();
+        // app execution
+        int retValue = wxTheApp->OnRun();
 
-    // app clean up
-    wxTheApp->OnExit();
+        // app clean up
+        wxTheApp->OnExit();
 
-    return retValue;
+        return retValue;
+    }
+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
 }
 
 // wrap real wxEntry in a try-except block to be able to call