From 7036fd206130f7643198732ae9627e95179101ee Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sat, 1 Nov 2008 18:40:29 +0000
Subject: [PATCH] In composed string values, entry for last children was often
 omitted if it was empty (and possibly unspecified, fixes wxPG sf bug
 #2197916)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/propgrid/property.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index f443df08c8..3ca05b7db9 100644
--- 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() )
-        text += wxS("; ...");
+    {
+        if ( !text.EndsWith(wxS("; ")) )
+            text += wxS("; ...");
+        else
+            text += wxS("...");
+    }
 }
 
 wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),
-- 
2.45.2