Use wxDataViewItem, not row to index

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index ffe43b2b1ee989d17fe99bd629d634b912b9c53f..3ca5d64b8708f53de0c6d234f83621b911181145 100644 (file)
--- 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);
 
     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)
             {
         {
             if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)
             {

+                wxDataViewItem item = GetItemByRow(current);

                 wxVariant value;
                 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 );
                 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;
         }
             }
             return;
         }