Fix wxEnumProperty unspecified value by taking it into account in GetIndex()

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

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 336c55fdc5b31d5e51f67ebc46880a8acb9faf5a..805be5a0226a91bcdd5c6f9b5a0dc57928431794 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1054,7 +1054,7 @@ bool wxEnumProperty::ValueFromString_( wxVariant& value, const wxString& text, i
         setAsNextIndex = -1;
         value = text;
     }
         setAsNextIndex = -1;
         value = text;
     }

-    else if ( m_index != useIndex )
+    else if ( useIndex != GetIndex() )

     {
         if ( useIndex != -1 )
         {
     {
         if ( useIndex != -1 )
         {


@@ -1095,7 +1095,7 @@ bool wxEnumProperty::ValueFromInt_( wxVariant& variant, int intVal, int argFlags
     }
     else
     {
     }
     else
     {

-        if ( m_index != intVal )
+        if ( intVal != GetIndex() )

         {
             ms_nextIndex = intVal;
         }
         {
             ms_nextIndex = intVal;
         }


@@ -1131,8 +1131,12 @@ void wxEnumProperty::SetIndex( int index )
 
 int wxEnumProperty::GetIndex() const
 {
 
 int wxEnumProperty::GetIndex() const
 {

+    if ( m_value.IsNull() )
+        return -1;
+

     if ( ms_nextIndex != -2 )
         return ms_nextIndex;
     if ( ms_nextIndex != -2 )
         return ms_nextIndex;

+

     return m_index;
 }
 
     return m_index;
 }