X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5260b1c582632afeb8f25db7f10697c8d45461b4..9406d962ccf50d63f163896a2dd94123a2a8664a:/src/common/log.cpp diff --git a/src/common/log.cpp b/src/common/log.cpp index dd32729b41..8a50359699 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -47,7 +47,7 @@ #include #include -#ifdef __WINDOWS__ +#ifdef __WXMSW__ #include #else //Unix #include @@ -83,12 +83,12 @@ static char s_szBuf[LOG_BUFFER_SIZE]; // generic log function -void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...) +void wxLogGeneric(wxLogLevel level, const char *szFormat, ...) { if ( wxLog::GetActiveTarget() != NULL ) { va_list argptr; - va_start(argptr, strFormat); - vsprintf(s_szBuf, strFormat, argptr); + va_start(argptr, szFormat); + vsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(level, s_szBuf); @@ -96,12 +96,12 @@ void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...) } #define IMPLEMENT_LOG_FUNCTION(level) \ - void wxLog##level(wxTString strFormat, ...) \ + void wxLog##level(const char *szFormat, ...) \ { \ if ( wxLog::GetActiveTarget() != NULL ) { \ va_list argptr; \ - va_start(argptr, strFormat); \ - vsprintf(s_szBuf, strFormat, argptr); \ + va_start(argptr, szFormat); \ + vsprintf(s_szBuf, szFormat, argptr); \ va_end(argptr); \ \ wxLog::OnLog(wxLOG_##level, s_szBuf); \ @@ -116,13 +116,13 @@ IMPLEMENT_LOG_FUNCTION(Info) IMPLEMENT_LOG_FUNCTION(Status) // same as info, but only if 'verbose' mode is on -void wxLogVerbose(wxTString strFormat, ...) +void wxLogVerbose(const char *szFormat, ...) { wxLog *pLog = wxLog::GetActiveTarget(); if ( pLog != NULL && pLog->GetVerbose() ) { va_list argptr; - va_start(argptr, strFormat); - vsprintf(s_szBuf, strFormat, argptr); + va_start(argptr, szFormat); + vsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLog::OnLog(wxLOG_Info, s_szBuf); @@ -130,7 +130,7 @@ void wxLogVerbose(wxTString strFormat, ...) } // debug functions -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ #define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \ void wxLog##level(const char *szFormat, ...) \ { \ @@ -181,21 +181,21 @@ void wxLogSysErrorHelper(long lErrCode) wxLog::OnLog(wxLOG_Error, s_szBuf); } -void WXDLLEXPORT wxLogSysError(wxTString strFormat, ...) +void WXDLLEXPORT wxLogSysError(const char *szFormat, ...) { va_list argptr; - va_start(argptr, strFormat); - vsprintf(s_szBuf, strFormat, argptr); + va_start(argptr, szFormat); + vsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLogSysErrorHelper(wxSysErrorCode()); } -void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...) +void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...) { va_list argptr; - va_start(argptr, strFormat); - vsprintf(s_szBuf, strFormat, argptr); + va_start(argptr, szFormat); + vsprintf(s_szBuf, szFormat, argptr); va_end(argptr); wxLogSysErrorHelper(lErrCode); @@ -210,11 +210,11 @@ wxLog::wxLog() m_bHasMessages = FALSE; m_bVerbose = FALSE; m_szTimeFormat = "[%d/%b/%y %H:%M:%S] "; - m_ulTraceMask = (wxTraceMask)-1; // set all bits + m_ulTraceMask = (wxTraceMask)0; // -1 to set all bits } -wxLog *wxLog::GetActiveTarget() -{ +wxLog *wxLog::GetActiveTarget() +{ if ( !ms_bInitialized ) { // prevent infinite recursion if someone calls wxLogXXX() from // wxApp::CreateLogTarget() @@ -230,20 +230,20 @@ wxLog *wxLog::GetActiveTarget() // do nothing if it fails - what can we do? } - return ms_pLogger; + return ms_pLogger; } wxLog *wxLog::SetActiveTarget(wxLog *pLogger) -{ +{ // flush the old messages before changing if ( ms_pLogger != NULL ) ms_pLogger->Flush(); ms_bInitialized = TRUE; - wxLog *pOldLogger = ms_pLogger; - ms_pLogger = pLogger; - return pOldLogger; + wxLog *pOldLogger = ms_pLogger; + ms_pLogger = pLogger; + return pOldLogger; } void wxLog::DoLog(wxLogLevel level, const char *szString) @@ -291,16 +291,16 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) case wxLOG_Trace: case wxLOG_Debug: - #ifdef __DEBUG__ + #ifdef __WXDEBUG__ #ifdef __WIN32__ // in addition to normal logging, also send the string to debugger // (don't prepend "Debug" here: it will go to debug window anyhow) ::OutputDebugString(str + szString + "\n\r"); #endif //Win32 - DoLogString(str << (level == wxLOG_Trace ? "Trace" : "Debug") + DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug")) << ": " << szString); #endif - + break; default: @@ -359,7 +359,7 @@ void wxLogStream::DoLogString(const char *szString) // ---------------------------------------------------------------------------- wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf -#ifndef __GTK__ +#ifndef __WXGTK__ : wxLogStream(new ostream(pTextCtrl)) #endif //GTK { @@ -367,7 +367,7 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) wxLogTextCtrl::~wxLogTextCtrl() { - #ifndef __GTK__ + #ifndef __WXGTK__ delete m_ostr; #endif //GTK } @@ -389,10 +389,10 @@ void wxLogGui::Flush() return; // @@@ ugly... - + // concatenate all strings (but not too many to not overfill the msg box) wxString str; - uint nLines = 0, + uint nLines = 0, nMsgCount = m_aMessages.Count(); // start from the most recent message @@ -448,14 +448,14 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) case wxLOG_Trace: case wxLOG_Debug: - #ifdef __DEBUG__ + #ifdef __WXDEBUG__ #ifdef __WIN32__ OutputDebugString(szString); OutputDebugString("\n\r"); #else //!WIN32 // send them to stderr - fprintf(stderr, level == wxLOG_Trace ? "Trace: %s\n" - : "Debug: %s\n", szString); + fprintf(stderr, "%s: %s\n", + level == wxLOG_Trace ? _("Trace") : _("Debug"), szString); fflush(stderr); #endif // WIN32 #endif @@ -463,7 +463,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) case wxLOG_FatalError: // show this one immediately - wxMessageBox(szString, "Fatal error", wxICON_HAND); + wxMessageBox(szString, _("Fatal error"), wxICON_HAND); break; case wxLOG_Error: @@ -477,7 +477,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) m_aMessages.Add(szString); break; - + default: wxFAIL_MSG("unknown log level in wxLogGui::DoLog"); } @@ -523,7 +523,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) EVT_MENU(Menu_Clear, wxLogFrame::OnClear) EVT_CLOSE(wxLogFrame::OnCloseWindow) -END_EVENT_TABLE() +END_EVENT_TABLE() wxLogFrame::wxLogFrame(const char *szTitle) : wxFrame(NULL, -1, szTitle) @@ -618,8 +618,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event) // retrieve text and save it // ------------------------- - -#ifdef __GTK__ +#ifdef __WXGTK__ // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet wxLogError("Sorry, this function is not implemented under GTK"); #else @@ -628,12 +627,12 @@ void wxLogFrame::OnSave(wxCommandEvent& event) bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL()); } #endif //GTK - + if ( bOk ) bOk = file.Close(); if ( !bOk ) { - wxLogError("Can't save log contents to file."); + wxLogError(_("Can't save log contents to file.")); return; } } @@ -643,11 +642,11 @@ void wxLogFrame::OnClear(wxCommandEvent& event) m_pTextCtrl->Clear(); } -wxLogWindow::wxLogWindow(const wxTString& strTitle, bool bShow) +wxLogWindow::wxLogWindow(const char *szTitle, bool bShow) { m_pOldLog = wxLog::GetActiveTarget(); - m_pLogFrame = new wxLogFrame(strTitle); - + m_pLogFrame = new wxLogFrame(szTitle); + if ( bShow ) m_pLogFrame->Show(TRUE); } @@ -661,13 +660,13 @@ void wxLogWindow::DoLog(wxLogLevel level, const char *szString) { // first let the previous logger show it if ( m_pOldLog != NULL ) { - // @@@ why can't we access protected wxLog method from here (we derive + // @@@ why can't we access protected wxLog method from here (we derive // from wxLog)? gcc gives "DoLog is protected in this context", what // does this mean? Anyhow, the cast is harmless and let's us do what // we want. ((wxLogWindow *)m_pOldLog)->DoLog(level, szString); } - + // and this will format it nicely and call our DoLogString() wxLog::DoLog(level, szString); } @@ -678,7 +677,7 @@ void wxLogWindow::DoLogString(const char *szString) wxTextCtrl *pText = m_pLogFrame->TextCtrl(); // remove selection (WriteText is in fact ReplaceSelection) - #ifdef __WINDOWS__ + #ifdef __WXMSW__ long nLen = pText->GetLastPosition(); pText->SetSelection(nLen, nLen); #endif // Windows @@ -751,7 +750,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { - #ifdef __WINDOWS__ + #ifdef __WXMSW__ #ifdef __WIN32__ return ::GetLastError(); #else //WIN16 @@ -769,14 +768,14 @@ const char *wxSysErrorMsg(unsigned long nErrCode) if ( nErrCode == 0 ) nErrCode = wxSysErrorCode(); - #ifdef __WINDOWS__ + #ifdef __WXMSW__ #ifdef __WIN32__ static char s_szBuf[LOG_BUFFER_SIZE / 2]; // get error message from system LPVOID lpMsgBuf; FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, nErrCode, + NULL, nErrCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL); @@ -809,13 +808,30 @@ const char *wxSysErrorMsg(unsigned long nErrCode) // debug helper // ---------------------------------------------------------------------------- -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ + +void Trap() +{ + #ifdef __WXMSW__ + DebugBreak(); + #else // Unix + raise(SIGTRAP); + #endif // Win/Unix +} // this function is called when an assert fails void wxOnAssert(const char *szFile, int nLine, const char *szMsg) { // this variable can be set to true to suppress "assert failure" messages - static s_bNoAsserts = FALSE; + static bool s_bNoAsserts = FALSE; + static bool s_bInAssert = FALSE; + + if ( s_bInAssert ) { + // He-e-e-e-elp!! we're trapped in endless loop + Trap(); + } + + s_bInAssert = TRUE; char szBuf[LOG_BUFFER_SIZE]; sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine); @@ -827,10 +843,10 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg) strcat(szBuf, "."); } - // send it to the normal log destination - wxLogDebug(szBuf); - if ( !s_bNoAsserts ) { + // send it to the normal log destination + wxLogDebug(szBuf); + strcat(szBuf, _("\nDo you want to stop the program?" "\nYou can also choose [Cancel] to suppress " "further warnings.")); @@ -838,21 +854,19 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg) switch ( wxMessageBox(szBuf, _("Debug"), wxYES_NO | wxCANCEL | wxICON_STOP ) ) { case wxYES: - #ifdef __WINDOWS__ - DebugBreak(); - #else // Unix - raise(SIGTRAP); - #endif // Win/Unix + Trap(); break; case wxCANCEL: s_bNoAsserts = TRUE; break; - + //case wxNO: nothing to do } } + + s_bInAssert = FALSE; } -#endif //DEBUG +#endif //WXDEBUG