X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..ba86da30cf1a2a8429f3af465cbb6c9f52b307fb:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp old mode 100755 new mode 100644 index 2baffdcf32..6e9c57a558 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/msgout.cpp +// Name: src/common/msgout.cpp // Purpose: wxMessageOutput implementation // Author: Mattia Barbon // Modified by: // Created: 17.07.02 // RCS-ID: $Id$ -// Copyright: (c) the wxWindows team +// Copyright: (c) the wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "msgout.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,22 +29,26 @@ #include "wx/ffile.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/log.h" #if wxUSE_GUI #include "wx/msgdlg.h" #endif // wxUSE_GUI #endif #include "wx/msgout.h" -#include "wx/log.h" - +#include "wx/apptrait.h" #include #include +#if defined(__WINDOWS__) + #include "wx/msw/private.h" +#endif + // =========================================================================== // implementation // =========================================================================== -#ifdef __WXBASE__ +#if wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutput @@ -60,7 +60,7 @@ wxMessageOutput* wxMessageOutput::Get() { if ( !ms_msgOut && wxTheApp ) { - ms_msgOut = wxTheApp->CreateMessageOutput(); + ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput(); } return ms_msgOut; @@ -73,11 +73,22 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout) return old; } -// ---------------------------------------------------------------------------- -// wxMessageOutputStderr -// ---------------------------------------------------------------------------- +#if !wxUSE_UTF8_LOCALE_ONLY +void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...) +{ + va_list args; + va_start(args, format); + wxString out; + + out.PrintfV(format, args); + va_end(args); -void wxMessageOutputStderr::Printf(const wxChar* format, ...) + Output(out); +} +#endif // !wxUSE_UTF8_LOCALE_ONLY + +#if wxUSE_UNICODE_UTF8 +void wxMessageOutput::DoPrintfUtf8(const char *format, ...) { va_list args; va_start(args, format); @@ -86,43 +97,72 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); - fprintf(stderr, "%s", (const char*) out.mb_str()); + Output(out); } +#endif // wxUSE_UNICODE_UTF8 // ---------------------------------------------------------------------------- -// wxMessageOutputDebug +// wxMessageOutputBest // ---------------------------------------------------------------------------- -void wxMessageOutputDebug::Printf(const wxChar* format, ...) +void wxMessageOutputBest::Output(const wxString& str) { - wxString out; +#ifdef __WINDOWS__ + // decide whether to use console output or not + wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + const bool hasStderr = traits ? traits->CanUseStderr() : false; - va_list args; - va_start(args, format); + if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) ) + { + if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) ) + return; + } - out.PrintfV(format, args); - va_end(args); + ::MessageBox(NULL, str.t_str(), NULL, MB_ICONINFORMATION | MB_OK); +#else // !__WINDOWS__ + // TODO: use the native message box for the other ports too + wxMessageOutputStderr::Output(str); +#endif // __WINDOWS__/!__WINDOWS__ +} + +// ---------------------------------------------------------------------------- +// wxMessageOutputStderr +// ---------------------------------------------------------------------------- +wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str) +{ + wxString strLF(str); + if ( strLF.empty() || *strLF.rbegin() != '\n' ) + strLF += '\n'; + + return strLF; +} + +void wxMessageOutputStderr::Output(const wxString& str) +{ + const wxString strWithLF = AppendLineFeedIfNeeded(str); + const wxWX2MBbuf buf = strWithLF.mb_str(); + + if ( buf ) + fprintf(stderr, "%s", (const char*) buf); + else // print at least something + fprintf(stderr, "%s", (const char*) strWithLF.ToAscii()); +} + +// ---------------------------------------------------------------------------- +// wxMessageOutputDebug +// ---------------------------------------------------------------------------- + +void wxMessageOutputDebug::Output(const wxString& str) +{ #if defined(__WXMSW__) && !defined(__WXMICROWIN__) + wxString out(AppendLineFeedIfNeeded(str)); out.Replace(wxT("\t"), wxT(" ")); - out += _T("\r\n"); - ::OutputDebugString(out); -#elif defined(__WXMAC__) && !defined(__DARWIN__) - if ( wxIsDebuggerRunning() ) - { - Str255 pstr; - wxString output = str + wxT(";g") ; - wxMacStringToPascal(output.c_str(), pstr); - - #ifdef __powerc - DebugStr(pstr); - #else - SysBreakStr(pstr); - #endif - } -#else // !MSW, !Mac - wxFputs(out, stderr); - fflush(stderr); + out.Replace(wxT("\n"), wxT("\r\n")); + ::OutputDebugString(out.t_str()); +#else + // TODO: use native debug output function for the other ports too + wxMessageOutputStderr::Output(str); #endif // platform } @@ -130,49 +170,36 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...) // wxMessageOutputLog // ---------------------------------------------------------------------------- -void wxMessageOutputLog::Printf(const wxChar* format, ...) +void wxMessageOutputLog::Output(const wxString& str) { - wxString out; - - va_list args; - va_start(args, format); - - out.PrintfV(format, args); - va_end(args); + wxString out(str); out.Replace(wxT("\t"), wxT(" ")); ::wxLogMessage(wxT("%s"), out.c_str()); } -#endif // __WXBASE__ +#endif // wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutputMessageBox // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_MSGDLG -void wxMessageOutputMessageBox::Printf(const wxChar* format, ...) +void wxMessageOutputMessageBox::Output(const wxString& str) { - va_list args; - va_start(args, format); - wxString out; - - out.PrintfV(format, args); - va_end(args); + wxString out(str); // the native MSW msg box understands the TABs, others don't #ifndef __WXMSW__ out.Replace(wxT("\t"), wxT(" ")); #endif - wxString title; - if ( wxTheApp ) - title.Printf(_("%s message"), wxTheApp->GetAppName().c_str()); + wxString title = wxT("wxWidgets") ; + if (wxTheApp) title = wxTheApp->GetAppDisplayName(); ::wxMessageBox(out, title); } #endif // wxUSE_GUI -