Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It was not possible to set value of unspecified child by editing parent's composite string (fixes wxPG sf bug #2186553)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-11-01 17:09:34 +00:00
parent b0f0eda8ce
commit 40bfc77055
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/propgrid/property.cpp
View File

@@ -1010,18 +1010,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
{ {
if ( len > 0 ) if ( len > 0 )
{ {
bool wasUnspecified = child->IsValueUnspecified();
if ( child->StringToValue(variant, token, propagatedFlags|wxPG_COMPOSITE_FRAGMENT) ) 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); list.Append(variant);
changed = true; changed = true;