In composed string values, entry for last children was often omitted if it was empty...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index f443df08c8e092336a65ce2fc0f9fe92acd299cc..3ca05b7db987c2898913df28286ca89a8308ed1a 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -856,13 +856,13 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
         }
     }
 
         }
     }
 

-    // Remove superfluous semicolon and space
-    wxString rest;
-    if ( text.EndsWith(wxS("; "), &rest) )
-        text = rest;
-

     if ( (unsigned int)i < m_children.size() )
     if ( (unsigned int)i < m_children.size() )

-        text += wxS("; ...");
+    {
+        if ( !text.EndsWith(wxS("; ")) )
+            text += wxS("; ...");
+        else
+            text += wxS("...");
+    }

 }
 
 wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),
 }
 
 wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),