Fixed a bug in DoGetBestSize that would make wxSpinCtrl too tall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -463,7 +463,12 @@ wxSize wxSpinCtrl::DoGetBestSize() const
|
|||||||
wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
|
wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
|
||||||
y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
|
y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
|
||||||
|
|
||||||
if ( sizeBtn.y < y )
|
// JACS: we should always use the height calculated
|
||||||
|
// from above, because otherwise we'll get a spin control
|
||||||
|
// that's too big. So never use the height calculated
|
||||||
|
// from wxSpinButton::DoGetBestSize().
|
||||||
|
|
||||||
|
// if ( sizeBtn.y < y )
|
||||||
{
|
{
|
||||||
// make the text tall enough
|
// make the text tall enough
|
||||||
sizeBtn.y = y;
|
sizeBtn.y = y;
|
||||||
|
Reference in New Issue
Block a user