From 6cdcbce3e5e99f7fb40a0fc3a782772177ad5657 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 16 Jul 2007 11:21:28 +0000 Subject: [PATCH] Use wxDataViewItem, not row to index git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/datavgen.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index ffe43b2b1e..3ca5d64b87 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -1693,8 +1693,8 @@ void wxDataViewMainWindow::OnRenameTimer() GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, &labelRect.x, &labelRect.y); - // TODO get wxDataViewItem from m_currentRow - m_currentCol->GetRenderer()->StartEditing( m_currentRow, labelRect ); + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); } //------------------------------------------------------------------ @@ -2755,13 +2755,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) { + wxDataViewItem item = GetItemByRow(current); wxVariant value; - model->GetValue( value, col->GetModelColumn(), current ); + model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight ); - wxDataViewItem dataitem = GetItemByRow(current); - cell->Activate( cell_rect, model, dataitem, col->GetModelColumn() ); + cell->Activate( cell_rect, model, item, col->GetModelColumn() ); } return; } -- 2.45.2