undid last change to wxBitmapButton::GetBestSize(), in fact it doesn't make sense to support wxBU_EXACTFIT for it at all, so just removed the code doing it and mentioned it in the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ce321570b0
commit
9266e0ecde
@ -232,7 +232,6 @@ wxMSW:
|
||||
|
||||
- fixed enhanced metafiles loading from files (Andreas Goebel)
|
||||
- wxRadioButtons no longer have to be consecutive in a group
|
||||
- fixed wxBU_EXACTFIT handling in wxBitmapButton
|
||||
|
||||
|
||||
2.5.3
|
||||
|
@ -36,6 +36,10 @@ provided bitmaps. WIN32 only.}
|
||||
\twocolitem{\windowstyle{wxBU\_BOTTOM}}{Aligns the bitmap label to the bottom of the button. WIN32 only.}
|
||||
\end{twocollist}
|
||||
|
||||
Note that \windowstyle{wxBU\_EXACTFIT} supported by
|
||||
\helpref{wxButton}{wxbutton} is \emph{not} used by this class as bitmap buttons
|
||||
don't have any minimal standard size by default.
|
||||
|
||||
See also \helpref{window styles overview}{windowstyles}.
|
||||
|
||||
\wxheading{Event handling}
|
||||
|
@ -492,26 +492,14 @@ void wxBitmapButton::SetDefault()
|
||||
|
||||
wxSize wxBitmapButton::DoGetBestSize() const
|
||||
{
|
||||
wxSize best;
|
||||
if (m_bmpNormal.Ok())
|
||||
if ( m_bmpNormal.Ok() )
|
||||
{
|
||||
best.x = m_bmpNormal.GetWidth() + 2*m_marginX;
|
||||
best.y = m_bmpNormal.GetHeight() + 2*m_marginY;
|
||||
return wxSize(m_bmpNormal.GetWidth() + 2*m_marginX,
|
||||
m_bmpNormal.GetHeight() + 2*m_marginY);
|
||||
}
|
||||
|
||||
// all buttons have at least the standard size unless the user explicitly
|
||||
// wants them to be of smaller size and used wxBU_EXACTFIT style when
|
||||
// creating the button
|
||||
if ( !HasFlag(wxBU_EXACTFIT) )
|
||||
{
|
||||
wxSize sz = GetDefaultSize();
|
||||
if ( best.x < sz.x )
|
||||
best.x = sz.x;
|
||||
if ( best.y < sz.y )
|
||||
best.y = sz.y;
|
||||
}
|
||||
|
||||
return best;
|
||||
// no idea what our best size should be, defer to the base class
|
||||
return wxBitmapButtonBase::DoGetBestSize();
|
||||
}
|
||||
|
||||
#endif // wxUSE_BMPBUTTON
|
||||
|
Loading…
Reference in New Issue
Block a user