X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b077ec744c49b77a9efdb050556e361c0865bb7..d3ae69de983f61c1ede821e32c18ae3a8bd8c70c:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 9ba8be65d3..5060844865 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -76,7 +76,8 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout) return old; } -void wxMessageOutputBase::DoPrintf(const wxChar* format, ...) +#if !wxUSE_UTF8_LOCALE_ONLY +void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...) { va_list args; va_start(args, format); @@ -87,6 +88,21 @@ void wxMessageOutputBase::DoPrintf(const wxChar* format, ...) Output(out); } +#endif // !wxUSE_UTF8_LOCALE_ONLY + +#if wxUSE_UNICODE_UTF8 +void wxMessageOutput::DoPrintfUtf8(const char *format, ...) +{ + va_list args; + va_start(args, format); + wxString out; + + out.PrintfV(format, args); + va_end(args); + + Output(out); +} +#endif // wxUSE_UNICODE_UTF8 // ---------------------------------------------------------------------------- // wxMessageOutputBest @@ -117,7 +133,7 @@ void wxMessageOutputBest::Output(const wxString& str) else #endif // __WINDOWS__/!__WINDOWS__ { - const wxWX2MBbuf buf(str.mb_str()); + const wxWX2MBbuf buf = str.mb_str(); if ( buf ) fprintf(stderr, "%s", (const char*) buf); @@ -132,7 +148,7 @@ void wxMessageOutputBest::Output(const wxString& str) void wxMessageOutputStderr::Output(const wxString& str) { - const wxWX2MBbuf buf(str.mb_str()); + const wxWX2MBbuf buf = str.mb_str(); if ( buf ) fprintf(stderr, "%s", (const char*) buf);