don't add the sash size to the best size if the window is not actually split (see #10533) [backport of r59415 from trunk]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@60837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-31 13:13:07 +00:00
parent 94254ee936
commit 20e227dfd0

View File

@@ -922,9 +922,12 @@ wxSize wxSplitterWindow::DoGetBestSize() const
pSash = &sizeBest.y; pSash = &sizeBest.y;
} }
// account for the border and the sash // account for the sash if the window is actually split
if ( m_windowOne && m_windowTwo )
*pSash += GetSashSize();
// account for the border too
int border = 2*GetBorderSize(); int border = 2*GetBorderSize();
*pSash += GetSashSize();
sizeBest.x += border; sizeBest.x += border;
sizeBest.y += border; sizeBest.y += border;