add GetLo/Hi() test

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

diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index bfc4d889816642a057ab92980c1f7203c9717f0c..fe36a74bf8e5883054ef1500a50f5f16936099a5 100644 (file)
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -21,14 +21,22 @@
 #endif
 
 #include "wx/arrstr.h"
 #endif
 
 #include "wx/arrstr.h"

+#include "wx/thread.h" 

 
 // ============================================================================
 // ArrayString
 // ============================================================================
 
 
 // ============================================================================
 // ArrayString
 // ============================================================================
 

-#include "wx/arrstr.h"
+wxArrayString::wxArrayString(size_t sz, const char** a)
+{
+#if !wxUSE_STL
+    Init(false);
+#endif
+    for (size_t i=0; i < sz; i++)
+        Add(a[i]);
+}

 
 

-wxArrayString::wxArrayString(size_t sz, const wxChar** a)
+wxArrayString::wxArrayString(size_t sz, const wchar_t** a)

 {
 #if !wxUSE_STL
     Init(false);
 {
 #if !wxUSE_STL
     Init(false);


@@ -198,7 +206,7 @@ void wxArrayString::Shrink()
 }
 
 // searches the array for an item (forward or backwards)
 }
 
 // searches the array for an item (forward or backwards)

-int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
+int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const

 {
   if ( m_autoSort ) {
     // use binary search in the sorted array
 {
   if ( m_autoSort ) {
     // use binary search in the sorted array


@@ -212,7 +220,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
     while ( lo < hi ) {
       i = (lo + hi)/2;
 
     while ( lo < hi ) {
       i = (lo + hi)/2;
 

-      res = wxStrcmp(sz, m_pItems[i]);
+      res = str.compare(m_pItems[i]);

       if ( res < 0 )
         hi = i;
       else if ( res > 0 )
       if ( res < 0 )
         hi = i;
       else if ( res > 0 )


@@ -229,7 +237,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
       if ( m_nCount > 0 ) {
         size_t ui = m_nCount;
         do {
       if ( m_nCount > 0 ) {
         size_t ui = m_nCount;
         do {

-          if ( m_pItems[--ui].IsSameAs(sz, bCase) )
+          if ( m_pItems[--ui].IsSameAs(str, bCase) )

             return ui;
         }
         while ( ui != 0 );
             return ui;
         }
         while ( ui != 0 );


@@ -237,7 +245,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
     }
     else {
       for( size_t ui = 0; ui < m_nCount; ui++ ) {
     }
     else {
       for( size_t ui = 0; ui < m_nCount; ui++ ) {

-        if( m_pItems[ui].IsSameAs(sz, bCase) )
+        if( m_pItems[ui].IsSameAs(str, bCase) )

           return ui;
       }
     }
           return ui;
       }
     }


@@ -356,7 +364,7 @@ void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
 }
 
 // removes item from array (by value)
 }
 
 // removes item from array (by value)

-void wxArrayString::Remove(const wxChar *sz)
+void wxArrayString::Remove(const wxString& sz)

 {
   int iIndex = Index(sz);
 
 {
   int iIndex = Index(sz);