From 039aec5345396f28083b5e2bdc2d45dbffab6f61 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Wed, 19 Jan 2011 09:33:17 +0000 Subject: [PATCH] In wxStringProperty::ValueToString(), regenerate composed value string also when it was empty. This is needed in cases where property's children were added before property itself was added to the wxPropertyGrid (fixes #12877). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/props.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index e399674bd5..c6e5d13527 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -95,7 +95,9 @@ wxString wxStringProperty::ValueToString( wxVariant& value, if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) ) { // Value stored in m_value is non-editable, non-full value - if ( (argFlags & wxPG_FULL_VALUE) || (argFlags & wxPG_EDITABLE_VALUE) ) + if ( (argFlags & wxPG_FULL_VALUE) || + (argFlags & wxPG_EDITABLE_VALUE) || + !s.length() ) { // Calling this under incorrect conditions will fail wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT, -- 2.47.2