X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7873ca319146f39b4685e8727fde91cf601f4bbe..f7ef06022c3796159e917c7aa0ec47c3ec45c586:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index d24514d7c3..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,12 +118,11 @@ 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); -#elif defined(__WXMAC__) -#if !defined(__DARWIN__) +#elif defined(__WXMAC__) && !defined(__DARWIN__) if ( wxIsDebuggerRunning() ) { Str255 pstr; @@ -141,11 +140,6 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...) 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); - fflush(stderr); #endif // platform }