use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index d4a245877046f3b388b0b9043f8fad24b6553d82..d948772c244d9e2717dc954c8faae71dd8453ffb 100644 (file)
--- 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
 
 // 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
         #define wxUSE_LOG_TRACE 1

-    #else // wxDEBUG_LEVEL < 2
+    #else // !wxDEBUG_LEVEL

         #define wxUSE_LOG_TRACE 0
     #endif
 #endif // wxUSE_LOG_TRACE
         #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
     #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&))
         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
         WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxString&))
         #ifdef __WATCOMC__
         // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351