From b103e4f3d5ee8fef8649c4723f47be9c36a2c3ff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 30 Nov 2003 20:44:22 +0000 Subject: [PATCH] removed wxLogTrace() without mask to fix DMC compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/include/wx/log.h b/include/wx/log.h index a2670f451d..3df5e2cd60 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -488,23 +488,22 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode); #if wxUSE_LOG_DEBUG DECLARE_LOG_FUNCTION(Debug); - // first kind of LogTrace is unconditional: it doesn't check the level, - DECLARE_LOG_FUNCTION(Trace); + // there is no more unconditional LogTrace: it is not different from + // LogDebug and it creates overload ambiguities + //DECLARE_LOG_FUNCTION(Trace); - // this second version will only log the message if the mask had been - // added to the list of masks with AddTraceMask() + // this version only logs the message if the mask had been added to the + // list of masks with AddTraceMask() DECLARE_LOG_FUNCTION2(Trace, const wxChar *mask); - // the last one does nothing if all of level bits are not set - // in wxLog::GetActive()->GetTraceMask() - it's deprecated in favour of + // and this one does nothing if all of level bits are not set in + // wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of // string identifiers DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask); #else //!debug // these functions do nothing in release builds inline void wxVLogDebug(const wxChar *, va_list) { } inline void wxLogDebug(const wxChar *, ...) { } - inline void wxVLogTrace(const wxChar *, va_list) { } - inline void wxLogTrace(const wxChar *, ...) { } inline void wxVLogTrace(wxTraceMask, const wxChar *, va_list) { } inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { } inline void wxVLogTrace(const wxChar *, const wxChar *, va_list) { } -- 2.45.2