Make correct cell visible for cursor movement.

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

src/generic/grid.cpp

@@ -5029,6 +5029,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
         if ( !event.ShiftDown() && 
              m_selectingKeyboard != wxGridNoCellCoords )
         {
+	    if ( m_selectingTopLeft != wxGridNoCellCoords &&
+		 m_selectingBottomRight != wxGridNoCellCoords )
 	        m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
 					  m_selectingTopLeft.GetCol(),
 					  m_selectingBottomRight.GetRow(),
@@ -5142,16 +5144,9 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 MovePageDown();
                 break;
 
-#if 1
             case WXK_SPACE:
-                if ( !IsEditable() )
+	        if ( event.ControlDown() )
 		{
-                    MoveCursorRight( FALSE );
-                    break;
-                }
-                // Otherwise fall through to default
-#else
-            case WXK_SPACE:
 		    m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
 						      m_currentCellCoords.GetCol(),
 						      event.ControlDown(),
@@ -5159,7 +5154,13 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
 						      event.AltDown(),
 						      event.MetaDown() );
 		    break;
-#endif
+		}
+                if ( !IsEditable() )
+                {
+                    MoveCursorRight( FALSE );
+                    break;
+                }
+                // Otherwise fall through to default
 
             default:
                 // alphanumeric keys or F2 (special key just for this) enable
@@ -6175,18 +6176,20 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() > 0 )
     {
-        MakeCellVisible( m_currentCellCoords.GetRow() - 1,
-                         m_currentCellCoords.GetCol() );
         if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
             m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
+	    MakeCellVisible( m_selectingKeyboard.GetRow(),
+			     m_selectingKeyboard.GetCol() );
             SelectBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
 	{
 	    ClearSelection();
+	    MakeCellVisible( m_currentCellCoords.GetRow() - 1,
+			     m_currentCellCoords.GetCol() );
             SetCurrentCell( m_currentCellCoords.GetRow() - 1,
                             m_currentCellCoords.GetCol() );
 	}
@@ -6202,18 +6205,20 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetRow() < m_numRows-1 )
     {
-        MakeCellVisible( m_currentCellCoords.GetRow() + 1,
-                         m_currentCellCoords.GetCol() );
         if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
             m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
+	    MakeCellVisible( m_selectingKeyboard.GetRow(),
+			     m_selectingKeyboard.GetCol() );
             SelectBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
 	{
 	    ClearSelection();
+	    MakeCellVisible( m_currentCellCoords.GetRow() + 1,
+			     m_currentCellCoords.GetCol() );
             SetCurrentCell( m_currentCellCoords.GetRow() + 1,
                             m_currentCellCoords.GetCol() );
 	}
@@ -6229,18 +6234,20 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() > 0 )
     {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                         m_currentCellCoords.GetCol() - 1 );
         if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
             m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
+	    MakeCellVisible( m_selectingKeyboard.GetRow(),
+			     m_selectingKeyboard.GetCol() );
             SelectBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
 	{
 	    ClearSelection();
+	    MakeCellVisible( m_currentCellCoords.GetRow(),
+			     m_currentCellCoords.GetCol() - 1 );
             SetCurrentCell( m_currentCellCoords.GetRow(),
                             m_currentCellCoords.GetCol() - 1 );
 	}
@@ -6256,19 +6263,20 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
     if ( m_currentCellCoords != wxGridNoCellCoords  &&
          m_currentCellCoords.GetCol() < m_numCols - 1 )
     {
-        MakeCellVisible( m_currentCellCoords.GetRow(),
-                        m_currentCellCoords.GetCol() + 1 );
-
         if ( expandSelection )
         {
             if ( m_selectingKeyboard == wxGridNoCellCoords )
                 m_selectingKeyboard = m_currentCellCoords;
             m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
+	    MakeCellVisible( m_selectingKeyboard.GetRow(),
+			     m_selectingKeyboard.GetCol() );
             SelectBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
 	{
 	    ClearSelection();
+	    MakeCellVisible( m_currentCellCoords.GetRow(),
+			     m_currentCellCoords.GetCol() + 1 );
 	    SetCurrentCell( m_currentCellCoords.GetRow(),
                             m_currentCellCoords.GetCol() + 1 );
 	}