From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 31 Jul 2006 16:56:51 +0000 (+0000)
Subject: avoid warnings about undefined wxUSE_LOG_DEBUG if wxUSE_LOG=0
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bdeb1f0d6ce1b663061a604dfe81205a4bf98c5d?ds=inline

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
---

diff --git a/include/wx/log.h b/include/wx/log.h
index c3ee768cbf..71be9b337b 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -515,6 +515,7 @@ public:
 #define wxTRACE_OleCalls wxEmptyString // OLE interface calls
 
 #endif // wxUSE_LOG/!wxUSE_LOG
+
 #define DECLARE_LOG_FUNCTION2(level, argclass, arg)                         \
     DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE)
 
@@ -550,7 +551,7 @@ DECLARE_LOG_FUNCTION(SysError);
 DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
 
 // debug functions do nothing in release mode
-#if wxUSE_LOG_DEBUG
+#if wxUSE_LOG && wxUSE_LOG_DEBUG
     DECLARE_LOG_FUNCTION(Debug);
 
     // 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
     // string identifiers
     DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
-#else   //!debug
+#else   //!debug || !wxUSE_LOG
     // these functions do nothing in release builds
 
     // note that leaving out "fmt" in the vararg functions provokes a warning