no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 5ba3fcaf50a1e7a8bb056f1e41126709a6859c07..60572430d5f5208fe040b0e62cacbaecf848b23a 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -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() ) ;
 
     // do not trigger refreshes upon invisible and possible partly created objects
         m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 
     // do not trigger refreshes upon invisible and possible partly created objects