don't mark GetTraceMask() deprecated as we use it in the same header which provokes...

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

diff --git a/include/wx/log.h b/include/wx/log.h
index c45f66ddecab086ae2de70d0318c22ca4aeebfbf..34168befc1ef5d9169511db2b2744584577018fd 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -452,8 +452,10 @@ public:
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED_INLINE( static void SetTraceMask(wxTraceMask ulMask),
         ms_ulTraceMask = ulMask; )
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED_INLINE( static void SetTraceMask(wxTraceMask ulMask),
         ms_ulTraceMask = ulMask; )

-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( static wxTraceMask GetTraceMask(),
-        return ms_ulTraceMask; )
+
+    // this one can't be marked deprecated as it's used in our own wxLogger
+    // below but it still is deprecated and shouldn't be used
+    static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }

 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected: