From d7f70fc462556dbcecbfc78bc1ac560ac2ea8fd1 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Mon, 1 May 2017 14:16:17 +0200 Subject: [PATCH] Schedule deprecated wxWindowBase functions for removal in the future Some wxWindowBase functions were marked deprecated prior to wx 3.0 release and therefore they should be inserted into WXWIN_COMPATIBILITY_2_8 blocks to mark them for removal in a future wx version. --- include/wx/window.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/wx/window.h b/include/wx/window.h index e65b5a6d96..86a0890f0c 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -402,15 +402,19 @@ public: // returns the results. virtual wxSize GetEffectiveMinSize() const; +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_MSG("use GetEffectiveMinSize() instead") wxSize GetBestFittingSize() const; +#endif // WXWIN_COMPATIBILITY_2_8 // A 'Smart' SetSize that will fill in default size values with 'best' // size. Sets the minsize to what was passed in. void SetInitialSize(const wxSize& size=wxDefaultSize); +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_MSG("use SetInitialSize() instead") void SetBestFittingSize(const wxSize& size=wxDefaultSize); +#endif // WXWIN_COMPATIBILITY_2_8 // the generic centre function - centers the window on parent by` @@ -1738,10 +1742,12 @@ protected: // recalculated each time the value is needed. wxSize m_bestSizeCache; +#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED_MSG("use SetInitialSize() instead.") void SetBestSize(const wxSize& size); wxDEPRECATED_MSG("use SetInitialSize() instead.") virtual void SetInitialBestSize(const wxSize& size); +#endif // WXWIN_COMPATIBILITY_2_8 @@ -1898,7 +1904,7 @@ private: }; - +#if WXWIN_COMPATIBILITY_2_8 // Inlines for some deprecated methods inline wxSize wxWindowBase::GetBestFittingSize() const { @@ -1919,6 +1925,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) { SetInitialSize(size); } +#endif // WXWIN_COMPATIBILITY_2_8 // ----------------------------------------------------------------------------