X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e02911a260d9002ca40c328a44cf62e0bf67b68d..42ba812b705cec0ebef0fb65bb72d27a1378b316:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 512c9b6268..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;
 }
 
@@ -83,7 +79,7 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
-    fprintf(stderr, "%s", out.mb_str());
+    fprintf(stderr, "%s", (const char*) out.mb_str());
 }
 
 // ----------------------------------------------------------------------------
@@ -102,7 +98,7 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
     va_end(args);
 
 #ifndef __WXMSW__
-    out.Replace("\t","        ");
+    out.Replace(wxT("\t"),wxT("        "));
 #endif
     ::wxMessageBox(out);
 }
@@ -113,21 +109,17 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI && defined(__WXMOTIF__)
-
 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("\t","        ");
-    // under Motif, wxMessageDialog needs a parent window, so we use
-    // wxLog, which is better than nothing
-    ::wxLogMessage("%s", out.c_str());
-}
+    out.Replace(wxT("\t"),wxT("        "));
 
-#endif // wxUSE_GUI
+    ::wxLogMessage(wxT("%s"), out.c_str());
+}