*really* fixed searching in sorted arrays

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

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 573114aec0017cd9175d83f1a797e0cbef3a870e..2b185f156f4f91f3ff4230645073df0c4f199e37 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -283,10 +283,10 @@ int name::Index(T lItem, CMPFUNC fnCompare) const                           \
 {                                                                           \
     size_t n = IndexForInsert(lItem, fnCompare);                            \
                                                                             \
 {                                                                           \
     size_t n = IndexForInsert(lItem, fnCompare);                            \
                                                                             \

-    return n < m_nCount &&                                                  \
+    return (n >= m_nCount ||                                                \

            (*fnCompare)((const void *)(long)lItem,                          \
            (*fnCompare)((const void *)(long)lItem,                          \

-                        ((const void *)(long)m_pItems[n])) ? wxNOT_FOUND    \
-                                                           : (int)n;        \
+                        ((const void *)(long)m_pItems[n]))) ? wxNOT_FOUND   \
+                                                            : (int)n;       \

 }                                                                           \
                                                                             \
 /* add item at the end */                                                   \
 }                                                                           \
                                                                             \
 /* add item at the end */                                                   \