X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a4b6b97b1141a81a129baa34a50d2835d5ec003..079b2f6ba2a999a3f9a284e5265abf43f7200635:/src/mac/carbon/listctrl_mac.cpp diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index 9cfef3b8d6..5a1a1f0bc8 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -220,7 +220,7 @@ public: virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item ); virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item); int GetFlags() { return m_flags; } - + protected: // we need to override to provide specialized handling for virtual wxListCtrls virtual OSStatus GetSetItemData(DataBrowserItemID itemID, @@ -640,24 +640,22 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position) le.SetEventObject(this); le.m_pointDrag = position; le.m_itemIndex = -1; - + int flags; long item = HitTest(position, flags); if (flags & wxLIST_HITTEST_ONITEM) { le.m_itemIndex = item; - if (!IsVirtual()) - { - - le.m_item.m_itemId = item; - GetItem(le.m_item); - } + le.m_item.m_itemId = item; + GetItem(le.m_item); GetEventHandler()->ProcessEvent(le); } } void wxListCtrl::OnChar(wxKeyEvent& event) { + + if (m_dbImpl) { wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() ); @@ -665,14 +663,40 @@ void wxListCtrl::OnChar(wxKeyEvent& event) le.m_code = event.GetKeyCode(); le.m_itemIndex = -1; + if (m_current == -1) + { + // if m_current isn't set, check if there's been a selection + // made before continuing + m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED); + } + + // We need to determine m_current ourselves when navigation keys + // are used. Note that PAGEUP and PAGEDOWN do not alter the current + // item on native Mac ListCtrl, so we only handle up and down keys. + switch ( event.GetKeyCode() ) + { + case WXK_UP: + if ( m_current > 0 ) + m_current -= 1; + else + m_current = 0; + + break; + + case WXK_DOWN: + if ( m_current < GetItemCount() - 1 ) + m_current += 1; + else + m_current = GetItemCount() - 1; + + break; + } + if (m_current != -1) { le.m_itemIndex = m_current; - if (!IsVirtual()) - { - le.m_item.m_itemId = m_current; - GetItem(le.m_item); - } + le.m_item.m_itemId = m_current; + GetItem(le.m_item); GetEventHandler()->ProcessEvent(le); } } @@ -1030,7 +1054,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width) { wxListItem colInfo; GetColumn(col, colInfo); - + colInfo.SetWidth(width); SetColumn(col, colInfo); m_dbImpl->SetColumnWidth(col, mywidth); @@ -1075,23 +1099,29 @@ bool wxListCtrl::GetItem(wxListItem& info) const if (m_dbImpl) { if (!IsVirtual()) - m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); + { + if (info.m_itemId >= 0 && info.m_itemId < GetItemCount()) + m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); + } else { - info.SetText( OnGetItemText(info.m_itemId, info.m_col) ); - info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) ); - if (info.GetMask() & wxLIST_MASK_STATE) + if (info.m_itemId >= 0 && info.m_itemId < GetItemCount()) { - if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) - info.SetState(info.GetState() | wxLIST_STATE_SELECTED); - } + info.SetText( OnGetItemText(info.m_itemId, info.m_col) ); + info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) ); + if (info.GetMask() & wxLIST_MASK_STATE) + { + if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) + info.SetState(info.GetState() | wxLIST_STATE_SELECTED); + } - wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId ); - if (attrs) - { - info.SetFont( attrs->GetFont() ); - info.SetBackgroundColour( attrs->GetBackgroundColour() ); - info.SetTextColour( attrs->GetTextColour() ); + wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId ); + if (attrs) + { + info.SetFont( attrs->GetFont() ); + info.SetBackgroundColour( attrs->GetBackgroundColour() ); + info.SetTextColour( attrs->GetTextColour() ); + } } } } @@ -1175,7 +1205,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) if (m_dbImpl) { DataBrowserSetOption option = kDataBrowserItemsAdd; - if ( stateMask == wxLIST_STATE_SELECTED && state == 0 ) + if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 ) option = kDataBrowserItemsRemove; if (item == -1) @@ -1203,8 +1233,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) if ( HasFlag(wxLC_VIRTUAL) ) { long itemID = item+1; + bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID ); + bool isSelectedState = (state == wxLIST_STATE_SELECTED); + + // toggle the selection state if wxListInfo state and actual state don't match. + if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState ) + { SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option); } + } else { wxListItem info; @@ -1289,7 +1326,7 @@ long wxListCtrl::GetItemData(long item) const } // Sets the item data -bool wxListCtrl::SetItemData(long item, long data) +bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data) { if (m_genericImpl) return m_genericImpl->SetItemData(item, data); @@ -1560,19 +1597,48 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const if (m_genericImpl) return m_genericImpl->GetNextItem(item, geom, state); - if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED ) + // TODO: implement all geometry and state options? + if ( m_dbImpl ) { - long count = m_dbImpl->MacGetCount() ; - for ( long line = item + 1 ; line < count; line++ ) + if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_BELOW ) + { + long count = m_dbImpl->MacGetCount() ; + for ( long line = item + 1 ; line < count; 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) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) + return line; + } + } + + if ( geom == wxLIST_NEXT_ABOVE ) { - wxMacDataItem* id = m_dbImpl->GetItemFromLine(line); - if ( m_dbImpl->IsItemSelected(id ) ) - return line; + int item2 = item; + if ( item2 == -1 ) + item2 = m_dbImpl->MacGetCount(); + + for ( long line = item2 - 1 ; line >= 0; 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) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) + return line; + } } - return -1; } - return 0; + return -1; } @@ -1951,7 +2017,7 @@ long wxListCtrl::InsertItem(wxListItem& info) info.m_itemId = count; m_dbImpl->MacInsertItem(info.m_itemId, &info ); - + wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() ); event.SetEventObject( this ); event.m_itemIndex = info.m_itemId; @@ -2097,7 +2163,7 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data) m_compareFunc = fn; m_compareFuncData = data; SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true); - + // we need to do this after each call, else we get a crash from wxPython when // SortItems is called the second time. m_compareFunc = NULL; @@ -2273,7 +2339,7 @@ void wxListCtrl::SetFocus() m_genericImpl->SetFocus(); return; } - + wxWindow::SetFocus(); } #endif @@ -2319,10 +2385,8 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , event.SetEventObject( list ); event.m_itemIndex = owner->GetLineFromItem( this ) ; - if ( !list->IsVirtual() ) - { - lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item); - } + event.m_item.m_itemId = event.m_itemIndex; + list->GetItem(event.m_item); switch (message) { @@ -2420,9 +2484,9 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer SetSortProperty( kMinColumnId - 1 ); else SetSortProperty( kMinColumnId ); - + m_sortOrder = SortOrder_None; - + if ( style & wxLC_SORT_DESCENDING ) { SetSortOrder( kDataBrowserOrderDecreasing ); @@ -2565,17 +2629,21 @@ void wxMacDataBrowserListCtrlControl::DrawItem( } else { - text = list->OnGetItemText( (long)itemID-1, listColumn ); - imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn ); - wxListItemAttr* attrs = list->OnGetItemAttr( (long)itemID-1 ); - if (attrs) + long itemNum = (long)itemID-1; + if (itemNum >= 0 && itemNum < list->GetItemCount()) { - if (attrs->HasBackgroundColour()) - bgColor = attrs->GetBackgroundColour(); - if (attrs->HasTextColour()) - color = attrs->GetTextColour(); - if (attrs->HasFont()) - font = attrs->GetFont(); + text = list->OnGetItemText( itemNum, listColumn ); + imgIndex = list->OnGetItemColumnImage( itemNum, listColumn ); + wxListItemAttr* attrs = list->OnGetItemAttr( itemNum ); + if (attrs) + { + if (attrs->HasBackgroundColour()) + bgColor = attrs->GetBackgroundColour(); + if (attrs->HasTextColour()) + color = attrs->GetTextColour(); + if (attrs->HasFont()) + font = attrs->GetFont(); + } } } } @@ -2614,6 +2682,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( enclosingRect.right - enclosingRect.left, enclosingRect.bottom - enclosingRect.top); + bool hasFocus = (wxWindow::FindFocus() == list); active = IsControlActive(GetControlRef()); // don't paint the background over the vertical rule line @@ -2626,8 +2695,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem( { GetThemeDrawingState(&savedState); - - if (active) + + if (active && hasFocus) { GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor); GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor); @@ -2653,7 +2722,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( labelColor = MAC_WXCOLORREF( color.GetPixel() ); else if (list->GetTextColour().Ok()) labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() ); - + if (bgColor.Ok()) { backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() ); @@ -2769,8 +2838,12 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI } else { - text = list->OnGetItemText( (long)itemID-1, listColumn ); - imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn ); + long itemNum = (long)itemID-1; + if (itemNum >= 0 && itemNum < list->GetItemCount()) + { + text = list->OnGetItemText( itemNum, listColumn ); + imgIndex = list->OnGetItemColumnImage( itemNum, listColumn ); + } } } @@ -2782,19 +2855,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI if ( list && list->HasFlag( wxLC_EDIT_LABELS ) ) { verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true )); - err = noErr ; } break ; default : if ( property >= kMinColumnId ) { - wxMacCFStringHolder cfStr; - - if (text){ - cfStr.Assign( text, wxLocale::GetSystemEncoding() ); - err = ::SetDataBrowserItemDataText( itemData, cfStr ); - err = noErr; - } + wxMacCFStringHolder cfStr(text); + verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) ); @@ -2858,7 +2925,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, // avoid asserts by getting out now return ; } - + wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl ); if ( list ) { @@ -2873,14 +2940,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, DataBrowserTableViewRowIndex result = 0; verify_noerr( GetItemRow( itemID, &result ) ) ; event.m_itemIndex = result; - - if (event.m_itemIndex >= 0) - MacGetColumnInfo(event.m_itemIndex,0,event.m_item); } else { event.m_itemIndex = (long)itemID-1; } + event.m_item.m_itemId = event.m_itemIndex; + list->GetItem(event.m_item); switch (message) { @@ -2935,7 +3001,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI wxString otherItemText; long itemOrder; long otherItemOrder; - + int colId = sortProperty - kMinColumnId; wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); @@ -2952,7 +3018,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI itemOrder = item->GetOrder(); otherItemOrder = item->GetOrder(); - + wxListCtrlCompare func = list->GetCompareFunc(); if (func != NULL) { @@ -2961,8 +3027,8 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI if (item && item->HasColumnInfo(0)) item1 = item->GetColumnInfo(0)->GetData(); if (otherItem && otherItem->HasColumnInfo(0)) - item2 = otherItem->GetColumnInfo(0)->GetData(); - + item2 = otherItem->GetColumnInfo(0)->GetData(); + if (item1 > -1 && item2 > -1) { int result = func(item1, item2, list->GetCompareFuncData()); @@ -2972,7 +3038,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI return result < 0; } } - + // we can't use the native control's sorting abilities, so just // sort by item id. return itemOrder < otherItemOrder; @@ -2982,9 +3048,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI long itemNum = (long)itemOneID; long otherItemNum = (long)itemTwoID; - itemText = list->OnGetItemText( itemNum-1, colId ); - otherItemText = list->OnGetItemText( otherItemNum-1, colId ); - + // virtual listctrls don't support sorting return itemNum < otherItemNum; } @@ -3012,11 +3076,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign listItem->SetColumnInfo( column, item ); listItem->SetOrder(row); UpdateState(dataItem, item); - + wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); - + // NB: When this call was made before a control was completely shown, it would - // update the item prematurely (i.e. no text would be listed) and, on show, + // update the item prematurely (i.e. no text would be listed) and, on show, // only the sorted column would be refreshed, meaning only first column text labels // would be shown. Making sure not to update items until the control is visible // seems to fix this issue. @@ -3138,7 +3202,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column ) { wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") ); - return m_rowItems[column]; + return m_rowItems[column]; } bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )