X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..b0540bb8ba756e2df3479073d9f6d7c3373460c3:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 2baffdcf32..f66ffdc2b2 100755
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -39,16 +39,24 @@
 #endif
 
 #include "wx/msgout.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef __WXMSW__
+    #include "wx/msw/private.h"
+#endif
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
 // ===========================================================================
 // implementation
 // ===========================================================================
 
-#ifdef __WXBASE__
+#if wxUSE_BASE
 
 // ----------------------------------------------------------------------------
 // wxMessageOutput
@@ -60,7 +68,7 @@ wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;
@@ -111,7 +119,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     if ( wxIsDebuggerRunning() )
     {
         Str255 pstr;
-        wxString output = str + wxT(";g") ;
+        wxString output = out + wxT(";g") ;
         wxMacStringToPascal(output.c_str(), pstr);
 
         #ifdef __powerc
@@ -121,7 +129,8 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
         #endif
     }
 #else // !MSW, !Mac
-    wxFputs(out, stderr);
+    // FIXME: why is wxFputs() not defined under Linux?
+    fputs(out.mb_str(), stderr);
     fflush(stderr);
 #endif // platform
 }
@@ -145,7 +154,7 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
     ::wxLogMessage(wxT("%s"), out.c_str());
 }
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputMessageBox