From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 2 Jul 2009 09:08:50 +0000 (+0000)
Subject: ignore bCase parameter of wxSortedArrayString::Index() in STL build just as we do... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dc9934d489389f853d6866a637aeedf47074b0b6

ignore bCase parameter of wxSortedArrayString::Index() in STL build just as we do in non-STL one (it didn't work correctly anyhow)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 52e2e8ca1d..752effe3c2 100644
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -475,31 +475,19 @@ void wxArrayString::Sort(bool reverseOrder)
     }
 }
 
-int wxSortedArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
+int wxSortedArrayString::Index(const wxString& str,
+                               bool WXUNUSED_UNLESS_DEBUG(bCase),
+                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
 {
-    wxSortedArrayString::const_iterator it;
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  "search parameters ignored for sorted array" );
 
-    if (bCase)
-        it = std::lower_bound(begin(), end(), str,
-                              wxStringCompare(wxStringCmp()));
-    else
-        it = std::lower_bound(begin(), end(), str,
-                              wxStringCompare(wxStringCmpNoCase()));
+    wxSortedArrayString::const_iterator
+        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
 
-    if (it == end())
+    if ( it == end() || str.Cmp(*it) != 0 )
         return wxNOT_FOUND;
 
-    if (bCase)
-    {
-        if (str.Cmp(*it) != 0)
-            return wxNOT_FOUND;
-    }
-    else
-    {
-        if (str.CmpNoCase(*it) != 0)
-            return wxNOT_FOUND;
-    }
-
     return it - begin();
 }