X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec67cff1f6e63b3b27613a085f0492958e66a28e..4395fb21f651f8a08905c34507692ca7f902dfe5:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 19f45aa4e3..961e0c4614 100755
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -17,7 +17,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "msgout.h"
 #endif
 
@@ -39,11 +46,19 @@
 #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
 // ===========================================================================
@@ -60,7 +75,7 @@ wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;
@@ -111,7 +126,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