added GetWindowSizeForVirtualSize() virtual hook for wxScrolledWindow (cuts down on code duplication in its DoGetBestSize())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bcaab0f92e
commit
ee146bca1b
@ -1279,6 +1279,14 @@ protected:
|
||||
// same size as it would have after a call to Fit()
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
// called from DoGetBestSize() to convert best virtual size (returned by
|
||||
// the window sizer) to the best size for the window itself; this is
|
||||
// overridden at wxScrolledWindow level to clump down virtual size to real
|
||||
virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const
|
||||
{
|
||||
return size;
|
||||
}
|
||||
|
||||
// this is the virtual function to be overriden in any derived class which
|
||||
// wants to change how SetSize() or Move() works - it is called by all
|
||||
// versions of these functions in the base class
|
||||
|
@ -579,7 +579,7 @@ wxSize wxWindowBase::DoGetBestSize() const
|
||||
|
||||
if ( m_windowSizer )
|
||||
{
|
||||
best = m_windowSizer->GetMinSize();
|
||||
best = GetWindowSizeForVirtualSize(m_windowSizer->GetMinSize());
|
||||
}
|
||||
#if wxUSE_CONSTRAINTS
|
||||
else if ( m_constraints )
|
||||
|
Loading…
Reference in New Issue
Block a user