X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8570a7b18f58df85981494fea5f7425a27aea11a..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 804bec9b47..9647088067 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.t_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); @@ -157,7 +163,7 @@ 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")); @@ -189,12 +195,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