wizards not using sizers for the page layout now work again

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index f15805e91f8d4896764aea14c363bae4b8509286..697aea665658ad9f2097b6a9791beb56e6185873 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -25,10 +25,10 @@
 
 #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/intl.h"
 #endif
 
 #include "wx/init.h"
@@ -69,8 +69,8 @@ public:
 
 // 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
 {
@@ -178,7 +178,8 @@ 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[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+        gs_initData.argv[i] = buf ? wxStrdup(buf) : NULL;
     }
 
     gs_initData.argc = argc;
@@ -215,7 +216,7 @@ static bool DoCommonPreInit()
     // initialization simply disappear under Windows
     //
     // note that we will delete this log target below
-    wxLog::SetActiveTarget(new wxLogBuffer);
+    delete wxLog::SetActiveTarget(new wxLogBuffer);
 #endif // wxUSE_LOG
 
     return true;
@@ -355,15 +356,16 @@ static void DoCommonPostCleanup()
 {
     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
 
-    // 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);
@@ -399,17 +401,13 @@ void wxEntryCleanup()
 
 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) )
     {
+#if wxUSE_LOG
         // flush any log messages explaining why we failed
         delete wxLog::SetActiveTarget(NULL);
+#endif
         return -1;
     }
 
@@ -477,9 +475,8 @@ void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 
-    if ( !--gs_initData.nInitCount )
+    if ( --gs_initData.nInitCount == 0 )
     {
         wxEntryCleanup();
     }
 }
-