AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify row selection function in the generic wxDataViewCtrl.

Browse Source 
No real changes, just don't make SelectRows() more complicated than necessary:
it is always called with its arguments in order, so it doesn't need to reorder
them and it is never called to deselect the items.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-09-27 20:46:11 +00:00
parent e05e1b93bd
commit f5941e4f83
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/datavgen.cpp
View File

@ -778,7 +778,7 @@ public:
void Select( const wxArrayInt& aSelections );
void SelectAllRows( bool on );
void SelectRow( unsigned int row, bool on );
void SelectRows( unsigned int from, unsigned int to, bool on );
void SelectRows( unsigned int from, unsigned int to );
void ReverseRowSelection( unsigned int row );
bool IsRowSelected( unsigned int row );
void SendSelectionChangedEvent( const wxDataViewItem& item);
@ -2791,27 +2791,13 @@ void wxDataViewMainWindow::SelectRow( unsigned int row, bool on )
}
}
void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to, bool on )
void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to )
{
if (from > to)
{
unsigned int tmp = from;
from = to;
to = tmp;
}
unsigned int i;
for (i = from; i <= to; i++)
for (unsigned int i = from; i <= to; i++)
{
if (m_selection.Index( i ) == wxNOT_FOUND)
{
if (on)
m_selection.Add( i );
}
else
{
if (!on)
m_selection.Remove( i );
m_selection.Add( i );
}
}
RefreshRows( from, to );
@ -3899,7 +3885,7 @@ void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int del
oldCurrent = m_currentRow;
}
SelectRows( oldCurrent, newCurrent, true );
SelectRows(oldCurrent, newCurrent);
if (oldCurrent!=newCurrent)
SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
}
@ -4450,7 +4436,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
lineFrom = m_currentRow;
}
SelectRows(lineFrom, lineTo, true);
SelectRows(lineFrom, lineTo);
SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
}
else // !ctrl, !shift