diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 8bd155c8ba..da745d66bc 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -64,6 +64,9 @@ WX_DEFINE_LIST(wxToolBarToolsList);
 
 bool wxToolBarToolBase::Enable(bool enable)
 {
+    if ( m_enabled == enable )
+        return FALSE;
+
     m_enabled = enable;
 
     return TRUE;
@@ -73,6 +76,9 @@ bool wxToolBarToolBase::Toggle(bool toggle)
 {
     wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
 
+    if ( m_toggled == toggle )
+        return FALSE;
+
     m_toggled = toggle;
 
     return TRUE;
@@ -81,6 +87,8 @@ bool wxToolBarToolBase::Toggle(bool toggle)
 bool wxToolBarToolBase::SetToggle(bool toggle)
 {
     wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
+    if ( m_kind == kind )
+        return FALSE;
 
     m_kind = kind;
 
@@ -89,6 +97,9 @@ bool wxToolBarToolBase::SetToggle(bool toggle)
 
 bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 {
+    if ( m_shortHelpString == help )
+        return FALSE;
+
     m_shortHelpString = help;
 
     return TRUE;
@@ -96,6 +107,9 @@ bool wxToolBarToolBase::SetShortHelp(const wxString& help)
 
 bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 {
+    if ( m_longHelpString == help )
+        return FALSE;
+
     m_longHelpString = help;
 
     return TRUE;