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

ok, now it _does_ compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-07 15:38:51 +00:00
parent 774e843c03
commit c9dac6640f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/log.h
View File

@@ -82,6 +82,9 @@ public:
bool HasPendingMessages() const { return m_bHasMessages; } bool HasPendingMessages() const { return m_bHasMessages; }
// only one sink is active at each moment // only one sink is active at each moment
// get current log target, will call wxApp::CreateLogTarget() to create one
// if none exists
static wxLog *GetActiveTarget();
// change log target, pLogger = NULL disables logging. if bNoFlashOld is true, // change log target, pLogger = NULL disables logging. if bNoFlashOld is true,
// the old log target isn't flashed which might lead to loss of messages! // the old log target isn't flashed which might lead to loss of messages!
// returns the previous log target // returns the previous log target

10
src/common/log.cpp
View File

@@ -265,10 +265,10 @@ wxLog *wxLog::GetActiveTarget()
return ms_pLogger; return ms_pLogger;
} }
wxLog *wxLog::SetActiveTarget(wxLog *pLogger) wxLog *wxLog::SetActiveTarget(wxLog *pLogger, bool bNoFlashOld)
{ {
// flush the old messages before changing // flush the old messages before changing
if ( ms_pLogger != NULL ) if ( (ms_pLogger != NULL) && !bNoFlashOld )
ms_pLogger->Flush(); ms_pLogger->Flush();
wxLog *pOldLogger = ms_pLogger; wxLog *pOldLogger = ms_pLogger;
@@ -423,7 +423,7 @@ void wxLogGui::Flush()
// do it right now to block any new calls to Flush() while we're here // do it right now to block any new calls to Flush() while we're here
m_bHasMessages = FALSE; m_bHasMessages = FALSE;
// @@@ ugly... // @@@ ugly...
// concatenate all strings (but not too many to not overfill the msg box) // concatenate all strings (but not too many to not overfill the msg box)
@@ -633,7 +633,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
// open file // open file
// --------- // ---------
wxFile file; wxFile file;
bool bOk = FALSE; bool bOk = FALSE;
if ( wxFile::Exists(szFileName) ) { if ( wxFile::Exists(szFileName) ) {
bool bAppend = FALSE; bool bAppend = FALSE;
wxString strMsg; wxString strMsg;
@@ -723,7 +723,7 @@ void wxLogWindow::Flush()
if ( m_pOldLog != NULL ) if ( m_pOldLog != NULL )
m_pOldLog->Flush(); m_pOldLog->Flush();
m_bHasMessages = FALSE; m_bHasMessages = FALSE;
} }
void wxLogWindow::DoLog(wxLogLevel level, const char *szString) void wxLogWindow::DoLog(wxLogLevel level, const char *szString)