Fixed old FIXME about unsigned result of sunstraction + a few changes to be able...

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index aa06d2208bda3f3e4d55eb2771cf3bb9141aefec..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$
-// Copyright:   (c) the wxWindows team
+// Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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,16 +46,24 @@
 #endif
 
 #include "wx/msgout.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
+#if defined(__WXMSW__) && !defined(__PALMOS__)
+    #include "wx/msw/private.h"
+#endif
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
 // ===========================================================================
 // implementation
 // ===========================================================================
 
-#ifdef __WXBASE__
+#if wxUSE_BASE
 
 // ----------------------------------------------------------------------------
 // wxMessageOutput
@@ -60,7 +75,7 @@ wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;
@@ -103,15 +118,15 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     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 += _T("\r\n");
+    out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )
     {
         Str255 pstr;
-        wxString output = str + wxT(";g") ;
+        wxString output = out + wxT(";g") ;
         wxMacStringToPascal(output.c_str(), pstr);
 
         #ifdef __powerc
@@ -120,10 +135,11 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
             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
 }
 
@@ -146,7 +162,7 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
     ::wxLogMessage(wxT("%s"), out.c_str());
 }
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputMessageBox