From: Jaakko Salli Date: Tue, 3 Mar 2009 21:04:08 +0000 (+0000) Subject: Remove wxEnumProperty::ms_prevIndex X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ed9e243d58be1b9263f8851d6aec5e8406e34dd4 Remove wxEnumProperty::ms_prevIndex git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 5517f8acd9..ae426977ed 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -449,7 +449,6 @@ private: // Relies on ValidateValue being called always before OnSetValue static int ms_nextIndex; - static int ms_prevIndex; }; // ----------------------------------------------------------------------- diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 9014519cee..9726f49682 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -963,7 +963,6 @@ wxEnumProperty::~wxEnumProperty () } int wxEnumProperty::ms_nextIndex = -2; -int wxEnumProperty::ms_prevIndex = -1; void wxEnumProperty::OnSetValue() { @@ -1118,13 +1117,11 @@ void wxEnumProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) ) { // Revert index - m_index = ms_prevIndex; ResetNextIndex(); } void wxEnumProperty::SetIndex( int index ) { - ms_prevIndex = m_index; ms_nextIndex = -2; m_index = index; }