applied the bit's of #473508 that were still relevant, and fixed a couple of

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index c7ce4c3d1cc9e2b6f3a0d49305fa7830081e81b2..680cc70c2bb076599db9bfc6575f3a6123d9b9b2 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1632,7 +1632,7 @@ void wxString::resize(size_t nSize, wxChar ch)
     }
     else if ( nSize > len )
     {
     }
     else if ( nSize > len )
     {

-        *this += wxString(ch, len - nSize);
+        *this += wxString(ch, nSize - len);

     }
     //else: we have exactly the specified length, nothing to do
 }
     }
     //else: we have exactly the specified length, nothing to do
 }


@@ -2156,6 +2156,16 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex)
   m_nCount++;
 }
 
   m_nCount++;
 }
 

+// expand the array
+void wxArrayString::SetCount(size_t count)
+{
+    Alloc(count);
+
+    wxString s;
+    while ( m_nCount < count )
+        m_pItems[m_nCount++] = (wxChar *)s.c_str();
+}
+

 // removes item from array (by index)
 void wxArrayString::Remove(size_t nIndex)
 {
 // removes item from array (by index)
 void wxArrayString::Remove(size_t nIndex)
 {