Do not incorrectly interprete StringToValue() returning false to mean that it failed

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index fa7702ddbb3ba3ecda82a067ff06697618ee12e0..0936589da7d5d0ac12dc6482215625884fd3fc0f 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -774,22 +774,24 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
                     const wxPGProperty* child = Item(curChild);
 
 
                     const wxPGProperty* child = Item(curChild);
 

-                    wxVariant variant(child->GetValueRef());
-                    if ( child->StringToValue( variant, token, propagatedFlags ) )
+                    wxVariant oldChildValue = child->GetValue();
+                    wxVariant variant(oldChildValue);
+                    bool stvRes = child->StringToValue( variant, token, propagatedFlags );
+                    if ( stvRes || (variant != oldChildValue) )

                     {
                     {

-                        variant.SetName(child->GetBaseName());
-                        list.Append(variant);
-                        changed = true;
+                        if ( stvRes )
+                            changed = true;

                     }
                     else
                     {
                         // Failed, becomes unspecified
                     }
                     else
                     {
                         // Failed, becomes unspecified

-                        wxVariant variant2;
-                        variant2.SetName(child->GetBaseName());
-                        list.Append(variant2);
+                        variant.MakeNull();

                         changed = true;
                     }
 
                         changed = true;
                     }
 

+                    variant.SetName(child->GetBaseName());
+                    list.Append(variant);
+

                     curChild++;
                     if ( curChild >= iMax )
                         break;
                     curChild++;
                     if ( curChild >= iMax )
                         break;