X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ed3265e18ed0470d7b56bc2a8a6796c697b90af..f5ba273ecd799f652736ce2bc830283787302a56:/src/common/log.cpp?ds=sidebyside diff --git a/src/common/log.cpp b/src/common/log.cpp index 3f062d0dfc..0a44516706 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -180,17 +180,17 @@ void wxLogVerbose(const wxChar *szFormat, ...) wxChar *p = s_szBuf; size_t len = WXSIZEOF(s_szBuf); - strncpy(s_szBuf, _T("Trace ("), len); - len -= 7; // strlen("Trace (") - p += 7; + strncpy(s_szBuf, _T("("), len); + len -= 1; // strlen("(") + p += 1; strncat(p, mask, len); size_t lenMask = wxStrlen(mask); len -= lenMask; p += lenMask; - strncat(p, _T("): "), len); - len -= 3; - p += 3; + strncat(p, _T(") "), len); + len -= 2; + p += 2; va_list argptr; va_start(argptr, szFormat); @@ -369,8 +369,13 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t) case wxLOG_Trace: case wxLOG_Debug: #ifdef __WXDEBUG__ - DoLogString(szString, t); -#endif + { + wxString msg = level == wxLOG_Trace ? wxT("Trace: ") + : wxT("Debug: "); + msg << szString; + DoLogString(msg, t); + } +#endif // Debug break; } }