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

Fix wxLogFormatter compilation under MSW.

Browse Source 
Fix wxMSW compilation after the changes of r70086.

Closes #13792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-22 16:36:47 +00:00
parent b25278d885
commit e718eb9840
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/log.cpp
View File

@@ -213,7 +213,14 @@ wxLogFormatter::Format(wxLogLevel level,
const wxString& msg, const wxString& msg,
const wxLogRecordInfo& info) const const wxLogRecordInfo& info) const
{ {
wxString prefix = FormatTime(info.timestamp); wxString prefix;
// don't time stamp debug messages under MSW as debug viewers usually
// already have an option to do it
#ifdef __WXMSW__
if ( level != wxLOG_Debug && level != wxLOG_Trace )
#endif // __WXMSW__
prefix = FormatTime(info.timestamp);
switch ( level ) switch ( level )
{ {
@@ -247,13 +254,7 @@ wxString
wxLogFormatter::FormatTime(time_t t) const wxLogFormatter::FormatTime(time_t t) const
{ {
wxString str; wxString str;
wxLog::TimeStamp(&str, t);
// don't time stamp debug messages under MSW as debug viewers usually
// already have an option to do it
#ifdef __WXMSW__
if ( level != wxLOG_Debug && level != wxLOG_Trace )
#endif // __WXMSW__
wxLog::TimeStamp(&str, t);
return str; return str;
} }