diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index ea10aece55..7a15a68e16 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2108,11 +2108,10 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
             wxDataViewSelection newsel(wxDataViewSelectionCmp);
 
-            for ( wxDataViewSelection::const_iterator i = m_selection.begin();
-                  i != m_selection.end();
-                  ++i )
+            const size_t numSelections = m_selection.size();
+            for ( size_t i = 0; i < numSelections; ++i )
             {
-                const int s = *i;
+                const int s = m_selection[i];
                 if ( s < itemRow )
                     newsel.push_back(s);
                 else if ( s >= itemRow + itemsDeleted )