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

wxLog::Get/Settimestamp() now use wxString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-19 14:51:10 +00:00
parent a5398eb9c4
commit d993e05b2d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/log.tex
View File

@@ -341,7 +341,7 @@ Returns whether the repetition counting mode is enabled.
\membersection{wxLog::SetTimestamp}\label{wxlogsettimestamp} \membersection{wxLog::SetTimestamp}\label{wxlogsettimestamp}
\func{void}{SetTimestamp}{\param{const char * }{ format}} \func{void}{SetTimestamp}{\param{const wxStrgin\&}{ format}}
Sets the timestamp format prepended by the default log targets to all Sets the timestamp format prepended by the default log targets to all
messages. The string may contain any normal characters as well as \% messages. The string may contain any normal characters as well as \%
@@ -350,7 +350,7 @@ Passing a NULL value (not empty string) to this function disables message timest
\membersection{wxLog::GetTimestamp}\label{wxloggettimestamp} \membersection{wxLog::GetTimestamp}\label{wxloggettimestamp}
\constfunc{const char *}{GetTimestamp}{\void} \constfunc{const wxString\&}{GetTimestamp}{\void}
Returns the current timestamp format string. Returns the current timestamp format string.

6
include/wx/log.h
View File

@@ -211,7 +211,7 @@ public:
// sets the timestamp string: this is used as strftime() format string // sets the timestamp string: this is used as strftime() format string
// for the log targets which add time stamps to the messages - set it // for the log targets which add time stamps to the messages - set it
// to NULL to disable time stamping completely. // to NULL to disable time stamping completely.
static void SetTimestamp(const wxChar *ts) { ms_timestamp = ts; } static void SetTimestamp(const wxString& ts) { ms_timestamp = ts; }
// accessors // accessors
@@ -229,7 +229,7 @@ public:
static wxLogLevel GetLogLevel() { return ms_logLevel; } static wxLogLevel GetLogLevel() { return ms_logLevel; }
// get the current timestamp format string (may be NULL) // get the current timestamp format string (may be NULL)
static const wxChar *GetTimestamp() { return ms_timestamp; } static const wxString& GetTimestamp() { return ms_timestamp; }
// helpers // helpers
@@ -309,7 +309,7 @@ private:
// format string for strftime(), if NULL, time stamping log messages is // format string for strftime(), if NULL, time stamping log messages is
// disabled // disabled
static const wxChar *ms_timestamp; static wxString ms_timestamp;
static wxTraceMask ms_ulTraceMask; // controls wxLogTrace behaviour static wxTraceMask ms_ulTraceMask; // controls wxLogTrace behaviour
static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace

2
src/common/log.cpp
View File

@@ -906,7 +906,7 @@ wxLogLevel wxLog::ms_logLevel = wxLOG_Max; // log everything by defaul
size_t wxLog::ms_suspendCount = 0; size_t wxLog::ms_suspendCount = 0;
const wxChar *wxLog::ms_timestamp = wxT("%X"); // time only, no date wxString wxLog::ms_timestamp(wxT("%X")); // time only, no date
wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
wxArrayString wxLog::ms_aTraceMasks; wxArrayString wxLog::ms_aTraceMasks;