]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/dynarray.cpp
Fix horizontal mouse wheel scrolling in wxGTK.
[wxWidgets.git] / src / common / dynarray.cpp
index a081998ac9a4186b476fd4bb9b6cdfe5ec376907..be01a4b840e53cc612443b8e6f96f4efc9d41b18 100644 (file)
@@ -1,37 +1,38 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dynarray.cpp
+// Name:        src/common/dynarray.cpp
 // Purpose:     implementation of wxBaseArray class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.97
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 
-#ifdef __GNUG__
-#pragma implementation "dynarray.h"
-#endif
-
+// For compilers that support precompilation, includes "wx.h".
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/dynarray.h"
-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+#endif //WX_PRECOMP
 
 #include <stdlib.h>
 #include <string.h> // for memmove
 
-#ifndef max
-  #define max(a, b)   (((a) > (b)) ? (a) : (b))
-#endif
+#if !wxUSE_STD_CONTAINERS
+
+// we cast the value to long from which we cast it to void * in IndexForInsert:
+// this can't work if the pointers are not big enough
+wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *),
+                       wxArraySizeOfPtrLessSizeOfLong ); // < 32 symbols
 
 // ============================================================================
 // constants
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxBaseArray - dynamice array of 'long's
+// wxBaseArray - dynamic array of 'T's
 // ----------------------------------------------------------------------------
 
-// ctor
-wxBaseArray::wxBaseArray()
-{
-  m_nSize  =
-  m_nCount = 0;
-  m_pItems  = (long *) NULL;
+#define _WX_DEFINE_BASEARRAY(T, name)                                       \
+/* searches the array for an item (forward or backwards) */                 \
+int name::Index(T lItem, bool bFromEnd) const                               \
+{                                                                           \
+  if ( bFromEnd ) {                                                         \
+    if ( size() > 0 ) {                                                     \
+      size_t n = size();                                                    \
+      do {                                                                  \
+        if ( (*this)[--n] == lItem )                                        \
+          return n;                                                         \
+      }                                                                     \
+      while ( n != 0 );                                                     \
+    }                                                                       \
+  }                                                                         \
+  else {                                                                    \
+    for( size_t n = 0; n < size(); n++ ) {                                  \
+      if( (*this)[n] == lItem )                                             \
+        return n;                                                           \
+    }                                                                       \
+  }                                                                         \
+                                                                            \
+  return wxNOT_FOUND;                                                       \
+}                                                                           \
+                                                                            \
+/* add item assuming the array is sorted with fnCompare function */         \
+size_t name::Add(T lItem, CMPFUNC fnCompare)                                \
+{                                                                           \
+  size_t idx = IndexForInsert(lItem, fnCompare);                            \
+  Insert(lItem, idx);                                                       \
+  return idx;                                                               \
+}                                                                           \
+                                                                            \
+/* ctor */                                                                  \
+name::name()                                                                \
+{                                                                           \
+  m_nSize  =                                                                \
+  m_nCount = 0;                                                             \
+  m_pItems = NULL;                                                     \
+}                                                                           \
+                                                                            \
+/* copy ctor */                                                             \
+name::name(const name& src)                                                 \
+{                                                                           \
+  m_nSize  = /* not src.m_nSize to save memory */                           \
+  m_nCount = src.m_nCount;                                                  \
+                                                                            \
+  if ( m_nSize != 0 ) {                                                     \
+      m_pItems = new T[m_nSize];                                            \
+      /* only copy if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
+      }                                                                     \
+      else {                                                                \
+          m_nSize = 0;                                                      \
+      }                                                                     \
+  }                                                                         \
+  else                                                                      \
+    m_pItems = NULL;                                                  \
+}                                                                           \
+                                                                            \
+/* assignment operator */                                                   \
+name& name::operator=(const name& src)                                      \
+{                                                                           \
+  wxDELETEA(m_pItems);                                                      \
+                                                                            \
+  m_nSize  = /* not src.m_nSize to save memory */                           \
+  m_nCount = src.m_nCount;                                                  \
+                                                                            \
+  if ( m_nSize != 0 ){                                                      \
+      m_pItems = new T[m_nSize];                                            \
+      /* only copy if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
+      }                                                                     \
+      else {                                                                \
+          m_nSize = 0;                                                      \
+      }                                                                     \
+  }                                                                         \
+  else                                                                      \
+    m_pItems = NULL;                                                  \
+                                                                            \
+  return *this;                                                             \
+}                                                                           \
+                                                                            \
+/* allocate new buffer of the given size and move our data to it */         \
+bool name::Realloc(size_t nSize)                                            \
+{                                                                           \
+  T *pNew = new T[nSize];                                                   \
+  /* only grow if allocation succeeded */                                   \
+  if ( !pNew )                                                              \
+      return false;                                                         \
+                                                                            \
+  m_nSize = nSize;                                                          \
+  /* copy data to new location */                                           \
+  memcpy(pNew, m_pItems, m_nCount*sizeof(T));                               \
+  delete [] m_pItems;                                                       \
+  m_pItems = pNew;                                                          \
+                                                                            \
+  return true;                                                              \
+}                                                                           \
+                                                                            \
+/* grow the array */                                                        \
+void name::Grow(size_t nIncrement)                                          \
+{                                                                           \
+  /* only do it if no more place */                                         \
+  if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) {      \
+    if( m_nSize == 0 ) {                                                    \
+      /* was empty, determine initial size */                               \
+      size_t sz = WX_ARRAY_DEFAULT_INITIAL_SIZE;                            \
+      if (sz < nIncrement) sz = nIncrement;                                 \
+      /* allocate some memory */                                            \
+      m_pItems = new T[sz];                                                 \
+      /* only grow if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          m_nSize = sz;                                                     \
+      }                                                                     \
+    }                                                                       \
+    else                                                                    \
+    {                                                                       \
+      /* add at least 50% but not too much */                               \
+      size_t ndefIncrement = m_nSize < WX_ARRAY_DEFAULT_INITIAL_SIZE        \
+                            ? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; \
+      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )                        \
+        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;                            \
+      if ( nIncrement < ndefIncrement )                                     \
+        nIncrement = ndefIncrement;                                         \
+      Realloc(m_nSize + nIncrement);                                        \
+    }                                                                       \
+  }                                                                         \
+}                                                                           \
+                                                                            \
+/* make sure that the array has at least count elements */                  \
+void name::SetCount(size_t count, T defval)                                 \
+{                                                                           \
+    if ( m_nSize < count )                                                  \
+    {                                                                       \
+        /* need to realloc memory: don't overallocate it here as if */      \
+        /* SetCount() is called, it probably means that the caller  */      \
+        /* knows in advance how many elements there will be in the  */      \
+        /* array and so it won't be necessary to realloc it later   */      \
+        if ( !Realloc(count) )                                              \
+        {                                                                   \
+            /* out of memory -- what can we do? */                          \
+            return;                                                         \
+        }                                                                   \
+    }                                                                       \
+                                                                            \
+    /* add new elements if we extend the array */                           \
+    while ( m_nCount < count )                                              \
+    {                                                                       \
+        m_pItems[m_nCount++] = defval;                                      \
+    }                                                                       \
+}                                                                           \
+                                                                            \
+/* dtor */                                                                  \
+name::~name()                                                               \
+{                                                                           \
+  wxDELETEA(m_pItems);                                                      \
+}                                                                           \
+                                                                            \
+/* clears the list */                                                       \
+void name::Clear()                                                          \
+{                                                                           \
+  m_nSize  =                                                                \
+  m_nCount = 0;                                                             \
+                                                                            \
+  wxDELETEA(m_pItems);                                                      \
+}                                                                           \
+                                                                            \
+/* minimizes the memory usage by freeing unused memory */                   \
+void name::Shrink()                                                         \
+{                                                                           \
+  /* only do it if we have some memory to free */                           \
+  if( m_nCount < m_nSize ) {                                                \
+    /* allocates exactly as much memory as we need */                       \
+    T *pNew = new T[m_nCount];                                              \
+    /* only shrink if allocation succeeded */                               \
+    if ( pNew ) {                                                           \
+        /* copy data to new location */                                     \
+        memcpy(pNew, m_pItems, m_nCount*sizeof(T));                         \
+        delete [] m_pItems;                                                 \
+        m_pItems = pNew;                                                    \
+                                                                            \
+        /* update the size of the new block */                              \
+        m_nSize = m_nCount;                                                 \
+    }                                                                       \
+    /* else: don't do anything, better keep old memory block! */            \
+  }                                                                         \
+}                                                                           \
+                                                                            \
+/* add item at the end */                                                   \
+void name::Add(T lItem, size_t nInsert)                                     \
+{                                                                           \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+  for (size_t i = 0; i < nInsert; i++)                                      \
+      m_pItems[m_nCount++] = lItem;                                         \
+}                                                                           \
+                                                                            \
+/* add item at the given position */                                        \
+void name::Insert(T lItem, size_t nIndex, size_t nInsert)                   \
+{                                                                           \
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );   \
+  wxCHECK_RET( m_nCount <= m_nCount + nInsert,                              \
+               wxT("array size overflow in wxArray::Insert") );             \
+                                                                            \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+                                                                            \
+  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
+          (m_nCount - nIndex)*sizeof(T));                                   \
+  for (size_t i = 0; i < nInsert; i++)                                      \
+      m_pItems[nIndex + i] = lItem;                                         \
+  m_nCount += nInsert;                                                      \
+}                                                                           \
+                                                                            \
+/* search for a place to insert item into sorted array (binary search) */   \
+size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const               \
+{                                                                           \
+  size_t i,                                                                 \
+       lo = 0,                                                              \
+       hi = m_nCount;                                                       \
+  int res;                                                                  \
+                                                                            \
+  while ( lo < hi ) {                                                       \
+    i = (lo + hi)/2;                                                        \
+                                                                            \
+    res = (*fnCompare)((const void *)(wxUIntPtr)lItem,                      \
+                       (const void *)(wxUIntPtr)(m_pItems[i]));             \
+    if ( res < 0 )                                                          \
+      hi = i;                                                               \
+    else if ( res > 0 )                                                     \
+      lo = i + 1;                                                           \
+    else {                                                                  \
+      lo = i;                                                               \
+      break;                                                                \
+    }                                                                       \
+  }                                                                         \
+                                                                            \
+  return lo;                                                                \
+}                                                                           \
+                                                                            \
+/* search for an item in a sorted array (binary search) */                  \
+int name::Index(T lItem, CMPFUNC fnCompare) const                           \
+{                                                                           \
+    size_t n = IndexForInsert(lItem, fnCompare);                            \
+                                                                            \
+    return (n >= m_nCount ||                                                \
+           (*fnCompare)((const void *)(wxUIntPtr)lItem,                     \
+                        ((const void *)(wxUIntPtr)m_pItems[n])))            \
+                        ? wxNOT_FOUND                                       \
+                        : (int)n;                                           \
+}                                                                           \
+                                                                            \
+/* removes item from array (by index) */                                    \
+void name::RemoveAt(size_t nIndex, size_t nRemove)                          \
+{                                                                           \
+  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArray::RemoveAt") );  \
+  wxCHECK_RET( nIndex + nRemove <= m_nCount,                                \
+               wxT("removing too many elements in wxArray::RemoveAt") );    \
+                                                                            \
+  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],                   \
+          (m_nCount - nIndex - nRemove)*sizeof(T));                         \
+  m_nCount -= nRemove;                                                      \
+}                                                                           \
+                                                                            \
+/* removes item from array (by value) */                                    \
+void name::Remove(T lItem)                                                  \
+{                                                                           \
+  int iIndex = Index(lItem);                                                \
+                                                                            \
+  wxCHECK_RET( iIndex != wxNOT_FOUND,                                       \
+               wxT("removing inexistent item in wxArray::Remove") );        \
+                                                                            \
+  RemoveAt((size_t)iIndex);                                                 \
+}                                                                           \
+                                                                            \
+/* sort array elements using passed comparaison function */                 \
+void name::Sort(CMPFUNC fCmp)                                               \
+{                                                                           \
+  qsort(m_pItems, m_nCount, sizeof(T), fCmp);                               \
+}                                                                           \
+                                                                            \
+void name::assign(const_iterator first, const_iterator last)                \
+{                                                                           \
+  clear();                                                                  \
+  reserve(last - first);                                                    \
+  for(; first != last; ++first)                                             \
+    push_back(*first);                                                      \
+}                                                                           \
+                                                                            \
+void name::assign(size_type n, const_reference v)                           \
+{                                                                           \
+  clear();                                                                  \
+  reserve(n);                                                               \
+  for( size_type i = 0; i < n; ++i )                                        \
+    push_back(v);                                                           \
+}                                                                           \
+                                                                            \
+void name::insert(iterator it, const_iterator first, const_iterator last)   \
+{                                                                           \
+  size_t nInsert = last - first, nIndex = it - begin();                     \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+                                                                            \
+  /* old iterator could have been invalidated by Grow(). */                 \
+  it = begin() + nIndex;                                                    \
+                                                                            \
+  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
+          (m_nCount - nIndex)*sizeof(T));                                   \
+  for (size_t i = 0; i < nInsert; ++i, ++it, ++first)                       \
+      *it = *first;                                                         \
+  m_nCount += nInsert;                                                      \
 }
 
-// copy ctor
-wxBaseArray::wxBaseArray(const wxBaseArray& src)
-{
-  m_nSize  = // not src.m_nSize to save memory
-  m_nCount = src.m_nCount;
-
-  if ( m_nSize != 0 ) {
-    m_pItems = new long[m_nSize];
-    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(long));
-  }
-  else
-    m_pItems = (long *) NULL;
-}
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+    #pragma warning(disable: 1572)
+#endif
 
-// assignment operator
-wxBaseArray& wxBaseArray::operator=(const wxBaseArray& src)
-{
-  wxDELETEA(m_pItems);
+_WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
+_WX_DEFINE_BASEARRAY(char,         wxBaseArrayChar)
+_WX_DEFINE_BASEARRAY(short,        wxBaseArrayShort)
+_WX_DEFINE_BASEARRAY(int,          wxBaseArrayInt)
+_WX_DEFINE_BASEARRAY(long,         wxBaseArrayLong)
+_WX_DEFINE_BASEARRAY(size_t,       wxBaseArraySizeT)
+_WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
 
-  m_nSize  = // not src.m_nSize to save memory
-  m_nCount = src.m_nCount;
+#else // wxUSE_STD_CONTAINERS
 
-  if ( m_nSize != 0 ) {
-    m_pItems = new long[m_nSize];
-    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(long));
-  }
-  else
-    m_pItems = (long *) NULL;
+#include "wx/arrstr.h"
 
-  return *this;
-}
+#include "wx/beforestd.h"
+#include <functional>
+#include "wx/afterstd.h"
 
-// grow the array
-void wxBaseArray::Grow()
+// some compilers (Sun CC being the only known example) distinguish between
+// extern "C" functions and the functions with C++ linkage and ptr_fun and
+// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
+// this case, we need the wrappers below to make this work
+struct wxStringCmp
 {
-  // only do it if no more place
-  if( m_nCount == m_nSize ) {
-    if( m_nSize == 0 ) {
-      // was empty, alloc some memory
-      m_nSize = WX_ARRAY_DEFAULT_INITIAL_SIZE;
-      m_pItems = new long[m_nSize];
-    }
-    else
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
+
+    int operator()(const wxString& s1, const wxString& s2) const
     {
-      // add 50% but not too much
-      size_t nIncrement = m_nSize < WX_ARRAY_DEFAULT_INITIAL_SIZE 
-                         ? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1;
-      if ( nIncrement > ARRAY_MAXSIZE_INCREMENT )
-        nIncrement = ARRAY_MAXSIZE_INCREMENT;
-      m_nSize += nIncrement;
-      long *pNew = new long[m_nSize];
-
-      // copy data to new location
-      memcpy(pNew, m_pItems, m_nCount*sizeof(long));
-      delete [] m_pItems;
-      m_pItems = pNew;
+        return s1.compare(s2);
     }
-  }
-}
-
-// dtor
-wxBaseArray::~wxBaseArray()
-{
-  wxDELETEA(m_pItems);
-}
+};
 
-// clears the list
-void wxBaseArray::Clear()
+struct wxStringCmpNoCase
 {
-  m_nSize  =
-  m_nCount = 0;
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
 
-  wxDELETEA(m_pItems);
-}
+    int operator()(const wxString& s1, const wxString& s2) const
+    {
+        return s1.CmpNoCase(s2);
+    }
+};
 
-// pre-allocates memory (frees the previous data!)
-void wxBaseArray::Alloc(size_t nSize)
+int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
 {
-  // only if old buffer was not big enough
-  if ( nSize > m_nSize ) {
-    wxDELETEA(m_pItems);
-    m_pItems = new long[nSize];
-    m_nSize  = nSize;
-  }
-
-  m_nCount = 0;
-}
+    wxArrayString::const_iterator it;
 
-// minimizes the memory usage by freeing unused memory
-void wxBaseArray::Shrink()
-{
-  // only do it if we have some memory to free
-  if( m_nCount < m_nSize ) {
-    // allocates exactly as much memory as we need
-    long *pNew = new long[m_nCount];
-
-    // copy data to new location
-    memcpy(pNew, m_pItems, m_nCount*sizeof(long));
-    delete [] m_pItems;
-    m_pItems = pNew;
-  }
-}
-
-// searches the array for an item (forward or backwards)
-int wxBaseArray::Index(long lItem, bool bFromEnd) const
-{
-  if ( bFromEnd ) {
-    if ( m_nCount > 0 ) {
-      size_t n = m_nCount;
-      do {
-        if ( m_pItems[--n] == lItem )
-          return n;
-      }
-      while ( n != 0 );
-    }
-  }
-  else {
-    for( size_t n = 0; n < m_nCount; n++ ) {
-      if( m_pItems[n] == lItem )
-        return n;
+    if (bCase)
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmp(), str)));
     }
-  }
-
-  return wxNOT_FOUND;
-}
-
-// search for a place to insert an item into a sorted array (binary search)
-size_t wxBaseArray::IndexForInsert(long lItem, CMPFUNC fnCompare) const
-{
-  size_t i,
-       lo = 0,
-       hi = m_nCount;
-  int res;
-
-  while ( lo < hi ) {
-    i = (lo + hi)/2;
-
-    res = (*fnCompare)((const void *)lItem, (const void *)m_pItems[i]);
-    if ( res < 0 )
-      hi = i;
-    else if ( res > 0 )
-      lo = i + 1;
-    else {
-      lo = i;
-      break;
+    else // !bCase
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmpNoCase(), str)));
     }
-  }
 
-  return lo;
+    return it == end() ? wxNOT_FOUND : it - begin();
 }
 
-// search for an item in a sorted array (binary search)
-int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const
+template<class F>
+class wxStringCompareLess
 {
-    size_t n = IndexForInsert(lItem, fnCompare);
-
-    return n < m_nCount && m_pItems[n] == lItem ? n : wxNOT_FOUND;
-}
-
-// add item at the end
-void wxBaseArray::Add(long lItem)
+public:
+    wxStringCompareLess(F f) : m_f(f) { }
+    bool operator()(const wxString& s1, const wxString& s2)
+        { return m_f(s1, s2) < 0; }
+private:
+    F m_f;
+};
+
+template<class F>
+wxStringCompareLess<F> wxStringCompare(F f)
 {
-  Grow();
-  m_pItems[m_nCount++] = lItem;
+    return wxStringCompareLess<F>(f);
 }
 
-// add item assuming the array is sorted with fnCompare function
-void wxBaseArray::Add(long lItem, CMPFUNC fnCompare)
+void wxArrayString::Sort(CompareFunction function)
 {
-  Insert(lItem, IndexForInsert(lItem, fnCompare));
+    std::sort(begin(), end(), wxStringCompare(function));
 }
 
-// add item at the given position
-void wxBaseArray::Insert(long lItem, size_t nIndex)
+void wxArrayString::Sort(bool reverseOrder)
 {
-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );
-
-  Grow();
-
-  memmove(&m_pItems[nIndex + 1], &m_pItems[nIndex],
-          (m_nCount - nIndex)*sizeof(long));
-  m_pItems[nIndex] = lItem;
-  m_nCount++;
+    if (reverseOrder)
+    {
+        std::sort(begin(), end(), std::greater<wxString>());
+    }
+    else
+    {
+        std::sort(begin(), end());
+    }
 }
 
-// removes item from array (by index)
-void wxBaseArray::RemoveAt(size_t nIndex)
+int wxSortedArrayString::Index(const wxString& str,
+                               bool WXUNUSED_UNLESS_DEBUG(bCase),
+                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
 {
-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::RemoveAt") );
-
-  memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
-          (m_nCount - nIndex - 1)*sizeof(long));
-  m_nCount--;
-}
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  "search parameters ignored for sorted array" );
 
-// removes item from array (by value)
-void wxBaseArray::Remove(long lItem)
-{
-  int iIndex = Index(lItem);
+    wxSortedArrayString::const_iterator
+        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
 
-  wxCHECK_RET( iIndex != wxNOT_FOUND,
-               wxT("removing inexistent item in wxArray::Remove") );
+    if ( it == end() || str.Cmp(*it) != 0 )
+        return wxNOT_FOUND;
 
-  RemoveAt((size_t)iIndex);
+    return it - begin();
 }
 
-// sort array elements using passed comparaison function
-void wxBaseArray::Sort(CMPFUNC fCmp)
-{
-  qsort(m_pItems, m_nCount, sizeof(long), fCmp);
-}
+#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS