From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 11 Apr 2003 22:05:24 +0000 (+0000)
Subject: fixed bug with searching in sorted arrays
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4365da58c8f11f5c0bee18cc03ff81664c639299?ds=inline

fixed bug with searching in sorted arrays


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

diff --git a/docs/changes.txt b/docs/changes.txt
index 528869d0de..e4125b5563 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -28,6 +28,7 @@ All:
 wxBase:
 
 - added Watcom makefiles
+- fixed bug with searching in sorted arrays (Jürgen Palm)
 
 All GUI ports:
 
diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index b760aa8b24..012c6077a3 100644
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -283,7 +283,10 @@ int name::Index(T lItem, CMPFUNC fnCompare) const                           \
 {                                                                           \
     size_t n = IndexForInsert(lItem, fnCompare);                            \
                                                                             \
-    return n < m_nCount && m_pItems[n] == lItem ? (int)n : wxNOT_FOUND;     \
+    return n < m_nCount &&                                                  \
+           (*fnCompare)((const void *)(long)lItem,                          \
+                        ((const void *)(long)m_pItems[n])) ? (int)n         \
+                                                           : wxNOT_FOUND;   \
 }                                                                           \
                                                                             \
 /* add item at the end */                                                   \