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

In wxPGProperty::StringToValue(), variant.SetName() really has to be called after child->StringToValue() has been called

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-01-04 18:39:23 +00:00
parent 80f711024a
commit ae82388e3c
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/propgrid/property.cpp
View File

@@ -985,11 +985,12 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
{ {
const wxPGProperty* child = Item(curChild); const wxPGProperty* child = Item(curChild);
wxVariant variant(child->GetValue()); wxVariant variant(child->GetValue());
variant.SetName(child->GetBaseName()); wxString childName = child->GetBaseName();
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
if ( debug_print ) 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 #endif
// Add only if editable or setting programmatically // Add only if editable or setting programmatically
@@ -998,8 +999,18 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
{ {
if ( len > 0 ) 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); list.Append(variant);
changed = true; changed = true;
@@ -1009,6 +1020,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
{ {
// Empty, becomes unspecified // Empty, becomes unspecified
variant.MakeNull(); variant.MakeNull();
variant.SetName(childName);
list.Append(variant); list.Append(variant);
changed = true; changed = true;
} }