update button style to include BS_MULTILINE when a multiline label is set

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-29 13:38:34 +00:00
parent c4e1d0fc47
commit d94de683a6
2 changed files with 26 additions and 8 deletions

View File

@@ -182,8 +182,7 @@ bool wxButton::Create(wxWindow *parent,
// black boxes)
//
// NB: we do it here and not in MSWGetStyle() because we need the label
// value and m_label is not set yet when MSWGetStyle() is called;
// besides changing BS_MULTILINE during run-time is pointless anyhow
// value and the label is not set yet when MSWGetStyle() is called
if ( label.find(_T('\n')) != wxString::npos )
{
msStyle |= BS_MULTILINE;
@@ -237,6 +236,25 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
return msStyle;
}
void wxButton::SetLabel(const wxString& label)
{
// update BS_MULTILINE style depending on the new label (resetting it
// doesn't seem to do anything very useful but it shouldn't hurt and we do
// have to set it whenever the label becomes multi line as otherwise it
// wouldn't be shown correctly)
long styleOld = ::GetWindowLong(GetHwnd(), GWL_STYLE),
styleNew;
if ( label.find(_T('\n')) != wxString::npos )
styleNew = styleOld | BS_MULTILINE;
else
styleNew = styleOld & ~BS_MULTILINE;
if ( styleNew != styleOld )
::SetWindowLong(GetHwnd(), GWL_STYLE, styleNew);
wxButtonBase::SetLabel(label);
}
// ----------------------------------------------------------------------------
// size management including autosizing
// ----------------------------------------------------------------------------