Applied patch [ 850483 ] Toolbar bugfix (Mac)

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f2310dc1a912e1e92dfdf62172f7ae7efd2beeac..36d6474ab45ae3fa164bab440c962b7a42baa312 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -63,9 +63,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
 
 bool wxToolBarToolBase::Enable(bool enable)
 {
 
 bool wxToolBarToolBase::Enable(bool enable)
 {

-    if ( m_enabled == enable )
-        return false;
-

     m_enabled = enable;
 
     return true;
     m_enabled = enable;
 
     return true;


@@ -75,9 +72,6 @@ bool wxToolBarToolBase::Toggle(bool toggle)
 {
     wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
 
 {
     wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
 

-    if ( m_toggled == toggle )
-        return false;
-

     m_toggled = toggle;
 
     return true;
     m_toggled = toggle;
 
     return true;


@@ -86,8 +80,6 @@ bool wxToolBarToolBase::Toggle(bool toggle)
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
     wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
     wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;

-    if ( m_kind == kind )
-        return false;

 
     m_kind = kind;
 
 
     m_kind = kind;
 


@@ -96,9 +88,6 @@ bool wxToolBarToolBase::SetToggle(bool toggle)
 
 bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 {
 
 bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 {

-    if ( m_shortHelpString == help )
-        return false;
-

     m_shortHelpString = help;
 
     return true;
     m_shortHelpString = help;
 
     return true;


@@ -106,9 +95,6 @@ bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 
 bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 {
 
 bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 {

-    if ( m_longHelpString == help )
-        return false;
-

     m_longHelpString = help;
 
     return true;
     m_longHelpString = help;
 
     return true;