Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GetNextItem for virtual wxListCtrl, and improve behavior for wxLIST_NEXT_ALL.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2007-01-08 02:52:09 +00:00
parent 090afcf011
commit 255dcbd7cb
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/listctrl_mac.cpp
View File

@@ -1567,16 +1567,19 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
long count = m_dbImpl->MacGetCount() ; long count = m_dbImpl->MacGetCount() ;
for ( long line = item + 1 ; line < count; line++ ) 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 ) ) if ( (state == wxLIST_STATE_DONTCARE ) )
return line; return line;
if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) ) if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line; return line;
} }
} }
else if ( geom == wxLIST_NEXT_ABOVE )
if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE )
{ {
int item2 = item; int item2 = item;
if ( item2 == -1 ) 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-- ) 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 ) ) if ( (state == wxLIST_STATE_DONTCARE ) )
return line; return line;
if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) ) if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line; return line;
} }
} }