X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e02911a260d9002ca40c328a44cf62e0bf67b68d..e3e89a9370cf895877feb84820c26bdc2e6ed588:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 512c9b6268..2ed2037f4c 100755 --- 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" @@ -32,34 +28,44 @@ #include "wx/string.h" #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/apptrait.h" #include #include +#if defined(__WINDOWS__) + #include "wx/msw/private.h" +#endif +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif + // =========================================================================== // implementation // =========================================================================== +#if wxUSE_BASE + +// ---------------------------------------------------------------------------- +// wxMessageOutput +// ---------------------------------------------------------------------------- + wxMessageOutput* wxMessageOutput::ms_msgOut = 0; wxMessageOutput* wxMessageOutput::Get() { - // FIXME this is an hack - static bool inGet = FALSE; - - if(!ms_msgOut && wxTheApp && !inGet) + if ( !ms_msgOut && wxTheApp ) { - inGet = TRUE; - wxTheApp->DoInit(); + ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput(); } - inGet = FALSE; return ms_msgOut; } @@ -70,6 +76,46 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout) return old; } +// ---------------------------------------------------------------------------- +// wxMessageOutputBest +// ---------------------------------------------------------------------------- + +#ifdef __WINDOWS__ + +// check if we're running in a console under Windows +static inline bool IsInConsole() +{ +#ifdef __WXWINCE__ + return false; +#else // !__WXWINCE__ + HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE); + return hStdErr && hStdErr != INVALID_HANDLE_VALUE; +#endif // __WXWINCE__/!__WXWINCE__ +} + +#endif // __WINDOWS__ + +void wxMessageOutputBest::Printf(const wxChar* format, ...) +{ + va_list args; + va_start(args, format); + wxString out; + + out.PrintfV(format, args); + va_end(args); + +#ifdef __WINDOWS__ + if ( !IsInConsole() ) + { + ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK); + } + else +#endif // __WINDOWS__/!__WINDOWS__ + { + fprintf(stderr, "%s", (const char*) out.mb_str()); + } +} + // ---------------------------------------------------------------------------- // wxMessageOutputStderr // ---------------------------------------------------------------------------- @@ -83,39 +129,76 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); - fprintf(stderr, "%s", out.mb_str()); + fprintf(stderr, "%s", (const char*) out.mb_str()); } // ---------------------------------------------------------------------------- -// wxMessageOutputMessageBox +// wxMessageOutputDebug // ---------------------------------------------------------------------------- -#if wxUSE_GUI - -void wxMessageOutputMessageBox::Printf(const wxChar* format, ...) +void wxMessageOutputDebug::Printf(const wxChar* format, ...) { + wxString out; + va_list args; va_start(args, format); + + out.PrintfV(format, args); + va_end(args); + +#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 + } +#else + wxFputs( out , stderr ) ; + if ( out.Right(1) != wxT("\n") ) + wxFputs( wxT("\n") , stderr ) ; + fflush( stderr ) ; +#endif // platform +} + +// ---------------------------------------------------------------------------- +// wxMessageOutputLog +// ---------------------------------------------------------------------------- + +void wxMessageOutputLog::Printf(const wxChar* format, ...) +{ wxString out; + va_list args; + va_start(args, format); + out.PrintfV(format, args); va_end(args); -#ifndef __WXMSW__ - out.Replace("\t"," "); -#endif - ::wxMessageBox(out); + out.Replace(wxT("\t"), wxT(" ")); + + ::wxLogMessage(wxT("%s"), out.c_str()); } -#endif // wxUSE_GUI +#endif // wxUSE_BASE // ---------------------------------------------------------------------------- -// wxMessageOutputLog +// wxMessageOutputMessageBox // ---------------------------------------------------------------------------- -#if wxUSE_GUI && defined(__WXMOTIF__) +#if wxUSE_GUI -void wxMessageOutputLog::Printf(const wxChar* format, ...) +void wxMessageOutputMessageBox::Printf(const wxChar* format, ...) { va_list args; va_start(args, format); @@ -124,10 +207,16 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...) out.PrintfV(format, args); va_end(args); - out.Replace("\t"," "); - // under Motif, wxMessageDialog needs a parent window, so we use - // wxLog, which is better than nothing - ::wxLogMessage("%s", out.c_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()); + + ::wxMessageBox(out, title); } #endif // wxUSE_GUI