Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

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

diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index bb22e7e88c50ad152a98506968a9db105a482def..be461cc639ccd1a361631d4217c14e32c4520f4e 100644 (file)
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -206,6 +206,7 @@ void wxArrayString::Shrink()
         pNew[j] = m_pItems[j];
     delete [] m_pItems;
     m_pItems = pNew;
+    m_nSize = m_nCount;
   }
 }
 
@@ -344,6 +345,14 @@ wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
     }
 }
 
+void wxArrayString::resize(size_type n, value_type v)
+{
+  if ( n < m_nCount )
+      m_nCount = n;
+  else if ( n > m_nCount )
+      Add(v, n - m_nCount);
+}
+
 // expand the array
 void wxArrayString::SetCount(size_t count)
 {
@@ -378,13 +387,6 @@ void wxArrayString::Remove(const wxString& sz)
   RemoveAt(iIndex);
 }
 
-void wxArrayString::assign(const_iterator first, const_iterator last)
-{
-    reserve(last - first);
-    for(; first != last; ++first)
-        push_back(*first);
-}
-
 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------