Put back the old wxTreeEvent ctor for compatibility

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bc304d3be815a6be13d387ed77ae609d1653cecc..b01d39cd9be6d3790f7a78ddb1748160f7eddf89 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/init.cpp
+// Name:        src/common/init.cpp

 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -20,21 +20,22 @@
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/debug.h"

     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/thread.h"
     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/thread.h"

+    #include "wx/intl.h"

 #endif
 
 #include "wx/init.h"
 
 #include "wx/ptr_scpd.h"
 #include "wx/module.h"
 #endif
 
 #include "wx/init.h"
 
 #include "wx/ptr_scpd.h"
 #include "wx/module.h"

+#include "wx/except.h"

 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
     #include "wx/msw/msvcrt.h"
 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
     #include "wx/msw/msvcrt.h"


@@ -67,29 +68,29 @@ public:
 };
 
 // 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)
     }
 
     DECLARE_NO_COPY_CLASS(wxAppPtr)


@@ -100,13 +101,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


@@ -177,9 +178,11 @@ static void ConvertArgsToUnicode(int argc, char **argv)
     gs_initData.argv = new wchar_t *[argc + 1];
     for ( int i = 0; i < argc; i++ )
     {
     gs_initData.argv = new wchar_t *[argc + 1];
     for ( int i = 0; i < argc; i++ )
     {

-        gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+        gs_initData.argv[i] = buf ? wxStrdup(buf) : NULL;

     }
 
     }
 

+    gs_initData.argc = argc;

     gs_initData.argv[argc] = NULL;
 }
 
     gs_initData.argv[argc] = NULL;
 }
 


@@ -194,6 +197,7 @@ static void FreeConvertedArgs()
 
         delete [] gs_initData.argv;
         gs_initData.argv = NULL;
 
         delete [] gs_initData.argv;
         gs_initData.argv = NULL;

+        gs_initData.argc = 0;

     }
 }
 
     }
 }
 


@@ -206,7 +210,14 @@ 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();
+#if wxUSE_LOG
+    // install temporary log sink: we can't use wxLogGui before wxApp is
+    // constructed and if we use wxLogStderr, all messages during
+    // initialization simply disappear under Windows
+    //
+    // note that we will delete this log target below
+    delete wxLog::SetActiveTarget(new wxLogBuffer);
+#endif // wxUSE_LOG

 
     return true;
 }
 
     return true;
 }


@@ -216,7 +227,13 @@ static bool DoCommonPostInit()
 {
     wxModule::RegisterModules();
 
 {
     wxModule::RegisterModules();
 

-    return wxModule::InitializeModules();
+    if ( !wxModule::InitializeModules() )
+    {
+        wxLogError(_("Initialization failed in post init, aborting."));
+        return false;
+    }
+
+    return true;

 }
 
 bool wxEntryStart(int& argc, wxChar **argv)
 }
 
 bool wxEntryStart(int& argc, wxChar **argv)


@@ -253,25 +270,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;
 
 


@@ -288,6 +302,14 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // and the cleanup object from doing cleanup
     callAppCleanup.Dismiss();
 
     // and the cleanup object from doing cleanup
     callAppCleanup.Dismiss();
 

+#if wxUSE_LOG
+    // now that we have a valid wxApp (wxLogGui would have crashed if we used
+    // it before now), we can delete the temporary sink we had created for the
+    // initialization messages -- the next time logging function is called, the
+    // sink will be recreated but this time wxAppTraits will be used
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+

     return true;
 }
 
     return true;
 }
 


@@ -314,27 +336,25 @@ bool wxEntryStart(int& argc, char **argv)
 // clean up
 // ----------------------------------------------------------------------------
 
 // clean up
 // ----------------------------------------------------------------------------
 

-// cleanup done before destroying wxTheApp 
+// cleanup done before destroying wxTheApp

 static void DoCommonPreCleanup()
 {
 #if wxUSE_LOG
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user supplied one might be even more unsafe (using any
 static void DoCommonPreCleanup()
 {
 #if wxUSE_LOG
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user supplied one might be even more unsafe (using any

-    // wxWindows GUI function is unsafe starting from now)
+    // wxWidgets GUI function is unsafe starting from now)

     wxLog::DontCreateOnDemand();
 
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif // wxUSE_LOG
     wxLog::DontCreateOnDemand();
 
     // 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()
 {
 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {

-    wxClassInfo::CleanUpClasses();
+    wxModule::CleanUpModules();

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


@@ -342,6 +362,10 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 

+    // use Set(NULL) and not Get() to avoid creating a message output object on
+    // demand when we just want to delete it
+    delete wxMessageOutput::Set(NULL);
+

 #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);


@@ -359,37 +383,31 @@ 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
-

 }
 
 // ----------------------------------------------------------------------------
 // wxEntry
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxEntry
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WXMSW__

     #define wxEntryReal wxEntry
     #define wxEntryReal wxEntry

-#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+#endif // !__WXMSW__

 
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {
 
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {

+#if wxUSE_LOG
+        // flush any log messages explaining why we failed
+        delete wxLog::SetActiveTarget(NULL);
+#endif

         return -1;
     }
 
         return -1;
     }
 


@@ -399,57 +417,31 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
 
 
     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();
-
-    // app clean up
-    wxTheApp->OnExit();
-
-    return retValue;
-}
-
-// 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
+        // app initialization
+        if ( !wxTheApp->CallOnInit() )
+        {
+            // don't call OnExit() if OnInit() failed
+            return -1;
+        }

 
 

-extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
+        // ensure that OnExit() is called if OnInit() had succeeded
+        class CallOnExit
+        {
+        public:
+            ~CallOnExit() { wxTheApp->OnExit(); }
+        } callOnExit;

 
 

-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
+        WX_SUPPRESS_UNUSED_WARN(callOnExit);

 
 

-#if !defined(_MSC_VER) || _MSC_VER < 1300
-        // this code is unreachable but put it here to suppress warnings
-        // from some compilers
-        return -1;
-#endif
+        // app execution
+        return wxTheApp->OnRun();

     }
     }

+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )

 }
 
 }
 

-#endif // __WXMSW__ && wxUSE_ON_FATAL_EXCEPTION
-

 #if wxUSE_UNICODE
 
 // as with wxEntryStart, we provide an ANSI wrapper
 #if wxUSE_UNICODE
 
 // as with wxEntryStart, we provide an ANSI wrapper


@@ -483,9 +475,8 @@ void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 

-    if ( !--gs_initData.nInitCount )
+    if ( --gs_initData.nInitCount == 0 )

     {
         wxEntryCleanup();
     }
 }
     {
         wxEntryCleanup();
     }
 }

-