From eea2724a289e57cd5f8a9123a4d17bd5d76e0a72 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 9 Oct 2006 05:12:36 +0000 Subject: [PATCH] test wxLC_SINGLE_SEL flag properly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/listctrl_mac.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index fbad0105e4..4d6cf5726a 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -226,6 +226,7 @@ public: { } +protected: virtual wxListItemAttr * OnGetItemAttr(long item) const { return m_nativeListCtrl->OnGetItemAttr(item); @@ -246,7 +247,6 @@ public: return m_nativeListCtrl->OnGetItemText(item, column); } -protected: wxListCtrl* m_nativeListCtrl; }; @@ -1414,7 +1414,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , bool trigger = false; 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.m_itemIndex = owner->GetLineFromItem( this ) ; @@ -1642,7 +1642,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, else if ( message == kDataBrowserItemAdded ) { // 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 ; } @@ -1652,7 +1652,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, bool trigger = false; 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 ); if ( !list->IsVirtual() )