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.
This commit is contained in:
@@ -402,15 +402,19 @@ public:
|
|||||||
// returns the results.
|
// returns the results.
|
||||||
virtual wxSize GetEffectiveMinSize() const;
|
virtual wxSize GetEffectiveMinSize() const;
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
wxDEPRECATED_MSG("use GetEffectiveMinSize() instead")
|
wxDEPRECATED_MSG("use GetEffectiveMinSize() instead")
|
||||||
wxSize GetBestFittingSize() const;
|
wxSize GetBestFittingSize() const;
|
||||||
|
#endif // WXWIN_COMPATIBILITY_2_8
|
||||||
|
|
||||||
// A 'Smart' SetSize that will fill in default size values with 'best'
|
// A 'Smart' SetSize that will fill in default size values with 'best'
|
||||||
// size. Sets the minsize to what was passed in.
|
// size. Sets the minsize to what was passed in.
|
||||||
void SetInitialSize(const wxSize& size=wxDefaultSize);
|
void SetInitialSize(const wxSize& size=wxDefaultSize);
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
wxDEPRECATED_MSG("use SetInitialSize() instead")
|
wxDEPRECATED_MSG("use SetInitialSize() instead")
|
||||||
void SetBestFittingSize(const wxSize& size=wxDefaultSize);
|
void SetBestFittingSize(const wxSize& size=wxDefaultSize);
|
||||||
|
#endif // WXWIN_COMPATIBILITY_2_8
|
||||||
|
|
||||||
|
|
||||||
// the generic centre function - centers the window on parent by`
|
// the generic centre function - centers the window on parent by`
|
||||||
@@ -1738,10 +1742,12 @@ protected:
|
|||||||
// recalculated each time the value is needed.
|
// recalculated each time the value is needed.
|
||||||
wxSize m_bestSizeCache;
|
wxSize m_bestSizeCache;
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
wxDEPRECATED_MSG("use SetInitialSize() instead.")
|
wxDEPRECATED_MSG("use SetInitialSize() instead.")
|
||||||
void SetBestSize(const wxSize& size);
|
void SetBestSize(const wxSize& size);
|
||||||
wxDEPRECATED_MSG("use SetInitialSize() instead.")
|
wxDEPRECATED_MSG("use SetInitialSize() instead.")
|
||||||
virtual void SetInitialBestSize(const wxSize& size);
|
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
|
// Inlines for some deprecated methods
|
||||||
inline wxSize wxWindowBase::GetBestFittingSize() const
|
inline wxSize wxWindowBase::GetBestFittingSize() const
|
||||||
{
|
{
|
||||||
@@ -1919,6 +1925,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
|
|||||||
{
|
{
|
||||||
SetInitialSize(size);
|
SetInitialSize(size);
|
||||||
}
|
}
|
||||||
|
#endif // WXWIN_COMPATIBILITY_2_8
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user