fixed wxBU_EXACTFIT handling in wxBitmapButton (closes 1056234)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fc1f28995d
commit
97786ab70f
@ -231,7 +231,8 @@ wxMac:
|
|||||||
wxMSW:
|
wxMSW:
|
||||||
|
|
||||||
- fixed enhanced metafiles loading from files (Andreas Goebel)
|
- fixed enhanced metafiles loading from files (Andreas Goebel)
|
||||||
- Group of wxRadioButtons no longer have to be consecutive
|
- wxRadioButtons no longer have to be consecutive in a group
|
||||||
|
- fixed wxBU_EXACTFIT handling in wxBitmapButton
|
||||||
|
|
||||||
|
|
||||||
2.5.3
|
2.5.3
|
||||||
|
@ -505,10 +505,10 @@ wxSize wxBitmapButton::DoGetBestSize() const
|
|||||||
if ( !HasFlag(wxBU_EXACTFIT) )
|
if ( !HasFlag(wxBU_EXACTFIT) )
|
||||||
{
|
{
|
||||||
wxSize sz = GetDefaultSize();
|
wxSize sz = GetDefaultSize();
|
||||||
if (best.x > sz.x)
|
if ( best.x < sz.x )
|
||||||
sz.x = best.x;
|
best.x = sz.x;
|
||||||
if (best.y > sz.y)
|
if ( best.y < sz.y )
|
||||||
sz.y = best.y;
|
best.y = sz.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
return best;
|
return best;
|
||||||
|
Loading…
Reference in New Issue
Block a user