X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0a050e347b1ece07ad5f165ba1b1d16edbeae77..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp old mode 100755 new mode 100644 index 618ace720e..9fabb4a987 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -43,9 +43,6 @@ #if defined(__WINDOWS__) #include "wx/msw/private.h" #endif -#ifdef __WXMAC__ - #include "wx/mac/private.h" -#endif // =========================================================================== // implementation @@ -169,19 +166,6 @@ void wxMessageOutputDebug::Output(const wxString& str) out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\n"), wxT("\r\n")); ::OutputDebugString(out.wx_str()); -#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 - } #else wxFputs( out , stderr ) ; if ( out.Right(1) != wxT("\n") ) @@ -209,7 +193,7 @@ void wxMessageOutputLog::Output(const wxString& str) // wxMessageOutputMessageBox // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_MSGDLG void wxMessageOutputMessageBox::Output(const wxString& str) { @@ -222,7 +206,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); }