X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b077ec744c49b77a9efdb050556e361c0865bb7..198be845897a79ba350ae7f93db536ddb2eccfb2:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
old mode 100755
new mode 100644
index 9ba8be65d3..ec85ee9c13
--- 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
@@ -112,12 +128,13 @@ void wxMessageOutputBest::Output(const wxString& str)
 #ifdef __WINDOWS__
     if ( !IsInConsole() )
     {
-        ::MessageBox(NULL, str, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+        ::MessageBox(NULL, str.wx_str(), _T("wxWidgets"),
+                     MB_ICONINFORMATION | MB_OK);
     }
     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 +149,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);
@@ -151,7 +168,7 @@ void wxMessageOutputDebug::Output(const wxString& str)
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
-    ::OutputDebugString(out);
+    ::OutputDebugString(out.wx_str());
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )
     {
@@ -192,7 +209,7 @@ void wxMessageOutputLog::Output(const wxString& str)
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG
 
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {