applied patch 90459

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 81088e790821c7e12c58ab9493bbfa35a4a47b4d..fc9ed075b9cd1c7e55d74efd08b1d701877e6aeb 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -28,9 +28,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"
-    #if wxUSE_LOG
-        #include "wx/log.h"
-    #endif // wxUSE_LOG
+    #include "wx/log.h"
 #endif //WX_PRECOMP
 
 #include "wx/utils.h"
@@ -130,6 +128,14 @@ wxAppConsole::~wxAppConsole()
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {
+#if wxUSE_LOG 
+    // If some code logged something before wxApp instance was created,
+    // wxLogStderr was set as the target. Undo it here by destroying the
+    // current target. It will be re-created next time logging is needed, but
+    // this time wxAppTraits will be used:
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+    
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;
@@ -643,7 +649,7 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( ::MessageBox(NULL, msgDlg, _T("wxWindows Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES: