AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wxLogChain (and wxLogWindow deriving from it) broken by wxLog changes.

Browse Source 
wxLogChain::DoLogRecord() only called DoLogRecord() on the old logger but not
the new one when the new logger was the same object as wxLogChain itself as is
always the case for wxLogWindow. The result was that nothing was logged into
the window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-12-05 01:32:45 +00:00
parent 0564ae939d
commit 51eb060619
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/log.cpp
View File

@ -854,8 +854,15 @@ void wxLogChain::DoLogRecord(wxLogLevel level,
m_logOld->LogRecord(level, msg, info);
// and also send it to the new one
if ( m_logNew && m_logNew != this )
m_logNew->LogRecord(level, msg, info);
if ( m_logNew )
{
// don't call m_logNew->LogRecord() to avoid infinite recursion when
// m_logNew is this object itself
if ( m_logNew != this )
m_logNew->LogRecord(level, msg, info);
else
wxLog::DoLogRecord(level, msg, info);
}
}
#ifdef __VISUALC__