Compare and assign wxChars to wxChar instead char local variable.

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index f66ffdc2b2edac550d4565edd52d0cbc44a54cd9..348f6ae1dda4661d8e11c429db2ccb8897db5f73 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$
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$

-// Copyright:   (c) the wxWindows team
+// Copyright:   (c) the wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // 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
 
     #pragma implementation "msgout.h"
 #endif
 


@@ -45,7 +52,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__PALMOS__)

     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMAC__
     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMAC__


@@ -111,9 +118,9 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
     out.PrintfV(format, args);
     va_end(args);
 

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__PALMOS__)

     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\t"), wxT("        "));

-    out += _T("\r\n");
+    out.Replace(wxT("\n"), wxT("\r\n"));

     ::OutputDebugString(out);
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )
     ::OutputDebugString(out);
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )


@@ -128,10 +135,11 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
             SysBreakStr(pstr);
         #endif
     }
             SysBreakStr(pstr);
         #endif
     }

-#else // !MSW, !Mac
-    // FIXME: why is wxFputs() not defined under Linux?
-    fputs(out.mb_str(), stderr);
-    fflush(stderr);
+#else
+    wxFputs( out , stderr ) ;
+    if ( out.Right(1) != wxT("\n") )
+        wxFputs( wxT("\n") , stderr ) ;
+    fflush( stderr ) ;

 #endif // platform
 }
 
 #endif // platform
 }