second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions

View File

@@ -1040,9 +1040,12 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
findInfo.flags = LVFI_STRING;
if ( partial )
findInfo.flags |= LVFI_PARTIAL;
findInfo.psz = WXSTRINGCAST str;
findInfo.psz = str;
return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
// ListView_FindItem() excludes the first item from search and to look
// through all the items you need to start from -1 which is unnatural and
// inconsitent with the generic version - so we adjust the index
return ListView_FindItem(GetHwnd(), (int) start - 1, &findInfo);
}
// Find an item whose data matches this data, starting from the item after 'start'