From a9549f1066214bd6230f6997cc7461ee22a6cd89 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Jan 2015 02:39:14 +0000 Subject: [PATCH] Fix checks for WXWIN_COMPATIBILITY_3_0: use #if, not #ifdef. The deprecated methods were always available as WXWIN_COMPATIBILITY_3_0 is always defined, we need to check its value and not its definedness. Closes #16782. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/bitmap.h | 2 +- include/wx/tipdlg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index e6b7688b05..94072ac75e 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -110,7 +110,7 @@ public: return *this; } -#ifdef WXWIN_COMPATIBILITY_3_0 +#if WXWIN_COMPATIBILITY_3_0 // This assignment operator is not portable as it is not implemented in any // other ports. wxDEPRECATED_MSG("Don't assign wxCursor to an existing wxBitmap, create a new wxBitmap from wxCursor instead.") diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h index bfccc71fbc..173bbf41cd 100644 --- a/include/wx/tipdlg.h +++ b/include/wx/tipdlg.h @@ -48,7 +48,7 @@ public: virtual ~wxTipProvider() { } -#ifdef WXWIN_COMPATIBILITY_3_0 +#if WXWIN_COMPATIBILITY_3_0 wxDEPRECATED_MSG("this method does nothing, simply don't call it") wxString PreprocessTip(const wxString& tip) { return tip; } #endif