From 40bfc770552db48cd445179ff497b1c415ae4f62 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Sat, 1 Nov 2008 17:09:34 +0000 Subject: [PATCH] It was not possible to set value of unspecified child by editing parent's composite string (fixes wxPG sf bug #2186553) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/property.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index 3280846875..f443df08c8 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -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; -- 2.45.2