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

Use GetItem to get item info for events, even for virtual wxListCtrl.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2007-01-07 01:21:19 +00:00
parent ed9a7a63b8
commit a44a646b7e
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -646,12 +646,8 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
if (flags & wxLIST_HITTEST_ONITEM) if (flags & wxLIST_HITTEST_ONITEM)
{ {
le.m_itemIndex = item; le.m_itemIndex = item;
if (!IsVirtual())
{
le.m_item.m_itemId = item; le.m_item.m_itemId = item;
GetItem(le.m_item); GetItem(le.m_item);
}
GetEventHandler()->ProcessEvent(le); GetEventHandler()->ProcessEvent(le);
} }
} }
@@ -668,11 +664,8 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
if (m_current != -1) if (m_current != -1)
{ {
le.m_itemIndex = m_current; le.m_itemIndex = m_current;
if (!IsVirtual())
{
le.m_item.m_itemId = m_current; le.m_item.m_itemId = m_current;
GetItem(le.m_item); GetItem(le.m_item);
}
GetEventHandler()->ProcessEvent(le); GetEventHandler()->ProcessEvent(le);
} }
} }
@@ -1075,7 +1068,10 @@ bool wxListCtrl::GetItem(wxListItem& info) const
if (m_dbImpl) if (m_dbImpl)
{ {
if (!IsVirtual()) if (!IsVirtual())
{
if (info.m_itemId > 0 && info.m_itemId < GetItemCount())
m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
}
else else
{ {
info.SetText( OnGetItemText(info.m_itemId, info.m_col) ); info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
@@ -2343,10 +2339,8 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
event.SetEventObject( list ); event.SetEventObject( list );
event.m_itemIndex = owner->GetLineFromItem( this ) ; event.m_itemIndex = owner->GetLineFromItem( this ) ;
if ( !list->IsVirtual() ) event.m_item.m_itemId = event.m_itemIndex;
{ list->GetItem(event.m_item);
lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
}
switch (message) switch (message)
{ {
@@ -2898,14 +2892,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
DataBrowserTableViewRowIndex result = 0; DataBrowserTableViewRowIndex result = 0;
verify_noerr( GetItemRow( itemID, &result ) ) ; verify_noerr( GetItemRow( itemID, &result ) ) ;
event.m_itemIndex = result; event.m_itemIndex = result;
if (event.m_itemIndex >= 0)
MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
} }
else else
{ {
event.m_itemIndex = (long)itemID-1; event.m_itemIndex = (long)itemID-1;
} }
event.m_item.m_itemId = event.m_itemIndex;
list->GetItem(event.m_item);
switch (message) switch (message)
{ {