Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made LogLastRepetitionCountIfNeeded() non static to avoid recreating the log target from ~wxLog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-01 20:22:06 +00:00
parent 36427ad571
commit c1f80bc0a6
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/log.cpp
View File

@@ -457,15 +457,13 @@ void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_li
// wxLog class implementation
// ----------------------------------------------------------------------------
/* static */
unsigned wxLog::LogLastRepetitionCountIfNeeded()
{
wxCRIT_SECT_LOCKER(lock, ms_prevCS);
const unsigned count = ms_prevCounter;
wxLog *pLogger = GetActiveTarget();
if ( pLogger && ms_prevCounter )
if ( ms_prevCounter )
{
wxString msg;
#if wxUSE_INTL
@@ -479,7 +477,7 @@ unsigned wxLog::LogLastRepetitionCountIfNeeded()
#endif
ms_prevCounter = 0;
ms_prevString.clear();
pLogger->DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
}
return count;
@@ -511,7 +509,7 @@ void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
return;
}
LogLastRepetitionCountIfNeeded();
pLogger->LogLastRepetitionCountIfNeeded();
// reset repetition counter for a new message
ms_prevString = szString;