From b356aa554a82f4d82f0c12abb83eb4656204fe7a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 9 Jul 2009 22:00:30 +0000 Subject: [PATCH] don't mark GetTraceMask() deprecated as we use it in the same header which provokes warnings when including it from outside wx git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/log.h b/include/wx/log.h index c45f66ddec..34168befc1 100644 --- 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; ) - 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: