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
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user