From 255dcbd7cb274adaedc68a905bfbb31f5796f97e Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Mon, 8 Jan 2007 02:52:09 +0000 Subject: [PATCH] Fix GetNextItem for virtual wxListCtrl, and improve behavior for wxLIST_NEXT_ALL. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/listctrl_mac.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index 3f031eea08..3b4941dc08 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -1567,16 +1567,19 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const long count = m_dbImpl->MacGetCount() ; for ( long line = item + 1 ; line < count; line++ ) { - wxMacDataItem* id = m_dbImpl->GetItemFromLine(line); + DataBrowserItemID id = line + 1; + if ( !IsVirtual() ) + id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); if ( (state == wxLIST_STATE_DONTCARE ) ) return line; - if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) ) + if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) return line; } } - else if ( geom == wxLIST_NEXT_ABOVE ) + + if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE ) { int item2 = item; if ( item2 == -1 ) @@ -1584,12 +1587,14 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const for ( long line = item2 - 1 ; line >= 0; line-- ) { - wxMacDataItem* id = m_dbImpl->GetItemFromLine(line); + DataBrowserItemID id = line + 1; + if ( !IsVirtual() ) + id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); if ( (state == wxLIST_STATE_DONTCARE ) ) return line; - if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) ) + if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) return line; } } -- 2.45.2