avoid warnings about undefined wxUSE_LOG_DEBUG if wxUSE_LOG=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -515,6 +515,7 @@ public:
|
|||||||
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls
|
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls
|
||||||
|
|
||||||
#endif // wxUSE_LOG/!wxUSE_LOG
|
#endif // wxUSE_LOG/!wxUSE_LOG
|
||||||
|
|
||||||
#define DECLARE_LOG_FUNCTION2(level, argclass, arg) \
|
#define DECLARE_LOG_FUNCTION2(level, argclass, arg) \
|
||||||
DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE)
|
DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE)
|
||||||
|
|
||||||
@@ -550,7 +551,7 @@ DECLARE_LOG_FUNCTION(SysError);
|
|||||||
DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
|
DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
|
||||||
|
|
||||||
// debug functions do nothing in release mode
|
// debug functions do nothing in release mode
|
||||||
#if wxUSE_LOG_DEBUG
|
#if wxUSE_LOG && wxUSE_LOG_DEBUG
|
||||||
DECLARE_LOG_FUNCTION(Debug);
|
DECLARE_LOG_FUNCTION(Debug);
|
||||||
|
|
||||||
// there is no more unconditional LogTrace: it is not different from
|
// there is no more unconditional LogTrace: it is not different from
|
||||||
@@ -565,7 +566,7 @@ DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
|
|||||||
// wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of
|
// wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of
|
||||||
// string identifiers
|
// string identifiers
|
||||||
DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
|
DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
|
||||||
#else //!debug
|
#else //!debug || !wxUSE_LOG
|
||||||
// these functions do nothing in release builds
|
// these functions do nothing in release builds
|
||||||
|
|
||||||
// note that leaving out "fmt" in the vararg functions provokes a warning
|
// note that leaving out "fmt" in the vararg functions provokes a warning
|
||||||
|
Reference in New Issue
Block a user