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

minor changes and bug corrections (interface unchanged)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-08-03 22:49:01 +00:00
parent 0be4095abb
commit 275bf4c13a
5 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/log.cpp
View File

@@ -216,19 +216,22 @@ wxLog::wxLog()
wxLog *wxLog::GetActiveTarget()
{
if ( !ms_bInitialized ) {
if ( ms_bAutoCreate && ms_pLogger == NULL ) {
// prevent infinite recursion if someone calls wxLogXXX() from
// wxApp::CreateLogTarget()
ms_bInitialized = TRUE;
static bool s_bInGetActiveTarget = FALSE;
if ( !s_bInGetActiveTarget ) {
s_bInGetActiveTarget = TRUE;
#ifdef WX_TEST_MINIMAL
ms_pLogger = new wxLogStderr;
#else
// ask the application to create a log target for us
ms_pLogger = wxTheApp->CreateLogTarget();
#endif
#ifdef WX_TEST_MINIMAL
ms_pLogger = new wxLogStderr;
#else
// ask the application to create a log target for us
ms_pLogger = wxTheApp->CreateLogTarget();
#endif
// do nothing if it fails - what can we do?
// do nothing if it fails - what can we do?
}
}
return ms_pLogger;
@@ -240,8 +243,6 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
if ( ms_pLogger != NULL )
ms_pLogger->Flush();
ms_bInitialized = TRUE;
wxLog *pOldLogger = ms_pLogger;
ms_pLogger = pLogger;
return pOldLogger;
@@ -705,7 +706,7 @@ wxLogWindow::~wxLogWindow()
// static variables
// ----------------------------------------------------------------------------
wxLog *wxLog::ms_pLogger = NULL;
bool wxLog::ms_bInitialized = FALSE;
bool wxLog::ms_bAutoCreate = TRUE;
wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
// ----------------------------------------------------------------------------