fixed wxTaskBarIcon compilation

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index c7ce4c3d1cc9e2b6f3a0d49305fa7830081e81b2..7a30eb68ce14201efb33f6e414ad681cabaab041 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
 }


@@ -1698,7 +1698,7 @@ size_t wxString::find(wxChar ch, size_t nStart) const
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
   wxASSERT( str.GetStringData()->IsValid() );
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
   wxASSERT( str.GetStringData()->IsValid() );

-  wxASSERT( nStart <= Len() );
+  wxASSERT( nStart == npos || nStart <= Len() );

 
   // TODO could be made much quicker than that
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
 
   // TODO could be made much quicker than that
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);


@@ -1715,7 +1715,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {

-    return rfind(wxString(sz, n == npos ? 0 : n), nStart);
+    return rfind(wxString(sz, n == npos ? wxSTRING_MAXLEN : n), nStart);

 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const


@@ -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)
 {