Partially applied patch [ 763900 ] fix for vertical toolbar

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index c9994ce41d0c61f384f4303d8a3d8a2a407daef5..f66ffdc2b2edac550d4565edd52d0cbc44a54cd9 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -39,6 +39,7 @@
 #endif
 
 #include "wx/msgout.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 
 #include <stdarg.h>
@@ -47,6 +48,9 @@
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
 #endif
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
 
 // ===========================================================================
 // implementation
@@ -64,7 +68,7 @@ wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;
@@ -115,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