X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1f6e2cfe2edae646d58e94c6a6b5f010f6439f7..0d29a4828eb4404ac69f29c7d82e2ea3292c6501:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp old mode 100755 new mode 100644 index 5060844865..e097ed9339 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -128,7 +128,8 @@ void wxMessageOutputBest::Output(const wxString& str) #ifdef __WINDOWS__ if ( !IsInConsole() ) { - ::MessageBox(NULL, str, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK); + ::MessageBox(NULL, str.wx_str(), _T("wxWidgets"), + MB_ICONINFORMATION | MB_OK); } else #endif // __WINDOWS__/!__WINDOWS__ @@ -167,20 +168,7 @@ void wxMessageOutputDebug::Output(const wxString& str) #if defined(__WXMSW__) && !defined(__WXMICROWIN__) out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\n"), wxT("\r\n")); - ::OutputDebugString(out); -#elif defined(__WXMAC__) && !defined(__DARWIN__) - if ( wxIsDebuggerRunning() ) - { - Str255 pstr; - wxString output = out + wxT(";g") ; - wxMacStringToPascal(output.c_str(), pstr); - - #ifdef __powerc - DebugStr(pstr); - #else - SysBreakStr(pstr); - #endif - } + ::OutputDebugString(out.wx_str()); #else wxFputs( out , stderr ) ; if ( out.Right(1) != wxT("\n") ) @@ -208,7 +196,7 @@ void wxMessageOutputLog::Output(const wxString& str) // wxMessageOutputMessageBox // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_MSGDLG void wxMessageOutputMessageBox::Output(const wxString& str) { @@ -221,7 +209,7 @@ void wxMessageOutputMessageBox::Output(const wxString& str) wxString title; if ( wxTheApp ) - title.Printf(_("%s message"), wxTheApp->GetAppName().c_str()); + title.Printf(_("%s message"), wxTheApp->GetAppDisplayName().c_str()); ::wxMessageBox(out, title); }