X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/711f12ef2ea0c37d65b3170f78f4705ee85d0c40..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/log.h diff --git a/include/wx/log.h b/include/wx/log.h index d4a2458770..d948772c24 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -66,9 +66,9 @@ typedef unsigned long wxLogLevel; // wxUSE_LOG_TRACE enables the trace messages, they are disabled by default #ifndef wxUSE_LOG_TRACE - #if wxDEBUG_LEVEL >= 2 + #if wxDEBUG_LEVEL #define wxUSE_LOG_TRACE 1 - #else // wxDEBUG_LEVEL < 2 + #else // !wxDEBUG_LEVEL #define wxUSE_LOG_TRACE 0 #endif #endif // wxUSE_LOG_TRACE @@ -805,7 +805,9 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode); #ifdef HAVE_VARIADIC_MACROS #define wxLogTrace(mask, fmt, ...) wxLogNop() #else // !HAVE_VARIADIC_MACROS + #if WXWIN_COMPATIBILITY_2_8 WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxString&)) + #endif WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxString&)) #ifdef __WATCOMC__ // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351