correct test for wxDEBUG_LEVEL in last commit

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index a225bf6833c6e561294921cf0e3e65afbf6b1659..6e9f06fad8a1dcd7b421e93e14546abd43f621c2 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,37 +20,39 @@
 #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/filefn.h"
     #include "wx/log.h"

-    #include "wx/thread.h"
+    #include "wx/intl.h"
+    #include "wx/module.h"

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

+#include "wx/thread.h"

 
 

-#include "wx/ptr_scpd.h"
-#include "wx/module.h"
+#include "wx/scopedptr.h"

 #include "wx/except.h"
 
 #include "wx/except.h"
 

-#if defined(__WXMSW__) && defined(__WXDEBUG__)
+#if defined(__WXMSW__)

     #include "wx/msw/msvcrt.h"
 
     #include "wx/msw/msvcrt.h"
 

-    static struct EnableMemLeakChecking
-    {
-        EnableMemLeakChecking()
+    #ifdef wxCrtSetDbgFlag
+        static struct EnableMemLeakChecking

         {
         {

-            // do check for memory leaks on program exit (another useful flag
-            // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
-            // memory which may be used to simulate low-memory condition)
-            wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-        }
-    } gs_enableLeakChecks;
-#endif // __WXMSW__ && __WXDEBUG__
+            EnableMemLeakChecking()
+            {
+                // check for memory leaks on program exit (another useful flag
+                // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
+                // memory which may be used to simulate low-memory condition)
+                wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+            }
+        } gs_enableLeakChecks;
+    #endif // wxCrtSetDbgFlag
+#endif // __WXMSW__

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -63,14 +65,15 @@ public:
     wxDummyConsoleApp() { }
 
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
     wxDummyConsoleApp() { }
 
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }

+    virtual bool DoYield(bool, long) { return true; }

 
 

-    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+    wxDECLARE_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 the global application pointer
 };
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
 // pointer it holds in its dtor but also resets the global application pointer

-wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
-wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)

 
 class wxAppPtr : public wxAppPtrBase
 {
 
 class wxAppPtr : public wxAppPtrBase
 {


@@ -93,7 +96,7 @@ public:
         wxApp::SetInstance(ptr);
     }
 
         wxApp::SetInstance(ptr);
     }
 

-    DECLARE_NO_COPY_CLASS(wxAppPtr)
+    wxDECLARE_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()


@@ -160,7 +163,7 @@ static struct InitData
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 

-    DECLARE_NO_COPY_CLASS(InitData)
+    wxDECLARE_NO_COPY_CLASS(InitData);

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


@@ -176,13 +179,27 @@ static struct InitData
 static void ConvertArgsToUnicode(int argc, char **argv)
 {
     gs_initData.argv = new wchar_t *[argc + 1];
 static void ConvertArgsToUnicode(int argc, char **argv)
 {
     gs_initData.argv = new wchar_t *[argc + 1];

+    int wargc = 0;

     for ( int i = 0; i < argc; i++ )
     {
     for ( int i = 0; i < argc; i++ )
     {

-        gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+#ifdef __DARWIN__
+        wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i]));
+#else
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+#endif
+        if ( !buf )
+        {
+            wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."),
+                         i);
+        }
+        else // converted ok
+        {
+            gs_initData.argv[wargc++] = wxStrdup(buf);
+        }

     }
 
     }
 

-    gs_initData.argc = argc;
-    gs_initData.argv[argc] = NULL;
+    gs_initData.argc = wargc;
+    gs_initData.argv[wargc] = NULL;

 }
 
 static void FreeConvertedArgs()
 }
 
 static void FreeConvertedArgs()


@@ -209,6 +226,18 @@ 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()
 {

+#if wxUSE_LOG
+    // Reset logging in case we were cleaned up and are being reinitialized.
+    wxLog::DoCreateOnDemand();
+
+    // 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;
 }
 


@@ -217,7 +246,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)


@@ -227,9 +262,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )

-    {

         return false;
         return false;

-    }

 
 
     // first of all, we need an application object
 
 
     // first of all, we need an application object


@@ -262,15 +295,14 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )

-    {

         return false;
         return false;

-    }

 
 

-    wxCallAppCleanup callAppCleanup(app.get());
+    // remember, possibly modified (e.g. due to removal of toolkit-specific
+    // parameters), command line arguments in member variables
+    app->argc = argc;
+    app->argv = argv;

 
 

-    // for compatibility call the old initialization function too
-    if ( !app->OnInitGui() )
-        return false;
+    wxCallAppCleanup callAppCleanup(app.get());

 
 
     // common initialization after wxTheApp creation
 
 
     // common initialization after wxTheApp creation


@@ -286,6 +318,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;
 }
 


@@ -296,7 +336,7 @@ bool wxEntryStart(int& argc, char **argv)
 {
     ConvertArgsToUnicode(argc, argv);
 
 {
     ConvertArgsToUnicode(argc, argv);
 

-    if ( !wxEntryStart(argc, gs_initData.argv) )
+    if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) )

     {
         FreeConvertedArgs();
 
     {
         FreeConvertedArgs();
 


@@ -332,15 +372,16 @@ static void DoCommonPostCleanup()
 {
     wxModule::CleanUpModules();
 
 {
     wxModule::CleanUpModules();
 

-    wxClassInfo::CleanUp();
-

     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated
 #if wxUSE_UNICODE
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated
 #if wxUSE_UNICODE
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 

-    // Note: check for memory leaks is now done via wxDebugContextDumpDelayCounter
+    // 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);


@@ -357,8 +398,12 @@ void wxEntryCleanup()
     {
         wxTheApp->CleanUp();
 
     {
         wxTheApp->CleanUp();
 

-        delete wxTheApp;
+        // reset the global pointer to it to NULL before destroying it as in
+        // some circumstances this can result in executing the code using
+        // wxTheApp and using half-destroyed object is no good
+        wxAppConsole * const app = wxApp::GetInstance();

         wxApp::SetInstance(NULL);
         wxApp::SetInstance(NULL);

+        delete app;

     }
 
 
     }
 
 


@@ -376,15 +421,13 @@ void wxEntryCleanup()
 
 int wxEntryReal(int& argc, wxChar **argv)
 {
 
 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) )
     {
     // 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;
     }
 


@@ -396,7 +439,6 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
 
     wxTRY
     {

-

         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {


@@ -426,7 +468,7 @@ int wxEntry(int& argc, char **argv)
 {
     ConvertArgsToUnicode(argc, argv);
 
 {
     ConvertArgsToUnicode(argc, argv);
 

-    return wxEntry(argc, gs_initData.argv);
+    return wxEntry(gs_initData.argc, gs_initData.argv);

 }
 
 #endif // wxUSE_UNICODE
 }
 
 #endif // wxUSE_UNICODE


@@ -452,9 +494,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();
     }
 }

-