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,
le.SetEventObject(this);
le.m_pointDrag = position;
le.m_itemIndex = -1;
-
+
int flags;
long item = HitTest(position, flags);
if (flags & wxLIST_HITTEST_ONITEM)
void wxListCtrl::OnChar(wxKeyEvent& event)
{
+
+
if (m_dbImpl)
{
wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
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;
{
wxListItem colInfo;
GetColumn(col, colInfo);
-
+
colInfo.SetWidth(width);
SetColumn(col, colInfo);
m_dbImpl->SetColumnWidth(col, mywidth);
{
if (!IsVirtual())
{
- if (info.m_itemId > 0 && info.m_itemId < GetItemCount())
+ 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() );
+ }
}
}
}
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)
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;
}
// 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);
long count = m_dbImpl->MacGetCount() ;
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 ) )
return line;
-
- if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) )
+
+ if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line;
}
}
- else if ( geom == wxLIST_NEXT_ABOVE )
+
+ if ( geom == wxLIST_NEXT_ABOVE )
{
int item2 = item;
if ( item2 == -1 )
item2 = m_dbImpl->MacGetCount();
-
+
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 ) )
return line;
-
- if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) )
+
+ if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
return line;
}
}
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;
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;
m_genericImpl->SetFocus();
return;
}
-
+
wxWindow::SetFocus();
}
#endif
SetSortProperty( kMinColumnId - 1 );
else
SetSortProperty( kMinColumnId );
-
+
m_sortOrder = SortOrder_None;
-
+
if ( style & wxLC_SORT_DESCENDING )
{
SetSortOrder( kDataBrowserOrderDecreasing );
}
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();
+ }
}
}
}
{
GetThemeDrawingState(&savedState);
-
+
if (active && hasFocus)
{
GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
labelColor = MAC_WXCOLORREF( color.GetPixel() );
else if (list->GetTextColour().Ok())
labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
-
+
if (bgColor.Ok())
{
backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
}
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 );
+ }
}
}
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) );
// avoid asserts by getting out now
return ;
}
-
+
wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
if ( list )
{
wxString otherItemText;
long itemOrder;
long otherItemOrder;
-
+
int colId = sortProperty - kMinColumnId;
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
itemOrder = item->GetOrder();
otherItemOrder = item->GetOrder();
-
+
wxListCtrlCompare func = list->GetCompareFunc();
if (func != NULL)
{
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());
return result < 0;
}
}
-
+
// we can't use the native control's sorting abilities, so just
// sort by item id.
return itemOrder < otherItemOrder;
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;
}
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.
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 )
projects / wxWidgets.git / blobdiff