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

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).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2011-01-19 09:33:17 +00:00
parent f8816e49e4
commit 039aec5345
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/propgrid/props.cpp
View File

@@ -95,7 +95,9 @@ wxString wxStringProperty::ValueToString( wxVariant& value,
if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) ) if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) )
{ {
// Value stored in m_value is non-editable, non-full 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 // Calling this under incorrect conditions will fail
wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT, wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,