Reverted last change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user