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

made wxLog::Set/GetVerbose() static back again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-10 17:33:53 +00:00
parent bf188f1add
commit fd7718b28c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/log.h
View File

@@ -158,7 +158,7 @@ public:
// functions controlling the default wxLog behaviour // functions controlling the default wxLog behaviour
// verbose mode is activated by standard command-line '-verbose' // verbose mode is activated by standard command-line '-verbose'
// option // option
void SetVerbose(bool bVerbose = TRUE) { m_bVerbose = bVerbose; } static void SetVerbose(bool bVerbose = TRUE) { ms_bVerbose = bVerbose; }
// should GetActiveTarget() try to create a new log object if the // should GetActiveTarget() try to create a new log object if the
// current is NULL? // current is NULL?
static void DontCreateOnDemand(); static void DontCreateOnDemand();
@@ -179,7 +179,7 @@ public:
// accessors // accessors
// gets the verbose status // gets the verbose status
bool GetVerbose() const { return m_bVerbose; } static bool GetVerbose() { return ms_bVerbose; }
// get trace mask // get trace mask
static wxTraceMask GetTraceMask() { return ms_ulTraceMask; } static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
// is this trace mask in the list? // is this trace mask in the list?
@@ -199,7 +199,6 @@ public:
protected: protected:
bool m_bHasMessages; // any messages in the queue? bool m_bHasMessages; // any messages in the queue?
bool m_bVerbose; // FALSE => ignore LogInfo messages
// the logging functions that can be overriden // the logging functions that can be overriden
// default DoLog() prepends the time stamp and a prefix corresponding // default DoLog() prepends the time stamp and a prefix corresponding
@@ -216,6 +215,7 @@ private:
static wxLog *ms_pLogger; // currently active log sink static wxLog *ms_pLogger; // currently active log sink
static bool ms_doLog; // FALSE => all logging disabled static bool ms_doLog; // FALSE => all logging disabled
static bool ms_bAutoCreate; // create new log targets on demand? static bool ms_bAutoCreate; // create new log targets on demand?
static bool ms_bVerbose; // FALSE => ignore LogInfo messages
static size_t ms_suspendCount; // if positive, logs are not flushed static size_t ms_suspendCount; // if positive, logs are not flushed

2
src/common/log.cpp
View File

@@ -284,7 +284,6 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
wxLog::wxLog() wxLog::wxLog()
{ {
m_bHasMessages = FALSE; m_bHasMessages = FALSE;
m_bVerbose = FALSE;
} }
wxLog *wxLog::GetActiveTarget() wxLog *wxLog::GetActiveTarget()
@@ -585,6 +584,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
wxLog *wxLog::ms_pLogger = (wxLog *)NULL; wxLog *wxLog::ms_pLogger = (wxLog *)NULL;
bool wxLog::ms_doLog = TRUE; bool wxLog::ms_doLog = TRUE;
bool wxLog::ms_bAutoCreate = TRUE; bool wxLog::ms_bAutoCreate = TRUE;
bool wxLog::ms_bVerbose = FALSE;
size_t wxLog::ms_suspendCount = 0; size_t wxLog::ms_suspendCount = 0;