X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f173c334996bb79b694a919b2a275c22c309f97..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index d2d1c530a4..975dabe0ae 100644 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -118,7 +118,13 @@ 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__ // TODO: use the native message box for the other ports too wxMessageOutputStderr::Output(str); @@ -144,9 +150,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); } // ---------------------------------------------------------------------------- @@ -159,7 +167,7 @@ void wxMessageOutputDebug::Output(const wxString& str) 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 +184,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,6 +195,8 @@ 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);