X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e94cd97dd7db345ab4c9abb911cf4396fcac3335..198be845897a79ba350ae7f93db536ddb2eccfb2:/src/common/log.cpp diff --git a/src/common/log.cpp b/src/common/log.cpp index 1604899a58..89ed1264fc 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -42,7 +42,7 @@ #include "wx/msgout.h" #include "wx/textfile.h" #include "wx/thread.h" -#include "wx/wxchar.h" +#include "wx/crt.h" // other standard headers #ifndef __WXWINCE__ @@ -157,7 +157,7 @@ IMPLEMENT_LOG_FUNCTION(Status) void wxSafeShowMessage(const wxString& title, const wxString& text) { #ifdef __WINDOWS__ - ::MessageBox(NULL, text, title, MB_OK | MB_ICONSTOP); + ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP); #else wxFprintf(stderr, _T("%s: %s\n"), title.c_str(), text.c_str()); fflush(stderr); @@ -475,7 +475,7 @@ unsigned wxLog::DoLogNumberOfRepeats() #endif ms_prevCounter = 0; ms_prevString.clear(); - pLogger->DoLog(ms_prevLevel, msg.c_str(), ms_prevTimeStamp); + pLogger->DoLog(ms_prevLevel, msg, ms_prevTimeStamp); } return retval; } @@ -491,7 +491,7 @@ wxLog::~wxLog() } /* static */ -void wxLog::OnLog(wxLogLevel level, const wxChar *szString, time_t t) +void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t) { if ( IsEnabled() && ms_logLevel >= level ) { @@ -527,6 +527,22 @@ wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size)) #endif // WXWIN_COMPATIBILITY_2_6 +#if WXWIN_COMPATIBILITY_2_8 + +void wxLog::DoLog(wxLogLevel WXUNUSED(level), + const char *WXUNUSED(szString), + time_t WXUNUSED(t)) +{ +} + +void wxLog::DoLog(wxLogLevel WXUNUSED(level), + const wchar_t *WXUNUSED(wzString), + time_t WXUNUSED(t)) +{ +} + +#endif // WXWIN_COMPATIBILITY_2_8 + wxLog *wxLog::GetActiveTarget() { if ( ms_bAutoCreate && ms_pLogger == NULL ) { @@ -595,7 +611,7 @@ void wxLog::ClearTraceMasks() void wxLog::TimeStamp(wxString *str) { #if wxUSE_DATETIME - if ( ms_timestamp ) + if ( !ms_timestamp.empty() ) { wxChar buf[256]; time_t timeNow; @@ -611,12 +627,19 @@ void wxLog::TimeStamp(wxString *str) #endif // wxUSE_DATETIME } -void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) +void wxLog::DoLog(wxLogLevel level, const wxString& szString, time_t t) { +#if WXWIN_COMPATIBILITY_2_8 + // DoLog() signature changed since 2.8, so we call the old versions here + // so that existing custom log classes still work: + DoLog(level, (const char*)szString.mb_str(), t); + DoLog(level, (const wchar_t*)szString.wc_str(), t); +#endif + switch ( level ) { case wxLOG_FatalError: - DoLogString(wxString(_("Fatal error: ")) + szString, t); - DoLogString(_("Program aborted."), t); + LogString(_("Fatal error: ") + szString, t); + LogString(_("Program aborted."), t); Flush(); #ifdef __WXWINCE__ ExitThread(3); @@ -626,11 +649,11 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) break; case wxLOG_Error: - DoLogString(wxString(_("Error: ")) + szString, t); + LogString(_("Error: ") + szString, t); break; case wxLOG_Warning: - DoLogString(wxString(_("Warning: ")) + szString, t); + LogString(_("Warning: ") + szString, t); break; case wxLOG_Info: @@ -638,7 +661,7 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) case wxLOG_Message: case wxLOG_Status: default: // log unknown log levels too - DoLogString(szString, t); + LogString(szString, t); break; case wxLOG_Trace: @@ -648,16 +671,26 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) wxString msg = level == wxLOG_Trace ? wxT("Trace: ") : wxT("Debug: "); msg << szString; - DoLogString(msg, t); + LogString(msg, t); } #endif // Debug break; } } -void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t)) +void wxLog::DoLogString(const wxString& szString, time_t t) { +#if WXWIN_COMPATIBILITY_2_8 + // DoLogString() signature changed since 2.8, so we call the old versions + // here so that existing custom log classes still work; unfortunately this + // also means that we can't have the wxFAIL_MSG below in compat mode + DoLogString((const char*)szString.mb_str(), t); + DoLogString((const wchar_t*)szString.wc_str(), t); +#else wxFAIL_MSG(wxT("DoLogString must be overriden if it's called.")); + wxUnusedVar(szString); + wxUnusedVar(t); +#endif } void wxLog::Flush() @@ -665,7 +698,7 @@ void wxLog::Flush() // nothing to do here } -/*static*/ bool wxLog::IsAllowedTraceMask(const wxChar *mask) +/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask) { for ( wxArrayString::iterator it = ms_aTraceMasks.begin(), en = ms_aTraceMasks.end(); @@ -689,7 +722,7 @@ void wxLogBuffer::Flush() } } -void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t) +void wxLogBuffer::DoLog(wxLogLevel level, const wxString& szString, time_t t) { switch ( level ) { @@ -714,7 +747,7 @@ void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t) } } -void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) +void wxLogBuffer::DoLogString(const wxString& szString, time_t WXUNUSED(t)) { m_str << szString << _T("\n"); } @@ -731,7 +764,7 @@ wxLogStderr::wxLogStderr(FILE *fp) m_fp = fp; } -void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) +void wxLogStderr::DoLogString(const wxString& szString, time_t WXUNUSED(t)) { wxString str; TimeStamp(&str); @@ -770,11 +803,11 @@ wxLogStream::wxLogStream(wxSTD ostream *ostr) m_ostr = ostr; } -void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) +void wxLogStream::DoLogString(const wxString& szString, time_t WXUNUSED(t)) { - wxString str; - TimeStamp(&str); - (*m_ostr) << wxConvertWX2MB(str) << wxConvertWX2MB(szString) << wxSTD endl; + wxString stamp; + TimeStamp(&stamp); + (*m_ostr) << stamp << szString << wxSTD endl; } #endif // wxUSE_STD_IOSTREAM @@ -816,7 +849,7 @@ void wxLogChain::Flush() m_logNew->Flush(); } -void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t) +void wxLogChain::DoLog(wxLogLevel level, const wxString& szString, time_t t) { // let the previous logger show it if ( m_logOld && IsPassingMessages() ) @@ -832,18 +865,28 @@ void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t) } } -// ---------------------------------------------------------------------------- -// wxLogPassThrough -// ---------------------------------------------------------------------------- - #ifdef __VISUALC__ // "'this' : used in base member initializer list" - so what? #pragma warning(disable:4355) #endif // VC++ -wxLogPassThrough::wxLogPassThrough() +// ---------------------------------------------------------------------------- +// wxLogInterposer +// ---------------------------------------------------------------------------- + +wxLogInterposer::wxLogInterposer() + : wxLogChain(this) +{ +} + +// ---------------------------------------------------------------------------- +// wxLogInterposerTemp +// ---------------------------------------------------------------------------- + +wxLogInterposerTemp::wxLogInterposerTemp() : wxLogChain(this) { + DetachOldLog(); } #ifdef __VISUALC__ @@ -873,7 +916,7 @@ wxLogLevel wxLog::ms_logLevel = wxLOG_Max; // log everything by defaul size_t wxLog::ms_suspendCount = 0; -const wxChar *wxLog::ms_timestamp = wxT("%X"); // time only, no date +wxString wxLog::ms_timestamp(wxT("%X")); // time only, no date wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; wxArrayString wxLog::ms_aTraceMasks;