X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f173c334996bb79b694a919b2a275c22c309f97..a4ea083bbdf710d3234dcbd2eafb5d0e078f8348:/src/common/msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index d2d1c530a4..bf98eb4898 100644
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
-// RCS-ID:      $Id$
 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -118,8 +117,16 @@ void wxMessageOutputBest::Output(const wxString& str)
             return;
     }
 
-    ::MessageBox(NULL, str.wx_str(), NULL, MB_ICONINFORMATION | MB_OK);
+    wxString title;
+    if ( wxTheApp )
+        title = wxTheApp->GetAppDisplayName();
+    else // Use some title to avoid default "Error"
+        title = _("Message");
+
+    ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK);
 #else // !__WINDOWS__
+    wxUnusedVar(m_flags);
+
     // TODO: use the native message box for the other ports too
     wxMessageOutputStderr::Output(str);
 #endif // __WINDOWS__/!__WINDOWS__
@@ -144,9 +151,11 @@ void wxMessageOutputStderr::Output(const wxString& str)
     const wxWX2MBbuf buf = strWithLF.mb_str();
 
     if ( buf )
-        fprintf(stderr, "%s", (const char*) buf);
+        fprintf(m_fp, "%s", (const char*) buf);
     else // print at least something
-        fprintf(stderr, "%s", (const char*) strWithLF.ToAscii());
+        fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
+
+    fflush(m_fp);
 }
 
 // ----------------------------------------------------------------------------
@@ -155,11 +164,11 @@ void wxMessageOutputStderr::Output(const wxString& str)
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
     wxString out(AppendLineFeedIfNeeded(str));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
-    ::OutputDebugString(out.wx_str());
+    ::OutputDebugString(out.t_str());
 #else
     // TODO: use native debug output function for the other ports too
     wxMessageOutputStderr::Output(str);
@@ -176,7 +185,7 @@ void wxMessageOutputLog::Output(const wxString& str)
 
     out.Replace(wxT("\t"), wxT("        "));
 
-    ::wxLogMessage(wxT("%s"), out.c_str());
+    wxLogMessage(wxT("%s"), out.c_str());
 }
 
 #endif // wxUSE_BASE
@@ -187,12 +196,14 @@ void wxMessageOutputLog::Output(const wxString& str)
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 
+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
+
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
     out.Replace(wxT("\t"), wxT("        "));
 #endif