Some (incomplete) fixes for wxUSE_STL == 1.

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 3c824301395fc9c26cb7ca96ea805c9a5b8be7cc..d24514d7c3c71994e30fd8912b79f0ba489effd5 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$
-// Copyright:   (c) the wxWindows team
+// Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +17,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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
 
@@ -113,9 +120,10 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));
-    out += _T("\r\n");
+    out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
+#elif defined(__WXMAC__) 
+#if !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )
     {
         Str255 pstr;
@@ -128,6 +136,12 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
             SysBreakStr(pstr);
         #endif
     }
+#else
+    wxFputs( out , stderr ) ;
+    if ( out.Right(1) != wxT("\n") )
+        wxFputs( wxT("\n") , stderr ) ;
+    fflush( stderr ) ;
+#endif
 #else // !MSW, !Mac
     // FIXME: why is wxFputs() not defined under Linux?
     fputs(out.mb_str(), stderr);