X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..193d0c93106d21067107c262874763d4c0921707:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index b0c10d92b3..ca7f4e1c70 100755
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/msgout.cpp
+// Name:        src/common/msgout.cpp
 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:
@@ -29,6 +29,7 @@
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"
+    #include "wx/log.h"
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI
@@ -36,8 +37,6 @@
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"
-#include "wx/log.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -77,6 +76,18 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
+void wxMessageOutput::DoPrintf(const wxString& format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    Output(out);
+}
+
 // ----------------------------------------------------------------------------
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
@@ -96,24 +107,22 @@ static inline bool IsInConsole()
 
 #endif // __WINDOWS__
 
-void wxMessageOutputBest::Printf(const wxChar* format, ...)
+void wxMessageOutputBest::Output(const wxString& str)
 {
-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
-
 #ifdef __WINDOWS__
     if ( !IsInConsole() )
     {
-        ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+        ::MessageBox(NULL, str, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
     }
     else
 #endif // __WINDOWS__/!__WINDOWS__
     {
-        fprintf(stderr, "%s", (const char*) out.mb_str());
+        const wxWX2MBbuf buf = str.mb_str();
+
+        if ( buf )
+            fprintf(stderr, "%s", (const char*) buf);
+        else // print at least something
+            fprintf(stderr, "%s", (const char*) str.ToAscii());
     }
 }
 
@@ -121,31 +130,23 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...)
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 
-void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+void wxMessageOutputStderr::Output(const wxString& str)
 {
-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
+    const wxWX2MBbuf buf = str.mb_str();
 
-    fprintf(stderr, "%s", (const char*) out.mb_str());
+    if ( buf )
+        fprintf(stderr, "%s", (const char*) buf);
+    else // print at least something
+        fprintf(stderr, "%s", (const char*) str.ToAscii());
 }
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputDebug
 // ----------------------------------------------------------------------------
 
-void wxMessageOutputDebug::Printf(const wxChar* format, ...)
+void wxMessageOutputDebug::Output(const wxString& str)
 {
-    wxString out;
-
-    va_list args;
-    va_start(args, format);
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));
@@ -176,15 +177,9 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+void wxMessageOutputLog::Output(const wxString& str)
 {
-    wxString out;
-
-    va_list args;
-    va_start(args, format);
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);
 
     out.Replace(wxT("\t"), wxT("        "));
 
@@ -199,14 +194,9 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
 
 #if wxUSE_GUI
 
-void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+void wxMessageOutputMessageBox::Output(const wxString& str)
 {
-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
+    wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't
 #ifndef __WXMSW__
@@ -221,4 +211,3 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 }
 
 #endif // wxUSE_GUI
-