X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..97152f7856a81388163e883e340fa260f2719698:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 04f6e93115..348f6ae1dd 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -19,7 +19,7 @@ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) // Some older compilers (such as EMX) cannot handle -// #pragma interface/implementation correctly, iff +// #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). @@ -52,7 +52,7 @@ #include #include -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__PALMOS__) #include "wx/msw/private.h" #endif #ifdef __WXMAC__ @@ -118,7 +118,7 @@ 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.Replace(wxT("\n"), wxT("\r\n")); ::OutputDebugString(out); @@ -135,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 }