]> git.saurik.com Git - wxWidgets.git/commitdiff
wxArrayStringProperty::m_delimiter default value was missing. Also cleaned up relevan...
authorJaakko Salli <jaakko.salli@dnainternet.net>
Tue, 13 Jul 2010 15:54:45 +0000 (15:54 +0000)
committerJaakko Salli <jaakko.salli@dnainternet.net>
Tue, 13 Jul 2010 15:54:45 +0000 (15:54 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/propgrid/props.cpp

index c1590d9e309a41dc1d8d11a88ffb4124bb16f8a8..ae059f0e6933b271a0314117c9a4550a792dda66 100644 (file)
@@ -2388,6 +2388,7 @@ wxArrayStringProperty::wxArrayStringProperty( const wxString& label,
                                                         const wxArrayString& array )
     : wxPGProperty(label,name)
 {
                                                         const wxArrayString& array )
     : wxPGProperty(label,name)
 {
+    m_delimiter = '"';
     SetValue( array );
 }
 
     SetValue( array );
 }
 
@@ -2455,9 +2456,8 @@ wxArrayStringProperty::ArrayStringToString( wxString& dst,
 
     if ( flags & Escape )
     {
 
     if ( flags & Escape )
     {
-        preas[0] = delimiter;
-        pdr = wxS("\\");
-        pdr += delimiter;
+        preas = delimiter;
+        pdr = wxS("\\") + static_cast<wchar_t>(delimiter);
     }
 
     if ( itemCount )
     }
 
     if ( itemCount )