regenerated

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index fe406b7be92f1289a74f76eb32490bbdc4314d66..2fd5771f0437750a0cc27538753c7e415d37d608 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -59,34 +59,40 @@
 class wxDummyConsoleApp : public wxAppConsole
 {
 public:
 class wxDummyConsoleApp : public wxAppConsole
 {
 public:

+    wxDummyConsoleApp() { }
+

     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
     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
 };
 
 // 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:
 
 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!
     ~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);
 
     {
         reset(ptr);
 

-        wxTheApp = ptr;
+        wxApp::SetInstance(ptr);

     }
     }

+
+    DECLARE_NO_COPY_CLASS(wxAppPtr)

 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()


@@ -94,13 +100,13 @@ public:
 class wxCallAppCleanup
 {
 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:
     ~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
 };
 
 // another tiny class which simply exists to ensure that wxEntryCleanup is


@@ -152,6 +158,8 @@ static struct InitData
     // free it when doing cleanup to avoid memory leaks
     wchar_t **argv;
 #endif // wxUSE_UNICODE
     // free it when doing cleanup to avoid memory leaks
     wchar_t **argv;
 #endif // wxUSE_UNICODE

+
+    DECLARE_NO_COPY_CLASS(InitData)

 } gs_initData;
 
 // ============================================================================
 } gs_initData;
 
 // ============================================================================


@@ -198,8 +206,6 @@ static void FreeConvertedArgs()
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {

-    wxClassInfo::InitializeClasses();
-

     return true;
 }
 
     return true;
 }
 


@@ -245,25 +251,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
     {
         // 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
     // --------------------------------------------
 
     }
 
 
     // wxApp initialization: this can be customized
     // --------------------------------------------
 

-    if ( !wxTheApp->Initialize(argc, argv) )
+    if ( !app->Initialize(argc, argv) )

     {
         return false;
     }
 
     {
         return false;
     }
 

-    wxCallAppCleanup callAppCleanup(wxTheApp);
+    wxCallAppCleanup callAppCleanup(app.get());

 
     // for compatibility call the old initialization function too
 
     // for compatibility call the old initialization function too

-    if ( !wxTheApp->OnInitGui() )
+    if ( !app->OnInitGui() )

         return false;
 
 
         return false;
 
 


@@ -326,7 +329,7 @@ static void DoCommonPreCleanup()
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {
 // 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
 
     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated


@@ -334,6 +337,16 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 

+    // 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
+

 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);
 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);


@@ -351,22 +364,11 @@ void wxEntryCleanup()
         wxTheApp->CleanUp();
 
         delete wxTheApp;
         wxTheApp->CleanUp();
 
         delete wxTheApp;

-        wxTheApp = NULL;
+        wxApp::SetInstance(NULL);

     }
 
 
     DoCommonPostCleanup();
     }
 
 
     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
-

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -401,21 +403,6 @@ int wxEntryReal(int& argc, wxChar **argv)
     // app execution
     int retValue = wxTheApp->OnRun();
 
     // 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();
-
-        // collect the dead objects
-        wxTheApp->DeletePendingObjects();
-    }
-#endif // 0
-

     // app clean up
     wxTheApp->OnExit();
 
     // app clean up
     wxTheApp->OnExit();
 


@@ -431,7 +418,7 @@ int wxEntryReal(int& argc, wxChar **argv)
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"
 #endif
 

-extern unsigned long wxGlobalSEHandler();
+extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);

 
 int wxEntry(int& argc, wxChar **argv)
 {
 
 int wxEntry(int& argc, wxChar **argv)
 {


@@ -439,7 +426,7 @@ int wxEntry(int& argc, wxChar **argv)
     {
         return wxEntryReal(argc, argv);
     }
     {
         return wxEntryReal(argc, argv);
     }

-    __except ( wxGlobalSEHandler() )
+    __except ( wxGlobalSEHandler(GetExceptionInformation()) )

     {
 #ifdef __WXWINCE__
         ::ExitThread(3); // the same exit code as abort()
     {
 #ifdef __WXWINCE__
         ::ExitThread(3); // the same exit code as abort()