fixed bug with searching in sorted arrays
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -197,6 +197,7 @@ wxBase
|
|||||||
- compilation with wxUSE_ODBC=1 fixed (dbkeyg.h file was missing in the archive)
|
- compilation with wxUSE_ODBC=1 fixed (dbkeyg.h file was missing in the archive)
|
||||||
- bug in wxDateTime with timezones on systems with tm_gmtoff in struct tm fixed
|
- bug in wxDateTime with timezones on systems with tm_gmtoff in struct tm fixed
|
||||||
- fixed bug in wxArray::Shrink() (Seth Manley)
|
- fixed bug in wxArray::Shrink() (Seth Manley)
|
||||||
|
- fixed bug with searching in sorted arrays (J<>rgen Palm)
|
||||||
|
|
||||||
wxGTK:
|
wxGTK:
|
||||||
|
|
||||||
|
@@ -248,7 +248,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 && 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 */ \
|
/* add item at the end */ \
|
||||||
|
Reference in New Issue
Block a user