update frm Ivan Masar

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index ca7f4e1c70182db70b94d8c19bfccc4b5f853b33..5060844865ed9a6c1a0698d17402dc2fbfe2afc1 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -76,7 +76,8 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     return old;
 }
 

-void wxMessageOutput::DoPrintf(const wxString& format, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)

 {
     va_list args;
     va_start(args, format);
 {
     va_list args;
     va_start(args, format);


@@ -87,6 +88,21 @@ void wxMessageOutput::DoPrintf(const wxString& format, ...)
 
     Output(out);
 }
 
     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
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputBest