Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename and better document OnVerticalNavigation() helper function

Browse Source 
This is not an event handler itself, so it shouldn't use "On" prefix
which is reserved, by convention, for the event handlers.

It also doesn't need wxKeyEvent, but just wxKeyboardState, so change its
signature accordingly. This will notably allow to use it from mouse
event handlers too if necessary.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-02-01 17:13:46 +01:00
parent a291e1c004
commit dbfa1c206e
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/generic/datavgen.cpp
View File

@@ -780,13 +780,21 @@ public:
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
void OnCharHook( wxKeyEvent &event ); void OnCharHook( wxKeyEvent &event );
void OnChar( wxKeyEvent &event ); void OnChar( wxKeyEvent &event );
void OnVerticalNavigation(const wxKeyEvent& event, int delta);
void OnLeftKey(wxKeyEvent& event); void OnLeftKey(wxKeyEvent& event);
void OnRightKey(wxKeyEvent& event); void OnRightKey(wxKeyEvent& event);
void OnMouse( wxMouseEvent &event ); void OnMouse( wxMouseEvent &event );
void OnSetFocus( wxFocusEvent &event ); void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event );
// Go to the item at position delta rows away (delta may be positive or
// negative) from the current row. The new row is made current and the
// selection is changed or extended depending on the modifier keys flags in
// the keyboard state.
//
// If adding delta would result in an invalid item, it's clamped to the
// valid items range.
void GoToRelativeRow(const wxKeyboardState& kbdState, int delta);
void UpdateDisplay(); void UpdateDisplay();
void RecalculateDisplay(); void RecalculateDisplay();
void OnInternalIdle() wxOVERRIDE; void OnInternalIdle() wxOVERRIDE;
@@ -4609,11 +4617,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break; break;
case WXK_UP: case WXK_UP:
OnVerticalNavigation(event, -1); GoToRelativeRow(event, -1);
break; break;
case WXK_DOWN: case WXK_DOWN:
OnVerticalNavigation(event, +1); GoToRelativeRow(event, +1);
break; break;
case '+': case '+':
@@ -4645,19 +4653,19 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break; break;
case WXK_END: case WXK_END:
OnVerticalNavigation(event, +(int)GetRowCount()); GoToRelativeRow(event, +(int)GetRowCount());
break; break;
case WXK_HOME: case WXK_HOME:
OnVerticalNavigation(event, -(int)GetRowCount()); GoToRelativeRow(event, -(int)GetRowCount());
break; break;
case WXK_PAGEUP: case WXK_PAGEUP:
OnVerticalNavigation(event, -(GetCountPerPage() - 1)); GoToRelativeRow(event, -(GetCountPerPage() - 1));
break; break;
case WXK_PAGEDOWN: case WXK_PAGEDOWN:
OnVerticalNavigation(event, +(GetCountPerPage() - 1)); GoToRelativeRow(event, +(GetCountPerPage() - 1));
break; break;
default: default:
@@ -4665,7 +4673,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
} }
} }
void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int delta) void wxDataViewMainWindow::GoToRelativeRow(const wxKeyboardState& kbdState, int delta)
{ {
// if there is no selection, we cannot move it anywhere // if there is no selection, we cannot move it anywhere
if (!HasCurrentRow() || IsEmpty()) if (!HasCurrentRow() || IsEmpty())
@@ -4689,7 +4697,7 @@ void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int del
// in single selection we just ignore Shift as we can't select several // in single selection we just ignore Shift as we can't select several
// items anyhow // items anyhow
if ( event.ShiftDown() && !IsSingleSel() ) if ( kbdState.ShiftDown() && !IsSingleSel() )
{ {
RefreshRow( oldCurrent ); RefreshRow( oldCurrent );
@@ -4714,12 +4722,12 @@ void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int del
RefreshRow( oldCurrent ); RefreshRow( oldCurrent );
// all previously selected items are unselected unless ctrl is held // all previously selected items are unselected unless ctrl is held
if ( !event.ControlDown() ) if ( !kbdState.ControlDown() )
UnselectAllRows(); UnselectAllRows();
ChangeCurrentRow( newCurrent ); ChangeCurrentRow( newCurrent );
if ( !event.ControlDown() ) if ( !kbdState.ControlDown() )
{ {
SelectRow( m_currentRow, true ); SelectRow( m_currentRow, true );
SendSelectionChangedEvent(GetItemByRow(m_currentRow)); SendSelectionChangedEvent(GetItemByRow(m_currentRow));
@@ -4875,7 +4883,7 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxK
{ {
// go to the first column of the next row: // go to the first column of the next row:
idx = 0; idx = 0;
OnVerticalNavigation(wxKeyEvent()/*dummy*/, +1); GoToRelativeRow(wxKeyboardState()/*dummy*/, +1);
} }
else else
{ {
@@ -4893,7 +4901,7 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxK
{ {
// go to the last column of the previous row: // go to the last column of the previous row:
idx = (int)GetOwner()->GetColumnCount() - 1; idx = (int)GetOwner()->GetColumnCount() - 1;
OnVerticalNavigation(wxKeyEvent()/*dummy*/, -1); GoToRelativeRow(wxKeyboardState()/*dummy*/, -1);
} }
else else
{ {