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

Selecting by Shift+arrow key wouldn't notice, if it was moving beyond the

Browse Source 
grid bounds; now it does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-03-30 15:44:59 +00:00
parent 053ad70036
commit 428f582c20
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/generic/grid.cpp
View File

@@ -6296,14 +6296,17 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
if ( m_currentCellCoords != wxGridNoCellCoords && if ( m_currentCellCoords != wxGridNoCellCoords &&
m_currentCellCoords.GetRow() > 0 ) m_currentCellCoords.GetRow() > 0 )
{ {
if ( expandSelection ) if ( expandSelection)
{ {
if ( m_selectingKeyboard == wxGridNoCellCoords ) if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords; m_selectingKeyboard = m_currentCellCoords;
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 ); if ( m_selectingKeyboard.GetRow() > 0 )
MakeCellVisible( m_selectingKeyboard.GetRow(), {
m_selectingKeyboard.GetCol() ); m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
SelectBlock( m_currentCellCoords, m_selectingKeyboard ); MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
SelectBlock( m_currentCellCoords, m_selectingKeyboard );
}
} }
else else
{ {
@@ -6329,10 +6332,13 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
{ {
if ( m_selectingKeyboard == wxGridNoCellCoords ) if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords; m_selectingKeyboard = m_currentCellCoords;
m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 ); if ( m_selectingKeyboard.GetRow() < m_numRows-1 )
MakeCellVisible( m_selectingKeyboard.GetRow(), {
m_selectingKeyboard.GetCol() ); m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
SelectBlock( m_currentCellCoords, m_selectingKeyboard ); MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
SelectBlock( m_currentCellCoords, m_selectingKeyboard );
}
} }
else else
{ {
@@ -6358,10 +6364,13 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
{ {
if ( m_selectingKeyboard == wxGridNoCellCoords ) if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords; m_selectingKeyboard = m_currentCellCoords;
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 ); if ( m_selectingKeyboard.GetCol() > 0 )
MakeCellVisible( m_selectingKeyboard.GetRow(), {
m_selectingKeyboard.GetCol() ); m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
SelectBlock( m_currentCellCoords, m_selectingKeyboard ); MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
SelectBlock( m_currentCellCoords, m_selectingKeyboard );
}
} }
else else
{ {
@@ -6387,10 +6396,13 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
{ {
if ( m_selectingKeyboard == wxGridNoCellCoords ) if ( m_selectingKeyboard == wxGridNoCellCoords )
m_selectingKeyboard = m_currentCellCoords; m_selectingKeyboard = m_currentCellCoords;
m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 ); if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
MakeCellVisible( m_selectingKeyboard.GetRow(), {
m_selectingKeyboard.GetCol() ); m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
SelectBlock( m_currentCellCoords, m_selectingKeyboard ); MakeCellVisible( m_selectingKeyboard.GetRow(),
m_selectingKeyboard.GetCol() );
SelectBlock( m_currentCellCoords, m_selectingKeyboard );
}
} }
else else
{ {