generate #line references to source .xrc files in wxrc --gettext (patch #1803492...

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 2ed2037..897414c
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -76,6 +76,34 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     return old;
 }
 

+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    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
 // ----------------------------------------------------------------------------


@@ -95,24 +123,23 @@ static inline bool IsInConsole()
 
 #endif // __WINDOWS__
 
 
 #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() )
     {
 #ifdef __WINDOWS__
     if ( !IsInConsole() )
     {

-        ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+        ::MessageBox(NULL, str.wx_str(), _T("wxWidgets"),
+                     MB_ICONINFORMATION | MB_OK);

     }
     else
 #endif // __WINDOWS__/!__WINDOWS__
     {
     }
     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());

     }
 }
 
     }
 }
 


@@ -120,36 +147,28 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...)
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 
 // 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
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
 
 #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() )
     {
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     if ( wxIsDebuggerRunning() )
     {


@@ -175,15 +194,9 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
 // 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("        "));
 
 
     out.Replace(wxT("\t"), wxT("        "));
 


@@ -196,16 +209,11 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG

 
 

-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__
 
     // the native MSW msg box understands the TABs, others don't
 #ifndef __WXMSW__


@@ -214,7 +222,7 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 
     wxString title;
     if ( wxTheApp )
 
     wxString title;
     if ( wxTheApp )

-        title.Printf(_("%s message"), wxTheApp->GetAppName().c_str());
+        title.Printf(_("%s message"), wxTheApp->GetAppDisplayName().c_str());

 
     ::wxMessageBox(out, title);
 }
 
     ::wxMessageBox(out, title);
 }