X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..c5fc899bf29ca7d9c4e2a070e28228b430a68dd3:/src/common/init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index fe406b7be9..e6d803cbe4 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"
@@ -59,34 +60,40 @@
 class wxDummyConsoleApp : public wxAppConsole
 {
 public:
+    wxDummyConsoleApp() { }
+
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+
+    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
 };
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
-// pointer it holds in its dtor but also resets wxTheApp
-wxDECLARE_SCOPED_PTR(wxApp, wxAppPtrBase);
-wxDEFINE_SCOPED_PTR(wxApp, wxAppPtrBase);
+// pointer it holds in its dtor but also resets the global application pointer
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
 
 class wxAppPtr : public wxAppPtrBase
 {
 public:
-    wxEXPLICIT wxAppPtr(wxApp *ptr = NULL) : wxAppPtrBase(ptr) { }
+    wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { }
     ~wxAppPtr()
     {
         if ( get() )
         {
             // the pointer is going to be deleted in the base class dtor, don't
             // leave the dangling pointer!
-            wxTheApp = NULL;
+            wxApp::SetInstance(NULL);
         }
     }
 
-    void Set(wxApp *ptr)
+    void Set(wxAppConsole *ptr)
     {
         reset(ptr);
 
-        wxTheApp = ptr;
+        wxApp::SetInstance(ptr);
     }
+
+    DECLARE_NO_COPY_CLASS(wxAppPtr)
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
@@ -94,13 +101,13 @@ public:
 class wxCallAppCleanup
 {
 public:
-    wxCallAppCleanup(wxApp *app) : m_app(app) { }
+    wxCallAppCleanup(wxAppConsole *app) : m_app(app) { }
     ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
 
     void Dismiss() { m_app = NULL; }
 
 private:
-    wxApp *m_app;
+    wxAppConsole *m_app;
 };
 
 // another tiny class which simply exists to ensure that wxEntryCleanup is
@@ -152,6 +159,8 @@ static struct InitData
     // free it when doing cleanup to avoid memory leaks
     wchar_t **argv;
 #endif // wxUSE_UNICODE
+
+    DECLARE_NO_COPY_CLASS(InitData)
 } gs_initData;
 
 // ============================================================================
@@ -198,8 +207,6 @@ static void FreeConvertedArgs()
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {
-    wxClassInfo::InitializeClasses();
-
     return true;
 }
 
@@ -245,25 +252,22 @@ bool wxEntryStart(int& argc, wxChar **argv)
     {
         // either IMPLEMENT_APP() was not used at all or it failed -- in any
         // case we still need something
-        //
-        // NB: cast is needed because for the backwards-compatibility reasons
-        //     wxTheApp is really a wxApp and not just wxAppConsole...
-        app.Set((wxApp *)new wxDummyConsoleApp);
+        app.Set(new wxDummyConsoleApp);
     }
 
 
     // wxApp initialization: this can be customized
     // --------------------------------------------
 
-    if ( !wxTheApp->Initialize(argc, argv) )
+    if ( !app->Initialize(argc, argv) )
     {
         return false;
     }
 
-    wxCallAppCleanup callAppCleanup(wxTheApp);
+    wxCallAppCleanup callAppCleanup(app.get());
 
     // for compatibility call the old initialization function too
-    if ( !wxTheApp->OnInitGui() )
+    if ( !app->OnInitGui() )
         return false;
 
 
@@ -326,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
@@ -334,6 +338,7 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
+    // Note: check for memory leaks is now done via wxDebugContextDumpDelayCounter
 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);
@@ -351,22 +356,11 @@ void wxEntryCleanup()
         wxTheApp->CleanUp();
 
         delete wxTheApp;
-        wxTheApp = NULL;
+        wxApp::SetInstance(NULL);
     }
 
 
     DoCommonPostCleanup();
-
-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif // Debug
-
 }
 
 // ----------------------------------------------------------------------------
@@ -391,35 +385,29 @@ 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 execution
-    int retValue = wxTheApp->OnRun();
 
-    // why should we do this? it doesn't close all window, just one of them and
-    // this shouldn't be necessary anyhow...
-#if 0
-    // close any remaining windows
-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if ( topWindow )
-    {
-        // forcibly delete the window.
-        topWindow->Destroy();
+        // app initialization
+        if ( !wxTheApp->CallOnInit() )
+        {
+            // don't call OnExit() if OnInit() failed
+            return -1;
+        }
 
-        // collect the dead objects
-        wxTheApp->DeletePendingObjects();
-    }
-#endif // 0
+        // ensure that OnExit() is called if OnInit() had succeeded
+        class CallOnExit
+        {
+        public:
+            ~CallOnExit() { wxTheApp->OnExit(); }
+        } callOnExit;
 
-    // app clean up
-    wxTheApp->OnExit();
+        WX_SUPPRESS_UNUSED_WARN(callOnExit);
 
-    return retValue;
+        // app execution
+        return wxTheApp->OnRun();
+    }
+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
 }
 
 // wrap real wxEntry in a try-except block to be able to call
@@ -431,7 +419,7 @@ int wxEntryReal(int& argc, wxChar **argv)
 #include "wx/msw/private.h"
 #endif
 
-extern unsigned long wxGlobalSEHandler();
+extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
 
 int wxEntry(int& argc, wxChar **argv)
 {
@@ -439,7 +427,7 @@ int wxEntry(int& argc, wxChar **argv)
     {
         return wxEntryReal(argc, argv);
     }
-    __except ( wxGlobalSEHandler() )
+    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
     {
 #ifdef __WXWINCE__
         ::ExitThread(3); // the same exit code as abort()