X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e02911a260d9002ca40c328a44cf62e0bf67b68d..1c507b171af7fb2e0ed36fca546b7951c8ab5dd2:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 512c9b6268..e162226ed6 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -83,7 +83,7 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); - fprintf(stderr, "%s", out.mb_str()); + fprintf(stderr, "%s", (const char*) out.mb_str()); } // ---------------------------------------------------------------------------- @@ -102,7 +102,7 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...) va_end(args); #ifndef __WXMSW__ - out.Replace("\t"," "); + out.Replace(wxT("\t"),wxT(" ")); #endif ::wxMessageBox(out); } @@ -113,8 +113,6 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...) // wxMessageOutputLog // ---------------------------------------------------------------------------- -#if wxUSE_GUI && defined(__WXMOTIF__) - void wxMessageOutputLog::Printf(const wxChar* format, ...) { va_list args; @@ -124,10 +122,8 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); - out.Replace("\t"," "); + out.Replace(wxT("\t"),wxT(" ")); // under Motif, wxMessageDialog needs a parent window, so we use // wxLog, which is better than nothing - ::wxLogMessage("%s", out.c_str()); + ::wxLogMessage(wxT("%s"), out.c_str()); } - -#endif // wxUSE_GUI