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

test wxLC_SINGLE_SEL flag properly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-09 05:12:36 +00:00
parent 85313a9a8f
commit eea2724a28
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,6 +226,7 @@ public:
{ {
} }
protected:
virtual wxListItemAttr * OnGetItemAttr(long item) const virtual wxListItemAttr * OnGetItemAttr(long item) const
{ {
return m_nativeListCtrl->OnGetItemAttr(item); return m_nativeListCtrl->OnGetItemAttr(item);
@ -246,7 +247,6 @@ public:
return m_nativeListCtrl->OnGetItemText(item, column); return m_nativeListCtrl->OnGetItemText(item, column);
} }
protected:
wxListCtrl* m_nativeListCtrl; wxListCtrl* m_nativeListCtrl;
}; };
@ -1414,7 +1414,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
bool trigger = false; bool trigger = false;
wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL; bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list ); event.SetEventObject( list );
event.m_itemIndex = owner->GetLineFromItem( this ) ; event.m_itemIndex = owner->GetLineFromItem( this ) ;
@ -1642,7 +1642,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
else if ( message == kDataBrowserItemAdded ) else if ( message == kDataBrowserItemAdded )
{ {
// we don't issue events on adding, the item is not really stored in the list yet, so we // we don't issue events on adding, the item is not really stored in the list yet, so we
// avoid asserts by gettting out now // avoid asserts by getting out now
return ; return ;
} }
@ -1652,7 +1652,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
bool trigger = false; bool trigger = false;
wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL; bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
event.SetEventObject( list ); event.SetEventObject( list );
if ( !list->IsVirtual() ) if ( !list->IsVirtual() )