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

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