no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in wxButton itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
febebac1a0
commit
bad6c5e264
@ -1021,7 +1021,7 @@ void wxWindowMac::SetLabel(const wxString& title)
|
|||||||
{
|
{
|
||||||
m_label = title ;
|
m_label = title ;
|
||||||
|
|
||||||
if ( m_peer && m_peer->IsOk() && !(IsKindOf( CLASSINFO(wxButton) ) && GetId() == wxID_HELP) )
|
if ( m_peer && m_peer->IsOk() )
|
||||||
m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
|
m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
|
||||||
|
|
||||||
// do not trigger refreshes upon invisible and possible partly created objects
|
// do not trigger refreshes upon invisible and possible partly created objects
|
||||||
|
Loading…
Reference in New Issue
Block a user