define wxUSE_LOG_DEBUG as wxDEBUG_LEVEL and not as defined(__WXDEBUG__)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/log.h b/include/wx/log.h
index 5a2c119abc7b41beaa96bc427d5b9c6de0d08d83..006620413f55bc0be952571df61716d5a0099148 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -60,11 +60,11 @@ typedef unsigned long wxLogLevel;
 #include "wx/dynarray.h"
 
 #ifndef wxUSE_LOG_DEBUG
 #include "wx/dynarray.h"
 
 #ifndef wxUSE_LOG_DEBUG

-#  ifdef __WXDEBUG__
-#    define wxUSE_LOG_DEBUG 1
-#  else // !__WXDEBUG__
-#    define wxUSE_LOG_DEBUG 0
-#  endif
+    #if wxDEBUG_LEVEL
+        #define wxUSE_LOG_DEBUG 1
+    #else // !wxDEBUG_LEVEL
+        #define wxUSE_LOG_DEBUG 0
+    #endif

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -72,9 +72,9 @@ typedef unsigned long wxLogLevel;
 // ----------------------------------------------------------------------------
 
 #if wxUSE_GUI
 // ----------------------------------------------------------------------------
 
 #if wxUSE_GUI

+    class WXDLLIMPEXP_FWD_CORE wxFrame;

     class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
     class WXDLLIMPEXP_FWD_CORE wxLogFrame;
     class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
     class WXDLLIMPEXP_FWD_CORE wxLogFrame;

-    class WXDLLIMPEXP_FWD_CORE wxFrame;

     class WXDLLIMPEXP_FWD_CORE wxWindow;
 #endif // wxUSE_GUI
 
     class WXDLLIMPEXP_FWD_CORE wxWindow;
 #endif // wxUSE_GUI
 


@@ -804,7 +804,7 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
+#if wxUSE_LOG_DEBUG

     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed API
 #ifdef __VISUALC__
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed API
 #ifdef __VISUALC__


@@ -822,10 +822,10 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
 
     #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 
 
     #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 

-#else   //!debug
+#else // !wxUSE_LOG_DEBUG

     #define wxLogApiError(api, err) wxLogNop()
     #define wxLogLastError(api) wxLogNop()
     #define wxLogApiError(api, err) wxLogNop()
     #define wxLogLastError(api) wxLogNop()

-#endif  //debug/!debug
+#endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG

 
 // wxCocoa has additiional trace masks
 #if defined(__WXCOCOA__)
 
 // wxCocoa has additiional trace masks
 #if defined(__WXCOCOA__)