Remove wxEnumProperty::ms_prevIndex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -449,7 +449,6 @@ private:
|
|||||||
|
|
||||||
// Relies on ValidateValue being called always before OnSetValue
|
// Relies on ValidateValue being called always before OnSetValue
|
||||||
static int ms_nextIndex;
|
static int ms_nextIndex;
|
||||||
static int ms_prevIndex;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
|
@@ -963,7 +963,6 @@ wxEnumProperty::~wxEnumProperty ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
int wxEnumProperty::ms_nextIndex = -2;
|
int wxEnumProperty::ms_nextIndex = -2;
|
||||||
int wxEnumProperty::ms_prevIndex = -1;
|
|
||||||
|
|
||||||
void wxEnumProperty::OnSetValue()
|
void wxEnumProperty::OnSetValue()
|
||||||
{
|
{
|
||||||
@@ -1118,13 +1117,11 @@ void
|
|||||||
wxEnumProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
|
wxEnumProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
|
||||||
{
|
{
|
||||||
// Revert index
|
// Revert index
|
||||||
m_index = ms_prevIndex;
|
|
||||||
ResetNextIndex();
|
ResetNextIndex();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxEnumProperty::SetIndex( int index )
|
void wxEnumProperty::SetIndex( int index )
|
||||||
{
|
{
|
||||||
ms_prevIndex = m_index;
|
|
||||||
ms_nextIndex = -2;
|
ms_nextIndex = -2;
|
||||||
m_index = index;
|
m_index = index;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user