renamed errcode to fix compilation with VC++ 8 (replaces patch 982303)

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 2401cc6388d6891f524694fd31a3742985d6d4eb..ffddc7611e070cc014c8bbb923fe4d5033dfb0fb 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -2221,6 +2221,30 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
   m_nCount += nInsert;
 }
 
+// range insert (STL 23.2.4.3)
+void
+wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
+{
+    const int idx = it - begin();
+
+    // grow it once
+    Grow(last - first);
+
+    // reset "it" since it can change inside Grow()
+    it = begin() + idx;
+
+    while ( first != last )
+    {
+        it = insert(it, *first);
+
+        // insert returns an iterator to the last element inserted but we need
+        // insert the next after this one, that is before the next one
+        ++it;
+
+        ++first;
+    }
+} 
+
 // expand the array
 void wxArrayString::SetCount(size_t count)
 {