X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6353fe8f6422d4cab7ae902f742d952659fd636..8a2e3f80f67b0716b3d1854418b187943dcff11a:/src/propgrid/property.cpp

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 1a83548a1b..1663eda6f9 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -972,6 +972,11 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
     for ( ;; )
     {
+        // How many units we iterate string forward at the end of loop?
+        // We need to keep track of this or risk going to negative
+        // with it-- operation.
+        unsigned int strPosIncrement = 1;
+
         if ( tokenStart != 0xFFFFFF )
         {
             // Token is running
@@ -985,11 +990,12 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                 {
                     const wxPGProperty* child = Item(curChild);
                     wxVariant variant(child->GetValue());
-                    variant.SetName(child->GetBaseName());
+                    wxString childName = child->GetBaseName();
 
                 #ifdef __WXDEBUG__
                     if ( debug_print )
-                        wxLogDebug(wxT("token = '%s', child = %s"),token.c_str(),child->GetLabel().c_str());
+                        wxLogDebug(wxT("token = '%s', child = %s"),
+                                   token.c_str(), childName.c_str());
                 #endif
 
                     // Add only if editable or setting programmatically
@@ -998,8 +1004,18 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     {
                         if ( len > 0 )
                         {
-                            if ( child->StringToValue(variant, token, propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
+                            if ( child->StringToValue(variant, token,
+                                 propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
                             {
+                                // We really need to set the variant's name
+                                // *after* child->StringToValue() has been
+                                // called, since variant's value may be set by
+                                // assigning another variant into it, which
+                                // then usually causes name to be copied (ie.
+                                // usually cleared) as well. wxBoolProperty
+                                // being case in point with its use of
+                                // wxPGVariant_Bool macro as an optimization.
+                                variant.SetName(childName);
                                 list.Append(variant);
 
                                 changed = true;
@@ -1009,6 +1025,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                         {
                             // Empty, becomes unspecified
                             variant.MakeNull();
+                            variant.SetName(childName);
                             list.Append(variant);
                             changed = true;
                         }
@@ -1065,23 +1082,23 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
                          !child->HasFlag(wxPG_PROP_DISABLED|wxPG_PROP_READONLY) )
                     {
-                        bool stvRes = child->StringToValue( variant, token, propagatedFlags );
+                        wxString childName = child->GetBaseName();
+
+                        bool stvRes = child->StringToValue( variant, token,
+                                                            propagatedFlags );
                         if ( stvRes || (variant != oldChildValue) )
                         {
-                            if ( stvRes )
-                                changed = true;
+                            variant.SetName(childName);
+                            list.Append(variant);
+
+                            changed = true;
                         }
                         else
                         {
-                            // Failed, becomes unspecified
-                            variant.MakeNull();
-                            changed = true;
+                            // No changes...
                         }
                     }
 
-                    variant.SetName(child->GetBaseName());
-                    list.Append(variant);
-
                     curChild++;
                     if ( curChild >= iMax )
                         break;
@@ -1095,10 +1112,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     tokenStart = pos;
 
                     if ( a == delimeter )
-                    {
-                        pos--;
-                        --it;
-                    }
+                        strPosIncrement -= 1;
                 }
             }
         }
@@ -1106,7 +1120,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
         if ( a == 0 )
             break;
 
-        ++it;
+        it += strPosIncrement;
+
         if ( it != text.end() )
         {
             a = *it;
@@ -1115,7 +1130,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
         {
             a = 0;
         }
-        pos++;
+
+        pos += strPosIncrement;
     }
 
     if ( changed )