X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8887e2341acfbb4d2a5fc1cfd52c65406e6ba110..e11f2e1645e5322b8f44112733bd663927cf7783:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index e162226ed6..1ac9f944f8 100755
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include "wx/msgout.h"
+#include "wx/log.h"
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -50,16 +51,11 @@ wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
 
 wxMessageOutput* wxMessageOutput::Get()
 {
-    // FIXME this is an hack
-    static bool inGet = FALSE;
-
-    if(!ms_msgOut && wxTheApp && !inGet)
+    if ( !ms_msgOut && wxTheApp )
     {
-        inGet = TRUE;
-        wxTheApp->DoInit();
+        ms_msgOut = wxTheApp->CreateMessageOutput();
     }
 
-    inGet = FALSE;
     return ms_msgOut;
 }
 
@@ -115,15 +111,15 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 
 void wxMessageOutputLog::Printf(const wxChar* format, ...)
 {
+    wxString out;
+
     va_list args;
     va_start(args, format);
-    wxString out;
 
     out.PrintfV(format, args);
     va_end(args);
 
     out.Replace(wxT("\t"),wxT("        "));
-    // under Motif, wxMessageDialog needs a parent window, so we use
-    // wxLog, which is better than nothing
+
     ::wxLogMessage(wxT("%s"), out.c_str());
 }