]> git.saurik.com Git - wxWidgets.git/commitdiff
It was not possible to set value of unspecified child by editing parent's composite...
authorJaakko Salli <jaakko.salli@dnainternet.net>
Sat, 1 Nov 2008 17:09:34 +0000 (17:09 +0000)
committerJaakko Salli <jaakko.salli@dnainternet.net>
Sat, 1 Nov 2008 17:09:34 +0000 (17:09 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/propgrid/property.cpp

index 328084687586732832936a0c784d045ae464c334..f443df08c8e092336a65ce2fc0f9fe92acd299cc 100644 (file)
@@ -1010,18 +1010,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     {
                         if ( len > 0 )
                         {
-                            bool wasUnspecified = child->IsValueUnspecified();
-
                             if ( child->StringToValue(variant, token, propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
                             {
-                                // Clear unspecified flag only if OnSetValue() didn't
-                                // affect it.
-                                if ( child->IsValueUnspecified() &&
-                                     (wasUnspecified || !UsesAutoUnspecified()) )
-                                {
-                                    variant = child->GetDefaultValue();
-                                }
-
                                 list.Append(variant);
 
                                 changed = true;