Recalculate display (and scrollbars etc) before calling EnsureVisible()

[wxWidgets.git] / src / generic / gridsel.cpp

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index a4da89168510846132d567d3e7b9ba5ac9cea4f3..f87c0378885915371538d3d98659ea51461748ca 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -1,14 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////

-// Name:        generic/gridsel.cpp
+// Name:        src/generic/gridsel.cpp

 // Purpose:     wxGridSelection
 // Author:      Stefan Neis
 // Modified by:
 // Created:     20/02/1999
 // Purpose:     wxGridSelection
 // Author:      Stefan Neis
 // Modified by:
 // Created:     20/02/1999

-// RCS-ID:      $$
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,23 +24,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "gridsel.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/defs.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if defined(wxUSE_NEW_GRID) && (wxUSE_NEW_GRID)
+#if wxUSE_GRID

 
 #include "wx/generic/gridsel.h"
 
 
 #include "wx/generic/gridsel.h"
 

+

 // Some explanation for the members of the class:
 // m_cellSelection stores individual selected cells
 //   -- this is only used if m_selectionMode == wxGridSelectCells
 // Some explanation for the members of the class:
 // m_cellSelection stores individual selected cells
 //   -- this is only used if m_selectionMode == wxGridSelectCells


@@ -56,7 +51,7 @@ bool wxGridSelection::IsSelection()
            m_rowSelection.GetCount() || m_colSelection.GetCount() );
 }
 
            m_rowSelection.GetCount() || m_colSelection.GetCount() );
 }
 

-bool wxGridSelection::IsInSelection ( int row, int col )
+bool wxGridSelection::IsInSelection( int row, int col )

 {
     size_t count;
 
 {
     size_t count;
 


@@ -91,7 +86,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
     // (unless we are in column selection mode).
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {
     // (unless we are in column selection mode).
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {

-        size_t count = m_rowSelection.GetCount();
+        count = m_rowSelection.GetCount();

         for ( size_t n = 0; n < count; n++ )
         {
             if ( row == m_rowSelection[n] )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( row == m_rowSelection[n] )


@@ -104,18 +99,19 @@ bool wxGridSelection::IsInSelection ( int row, int col )
     // (unless we are in row selection mode).
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
     // (unless we are in row selection mode).
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {

-        size_t count = m_colSelection.GetCount();
+        count = m_colSelection.GetCount();

         for ( size_t n = 0; n < count; n++ )
         {
             if ( col == m_colSelection[n] )
               return true;
         }
     }
         for ( size_t n = 0; n < count; n++ )
         {
             if ( col == m_colSelection[n] )
               return true;
         }
     }

+

     return false;
 }
 
 // Change the selection mode
     return false;
 }
 
 // Change the selection mode

-void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode )

 {
     // if selection mode is unchanged return immediately
     if (selmode == m_selectionMode)
 {
     // if selection mode is unchanged return immediately
     if (selmode == m_selectionMode)


@@ -147,23 +143,25 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
             else // selmode == wxGridSelectColumns)
                 SelectCol( col );
         }
             else // selmode == wxGridSelectColumns)
                 SelectCol( col );
         }

-        while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
+
+        // Note that m_blockSelectionTopLeft's size may be changing!
+        for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++)

         {
         {

-            n--;

             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();
             int leftCol = coords.GetCol();
             coords = m_blockSelectionBottomRight[n];
             int bottomRow = coords.GetRow();
             int rightCol = coords.GetCol();
             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();
             int leftCol = coords.GetCol();
             coords = m_blockSelectionBottomRight[n];
             int bottomRow = coords.GetRow();
             int rightCol = coords.GetCol();

+

             if (selmode == wxGrid::wxGridSelectRows)
             {
                 if (leftCol != 0 || rightCol != m_grid->GetNumberCols() - 1 )
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
             if (selmode == wxGrid::wxGridSelectRows)
             {
                 if (leftCol != 0 || rightCol != m_grid->GetNumberCols() - 1 )
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);

-                    SelectBlock( topRow, 0,
-                                 bottomRow, m_grid->GetNumberCols() - 1 );
+                    SelectBlockNoEvent( topRow, 0,
+                                 bottomRow, m_grid->GetNumberCols() - 1);

                 }
             }
             else // selmode == wxGridSelectColumns)
                 }
             }
             else // selmode == wxGridSelectColumns)


@@ -172,18 +170,21 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);

-                    SelectBlock( 0, leftCol,
-                                 m_grid->GetNumberRows() - 1, rightCol );
+                    SelectBlockNoEvent(0, leftCol,
+                                 m_grid->GetNumberRows() - 1, rightCol);

                 }
             }
         }
                 }
             }
         }

+
+        m_selectionMode = selmode;

     }
 }
 
     }
 }
 

-void wxGridSelection::SelectRow( int row, bool addToSelected )
+void wxGridSelection::SelectRow(int row, const wxKeyboardState& kbd)

 {
     if ( m_selectionMode == wxGrid::wxGridSelectColumns )
         return;
 {
     if ( m_selectionMode == wxGrid::wxGridSelectColumns )
         return;

+

     size_t count, n;
 
     // Remove single cells contained in newly selected block.
     size_t count, n;
 
     // Remove single cells contained in newly selected block.


@@ -197,7 +198,8 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);

-                n--; count--;
+                n--;
+                count--;

             }
         }
     }
             }
         }
     }


@@ -205,6 +207,7 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
     bool done = false;
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
     bool done = false;

+

     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];


@@ -215,8 +218,9 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
         {
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
         {
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);

-            n--; count--;
-        }       
+            n--;
+            count--;
+        }

         else if ( coords1.GetCol() == 0  &&
                   coords2.GetCol() == m_grid->GetNumberCols() - 1 )
         {
         else if ( coords1.GetCol() == 0  &&
                   coords2.GetCol() == m_grid->GetNumberCols() - 1 )
         {


@@ -233,7 +237,7 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
             {
                 coords2.SetRow(row);
                 done = true;
             {
                 coords2.SetRow(row);
                 done = true;

-            }           
+            }

         }
     }
 
         }
     }
 


@@ -253,16 +257,26 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
     }
 
     // Update View:
     }
 
     // Update View:

-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                          wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );

     if ( !m_grid->GetBatchCount() )
     if ( !m_grid->GetBatchCount() )

-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+    {
+        wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
+                                              wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+        ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+    }
+
+    // Send Event
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( row, 0 ),
+                                    wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
+                                    true,
+                                    kbd);

 
 

-    // Possibly send event here? This would imply that no event is sent,
-    // if the row already was part of the selection.
+    m_grid->GetEventHandler()->ProcessEvent( gridEvt );

 }
 
 }
 

-void wxGridSelection::SelectCol( int col, bool addToSelected )
+void wxGridSelection::SelectCol(int col, const wxKeyboardState& kbd)

 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
         return;
 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
         return;


@@ -279,7 +293,8 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);

-                n--; count--;
+                n--;
+                count--;

             }
         }
     }
             }
         }
     }


@@ -297,7 +312,8 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
         {
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
         {
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);

-            n--; count--;
+            n--;
+            count--;

         }
         else if ( coords1.GetRow() == 0  &&
                   coords2.GetRow() == m_grid->GetNumberRows() - 1 )
         }
         else if ( coords1.GetRow() == 0  &&
                   coords2.GetRow() == m_grid->GetNumberRows() - 1 )


@@ -315,7 +331,7 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
             {
                 coords2.SetCol(col);
                 done = true;
             {
                 coords2.SetCol(col);
                 done = true;

-            }           
+            }

         }
     }
 
         }
     }
 


@@ -335,34 +351,83 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
     }
 
     // Update View:
     }
 
     // Update View:

-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                          wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );

     if ( !m_grid->GetBatchCount() )
     if ( !m_grid->GetBatchCount() )

-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+    {
+        wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
+                                              wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+        ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+    }
+
+    // Send Event
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( 0, col ),
+                                    wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
+                                    true,
+                                    kbd );

 
 

-    // Possibly send event here? This would imply that no event is sent,
-    // if the row already was part of the selection.
+    m_grid->GetEventHandler()->ProcessEvent( gridEvt );

 }
 
 }
 

-void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGridSelection::SelectBlock( int topRow, int leftCol,
+                                   int bottomRow, int rightCol,
+                                   const wxKeyboardState& kbd,
+                                   bool sendEvent )

 {
 {

-    // Fix the coordinates of the block if potentially needed
-    if ( m_selectionMode == wxGrid::wxGridSelectRows )
+    // Fix the coordinates of the block if needed.
+    switch ( m_selectionMode )

     {
     {

-        leftCol = 0;
-        rightCol = m_grid->GetNumberCols() - 1;
+        default:
+            wxFAIL_MSG( "unknown selection mode" );
+            // fall through
+
+        case wxGrid::wxGridSelectCells:
+            // nothing to do -- in this mode arbitrary blocks can be selected
+            break;
+
+        case wxGrid::wxGridSelectRows:
+            leftCol = 0;
+            rightCol = m_grid->GetNumberCols() - 1;
+            break;
+
+        case wxGrid::wxGridSelectColumns:
+            topRow = 0;
+            bottomRow = m_grid->GetNumberRows() - 1;
+            break;
+
+        case wxGrid::wxGridSelectRowsOrColumns:
+            // block selection doesn't make sense for this mode, we could only
+            // select the entire grid but this wouldn't be useful
+            return;

     }
     }

-    else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
+
+    if ( topRow > bottomRow )
+    {
+        int temp = topRow;
+        topRow = bottomRow;
+        bottomRow = temp;
+    }
+
+    if ( leftCol > rightCol )

     {
     {

-        topRow = 0;
-        bottomRow = m_grid->GetNumberRows() - 1;
+        int temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;

     }
 
     // Handle single cell selection in SelectCell.
     }
 
     // Handle single cell selection in SelectCell.

-    if ( topRow == bottomRow && leftCol == rightCol )
-        SelectCell( topRow, leftCol );
+    // (MB: added check for selection mode here to prevent
+    //  crashes if, for example, we are select rows and the
+    //  grid only has 1 col)
+    if ( m_selectionMode == wxGrid::wxGridSelectCells &&
+         topRow == bottomRow && leftCol == rightCol )
+    {
+        SelectCell( topRow, leftCol, kbd, sendEvent );
+    }

 
     size_t count, n;
 
     size_t count, n;

+

     // Remove single cells contained in newly selected block.
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {
     // Remove single cells contained in newly selected block.
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {


@@ -374,7 +439,8 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int r
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);
                                     coords.GetRow(), coords.GetCol() ) )
             {
                 m_cellSelection.RemoveAt(n);

-                n--; count--;
+                n--;
+                count--;

             }
         }
     }
             }
         }
     }


@@ -387,18 +453,23 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int r
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];

+

         switch ( BlockContain( coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                topRow, leftCol, bottomRow, rightCol ) )
         {
         switch ( BlockContain( coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                topRow, leftCol, bottomRow, rightCol ) )
         {

-          case 1:
-            return;
-          case -1:
-            m_blockSelectionTopLeft.RemoveAt(n);
-            m_blockSelectionBottomRight.RemoveAt(n);
-            n--; count--;
-          default:
-            ;
+            case 1:
+                return;
+
+            case -1:
+                m_blockSelectionTopLeft.RemoveAt(n);
+                m_blockSelectionBottomRight.RemoveAt(n);
+                n--;
+                count--;
+                break;
+
+            default:
+                break;

         }
     }
 
         }
     }
 


@@ -410,75 +481,126 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int r
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( m_rowSelection[n], 0,
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( m_rowSelection[n], 0,

-                                   m_rowSelection[n], m_grid->GetNumberCols()-1,
+                                   m_rowSelection[n], m_grid->GetNumberCols() - 1,

                                    topRow, leftCol, bottomRow, rightCol ) )
             {
                                    topRow, leftCol, bottomRow, rightCol ) )
             {

-              case 1:
-                return;
-              case -1:
-                m_rowSelection.RemoveAt(n);
-                n--; count--;
-              default:
-                ;
+                case 1:
+                    return;
+
+                case -1:
+                    m_rowSelection.RemoveAt(n);
+                    n--;
+                    count--;
+                    break;
+
+                default:
+                    break;

             }
         }
     }
             }
         }
     }

+

     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
         count = m_colSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( 0, m_colSelection[n],
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
         count = m_colSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( 0, m_colSelection[n],

-                                   m_grid->GetNumberRows()-1, m_colSelection[n], 
+                                   m_grid->GetNumberRows() - 1, m_colSelection[n],

                                    topRow, leftCol, bottomRow, rightCol ) )
             {
                                    topRow, leftCol, bottomRow, rightCol ) )
             {

-              case 1:
-                return;
-              case -1:
-                m_colSelection.RemoveAt(n);
-                n--; count--;
-              default:
-                ;
+                case 1:
+                    return;
+
+                case -1:
+                    m_colSelection.RemoveAt(n);
+                    n--;
+                    count--;
+                    break;
+
+                default:
+                    break;

             }
         }
     }
             }
         }
     }

+

     m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) );
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 
     // Update View:
     m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) );
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 
     // Update View:

-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ),
-                                          wxGridCellCoords( bottomRow, rightCol ) );

     if ( !m_grid->GetBatchCount() )
     if ( !m_grid->GetBatchCount() )

-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+    {
+        wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ),
+                                              wxGridCellCoords( bottomRow, rightCol ) );
+        ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+    }

 
 

-    // Possibly send event?
+    // Send Event, if not disabled.
+    if ( sendEvent )
+    {
+        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+            wxEVT_GRID_RANGE_SELECT,
+            m_grid,
+            wxGridCellCoords( topRow, leftCol ),
+            wxGridCellCoords( bottomRow, rightCol ),
+            true,
+            kbd);
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+    }

 }
 
 }
 

-void wxGridSelection::SelectCell( int row, int col)
+void wxGridSelection::SelectCell( int row, int col,
+                                  const wxKeyboardState& kbd,
+                                  bool sendEvent )

 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )

-        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1 );
+    {
+        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1, kbd, sendEvent);
+
+        return;
+    }

     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )

-        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col );
+    {
+        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col, kbd, sendEvent);
+
+        return;
+    }

     else if ( IsInSelection ( row, col ) )
         return;
     else if ( IsInSelection ( row, col ) )
         return;

+

     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:

-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                          wxGridCellCoords( row, col ) );

     if ( !m_grid->GetBatchCount() )
     if ( !m_grid->GetBatchCount() )

-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+    {
+        wxRect r = m_grid->BlockToDeviceRect(
+            wxGridCellCoords( row, col ),
+            wxGridCellCoords( row, col ) );
+        ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+    }

 
 

-    // Possibly send event?
+    // Send event
+    if (sendEvent)
+    {
+        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+            wxEVT_GRID_RANGE_SELECT,
+            m_grid,
+            wxGridCellCoords( row, col ),
+            wxGridCellCoords( row, col ),
+            true,
+            kbd);
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+    }

 }
 
 }
 

-void wxGridSelection::ToggleCellSelection( int row, int col)
+void
+wxGridSelection::ToggleCellSelection(int row, int col,
+                                     const wxKeyboardState& kbd)

 {
     // if the cell is not selected, select it
     if ( !IsInSelection ( row, col ) )
     {
 {
     // if the cell is not selected, select it
     if ( !IsInSelection ( row, col ) )
     {

-        SelectCell( row, col );
+        SelectCell(row, col, kbd);
+

         return;
     }
 
         return;
     }
 


@@ -496,16 +618,27 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
         count = m_cellSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {
         count = m_cellSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {

-            wxGridCellCoords& coords = m_cellSelection[n];
-            if ( row == coords.GetRow() && col == coords.GetCol() )
+            const wxGridCellCoords& sel = m_cellSelection[n];
+            if ( row == sel.GetRow() && col == sel.GetCol() )

             {
             {

-                wxRect r;
-                r = m_grid->BlockToDeviceRect( m_cellSelection[n],
-                                               m_cellSelection[n] );
+                wxGridCellCoords coords = m_cellSelection[n];

                 m_cellSelection.RemoveAt(n);
                 m_cellSelection.RemoveAt(n);

-                n--; count--;

                 if ( !m_grid->GetBatchCount() )
                 if ( !m_grid->GetBatchCount() )

-                    ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+                {
+                    wxRect r = m_grid->BlockToDeviceRect( coords, coords );
+                    ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+                }
+
+                // Send event
+                wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                                wxEVT_GRID_RANGE_SELECT,
+                                                m_grid,
+                                                wxGridCellCoords( row, col ),
+                                                wxGridCellCoords( row, col ),
+                                                false,
+                                                kbd );
+                m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+

                 return;
             }
         }
                 return;
             }
         }


@@ -532,34 +665,37 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
 
     count = m_blockSelectionTopLeft.GetCount();
     for ( n = 0; n < count; n++ )
 
     count = m_blockSelectionTopLeft.GetCount();
     for ( n = 0; n < count; n++ )

-      {
+    {

         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         int topRow = coords1.GetRow();
         int leftCol = coords1.GetCol();
         int bottomRow = coords2.GetRow();
         int rightCol = coords2.GetCol();
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         int topRow = coords1.GetRow();
         int leftCol = coords1.GetCol();
         int bottomRow = coords2.GetRow();
         int rightCol = coords2.GetCol();

-        if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol,
-                                row, col ) )
+
+        if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol, row, col ) )

         {
             // remove the block
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
         {
             // remove the block
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);

-            n--; count--;
+            n--;
+            count--;
+

             // add up to 4 smaller blocks and set update region
             if ( m_selectionMode != wxGrid::wxGridSelectColumns )
             {
                 if ( topRow < row )
             // add up to 4 smaller blocks and set update region
             if ( m_selectionMode != wxGrid::wxGridSelectColumns )
             {
                 if ( topRow < row )

-                    SelectBlock( topRow, leftCol, row - 1, rightCol );
+                    SelectBlockNoEvent(topRow, leftCol, row - 1, rightCol);

                 if ( bottomRow > row )
                 if ( bottomRow > row )

-                    SelectBlock( row + 1, leftCol, bottomRow, rightCol );
+                    SelectBlockNoEvent(row + 1, leftCol, bottomRow, rightCol);

             }
             }

+

             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )
             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )

-                    SelectBlock( row, leftCol, row, col - 1 );
+                    SelectBlockNoEvent(row, leftCol, row, col - 1);

                 if ( rightCol > col )
                 if ( rightCol > col )

-                    SelectBlock( row, col + 1, row, rightCol );
+                    SelectBlockNoEvent(row, col + 1, row, rightCol);

             }
         }
     }
             }
         }
     }


@@ -573,13 +709,16 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
             if ( m_rowSelection[n] == row )
             {
                 m_rowSelection.RemoveAt(n);
             if ( m_rowSelection[n] == row )
             {
                 m_rowSelection.RemoveAt(n);

-                n--; count--;
+                n--;
+                count--;
+

                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )

-                        SelectBlock( row, 0, row, col - 1 );
+                        SelectBlockNoEvent(row, 0, row, col - 1);

                     if ( col < m_grid->GetNumberCols() - 1 )
                     if ( col < m_grid->GetNumberCols() - 1 )

-                        SelectBlock( row, col + 1, row, m_grid->GetNumberCols() - 1 );
+                        SelectBlockNoEvent( row, col + 1,
+                                     row, m_grid->GetNumberCols() - 1);

                 }
             }
         }
                 }
             }
         }


@@ -594,105 +733,194 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
             if ( m_colSelection[n] == col )
             {
                 m_colSelection.RemoveAt(n);
             if ( m_colSelection[n] == col )
             {
                 m_colSelection.RemoveAt(n);

-                n--; count--;
+                n--;
+                count--;
+

                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )

-                        SelectBlock( 0, col, row - 1, col );
+                        SelectBlockNoEvent(0, col, row - 1, col);

                     if ( row < m_grid->GetNumberRows() - 1 )
                     if ( row < m_grid->GetNumberRows() - 1 )

-                        SelectBlock( row + 1, col, m_grid->GetNumberRows() - 1, col );
+                        SelectBlockNoEvent(row + 1, col,
+                                     m_grid->GetNumberRows() - 1, col);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

-    // Refresh the screen; according to m_selectionMode, we
-    // need to either update only the cell, or the whole row/column.
+    // Refresh the screen and send the event; according to m_selectionMode,
+    // we need to either update only the cell, or the whole row/column.

     wxRect r;
     switch (m_selectionMode)
     {
     wxRect r;
     switch (m_selectionMode)
     {

-      case wxGrid::wxGridSelectCells:
-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                       wxGridCellCoords( row, col ) );
-        break;
-      case wxGrid::wxGridSelectRows:
-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                       wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
-        break;
-      case wxGrid::wxGridSelectColumns:
-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                       wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
-        break;
+        case wxGrid::wxGridSelectCells:
+        {
+            if ( !m_grid->GetBatchCount() )
+            {
+                r = m_grid->BlockToDeviceRect(
+                    wxGridCellCoords( row, col ),
+                    wxGridCellCoords( row, col ) );
+                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+            }
+
+            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                wxEVT_GRID_RANGE_SELECT,
+                m_grid,
+                wxGridCellCoords( row, col ),
+                wxGridCellCoords( row, col ),
+                false,
+                kbd );
+            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+        }
+            break;
+
+        case wxGrid::wxGridSelectRows:
+        {
+            if ( !m_grid->GetBatchCount() )
+            {
+                r = m_grid->BlockToDeviceRect(
+                    wxGridCellCoords( row, 0 ),
+                    wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+            }
+
+            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                wxEVT_GRID_RANGE_SELECT,
+                m_grid,
+                wxGridCellCoords( row, 0 ),
+                wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
+                false,
+                kbd );
+            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+        }
+            break;
+
+        case wxGrid::wxGridSelectColumns:
+        {
+            if ( !m_grid->GetBatchCount() )
+            {
+                r = m_grid->BlockToDeviceRect(
+                    wxGridCellCoords( 0, col ),
+                    wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+              ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+            }
+
+            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                wxEVT_GRID_RANGE_SELECT,
+                m_grid,
+                wxGridCellCoords( 0, col ),
+                wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
+                false,
+                kbd );
+            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+        }
+            break;
+
+        default:
+            break;

     }
     }

-    if ( !m_grid->GetBatchCount() )
-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );

 }
 
 void wxGridSelection::ClearSelection()
 {
 }
 
 void wxGridSelection::ClearSelection()
 {

-    // Should this send deselection events?

     size_t n;
     size_t n;

+    wxRect r;
+    wxGridCellCoords coords1, coords2;

 
 

-    // deselect all invidiual cells and update the screen
+    // deselect all individual cells and update the screen

     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {

-      
-        while( ( n = m_cellSelection.GetCount() ) > 0)
+        while ( ( n = m_cellSelection.GetCount() ) > 0)

         {
         {

-            wxRect r;

             n--;
             n--;

-            r = m_grid->BlockToDeviceRect( m_cellSelection[n],
-                                           m_cellSelection[n] );
+            coords1 = m_cellSelection[n];

             m_cellSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )
             m_cellSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )

-                ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+            {
+                r = m_grid->BlockToDeviceRect( coords1, coords1 );
+                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+
+#ifdef __WXMAC__
+                ((wxWindow *)m_grid->m_gridWin)->Update();
+#endif
+            }

         }
     }
 
     // deselect all blocks and update the screen
         }
     }
 
     // deselect all blocks and update the screen

-    while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
+    while ( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)

     {
     {

-        wxRect r;

         n--;
         n--;

-        r = m_grid->BlockToDeviceRect( m_blockSelectionTopLeft[n],
-                                       m_blockSelectionBottomRight[n] );
+        coords1 = m_blockSelectionTopLeft[n];
+        coords2 = m_blockSelectionBottomRight[n];

         m_blockSelectionTopLeft.RemoveAt(n);
         m_blockSelectionBottomRight.RemoveAt(n);
         if ( !m_grid->GetBatchCount() )
         m_blockSelectionTopLeft.RemoveAt(n);
         m_blockSelectionBottomRight.RemoveAt(n);
         if ( !m_grid->GetBatchCount() )

-            ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );   
+        {
+            r = m_grid->BlockToDeviceRect( coords1, coords2 );
+            ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+
+#ifdef __WXMAC__
+            ((wxWindow *)m_grid->m_gridWin)->Update();
+#endif
+        }

     }
 
     // deselect all rows and update the screen
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {
     }
 
     // deselect all rows and update the screen
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {

-        while( ( n = m_rowSelection.GetCount() ) > 0)
+        while ( ( n = m_rowSelection.GetCount() ) > 0)

         {
             n--;
         {
             n--;

-            int & row = m_rowSelection[n];
-            wxRect r;
-            r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                           wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+            int row = m_rowSelection[n];

             m_rowSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )
             m_rowSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )

-                ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );   
+            {
+                r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
+                                               wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+
+#ifdef __WXMAC__
+                ((wxWindow *)m_grid->m_gridWin)->Update();
+#endif
+            }

         }
     }
 
     // deselect all columns and update the screen
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
         }
     }
 
     // deselect all columns and update the screen
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {

-        while( ( n = m_colSelection.GetCount() ) > 0)
+        while ( ( n = m_colSelection.GetCount() ) > 0)

         {
             n--;
         {
             n--;

-            int & col = m_colSelection[n];
-            wxRect r;
-            r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                           wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+            int col = m_colSelection[n];

             m_colSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )
             m_colSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )

-                ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );   
+            {
+                r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
+                                               wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+
+#ifdef __WXMAC__
+                ((wxWindow *)m_grid->m_gridWin)->Update();
+#endif
+            }

         }
     }
         }
     }

+
+    // One deselection event, indicating deselection of _all_ cells.
+    // (No finer grained events for each of the smaller regions
+    //  deselected above!)
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( 0, 0 ),
+                                    wxGridCellCoords(
+                                        m_grid->GetNumberRows() - 1,
+                                        m_grid->GetNumberCols() - 1 ),
+                                    false );
+
+    m_grid->GetEventHandler()->ProcessEvent(gridEvt);

 }
 
 
 }
 
 


@@ -723,7 +951,8 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
                 {
                     // ...or remove the attribute
                     m_cellSelection.RemoveAt(n);
                 {
                     // ...or remove the attribute
                     m_cellSelection.RemoveAt(n);

-                    n--; count--;
+                    n--;
+                    count--;

                 }
             }
         }
                 }
             }
         }


@@ -736,14 +965,15 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         wxCoord row1 = coords1.GetRow();
         wxCoord row2 = coords2.GetRow();
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         wxCoord row1 = coords1.GetRow();
         wxCoord row2 = coords2.GetRow();

+

         if ((size_t)row2 >= pos)
         {
             if (numRows > 0)
             {
                 // If rows inserted, increase row counter where necessary
         if ((size_t)row2 >= pos)
         {
             if (numRows > 0)
             {
                 // If rows inserted, increase row counter where necessary

-                coords2.SetRow(row2 + numRows);
-                if ( (size_t)row1 >= pos )
-                    coords1.SetRow(row1 + numRows);
+                coords2.SetRow( row2 + numRows );
+                if ((size_t)row1 >= pos)
+                    coords1.SetRow( row1 + numRows );

             }
             else if (numRows < 0)
             {
             }
             else if (numRows < 0)
             {


@@ -751,22 +981,23 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
                 if ((size_t)row2 >= pos - numRows)
                 {
                     // ...either decrement row counter (if row still exists)...
                 if ((size_t)row2 >= pos - numRows)
                 {
                     // ...either decrement row counter (if row still exists)...

-                    coords2.SetRow(row2 + numRows);
-                    if ( (size_t) row1 >= pos)
-                        coords1.SetRow( wxMax(row1 + numRows, (int) pos) );
-                    
+                    coords2.SetRow( row2 + numRows );
+                    if ((size_t)row1 >= pos)
+                        coords1.SetRow( wxMax(row1 + numRows, (int)pos) );
+

                 }
                 else
                 {
                 }
                 else
                 {

-                    if ( (size_t) row1 >= pos)
+                    if ((size_t)row1 >= pos)

                     {
                         // ...or remove the attribute
                         m_blockSelectionTopLeft.RemoveAt(n);
                         m_blockSelectionBottomRight.RemoveAt(n);
                     {
                         // ...or remove the attribute
                         m_blockSelectionTopLeft.RemoveAt(n);
                         m_blockSelectionBottomRight.RemoveAt(n);

-                        n--; count--;
+                        n--;
+                        count--;

                     }
                     else
                     }
                     else

-                        coords2.SetRow(pos);
+                        coords2.SetRow( pos );

                 }
             }
         }
                 }
             }
         }


@@ -775,33 +1006,40 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
     count = m_rowSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
     count = m_rowSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {

-        int & rowOrCol = m_rowSelection[n];
-        if ( (size_t)rowOrCol >= pos )
-        {
-            if ( numRows > 0 )
-            {
-                // If rows inserted, include row counter where necessary
-                rowOrCol += numRows;
-            }
-            else if ( numRows < 0)
-            {
-                // If rows deleted, either decrement row counter (if row still exists)
-                if ((size_t)rowOrCol >= pos - numRows)
-                    rowOrCol += numRows;
-                else
-                {
-                    m_rowSelection.RemoveAt(n);
-                    n--; count--;
-                }
-            }
-        }
+    int  rowOrCol_ = m_rowSelection[n];
+
+      if ((size_t) rowOrCol_ >= pos)
+      {
+          if ( numRows > 0 )
+          {
+              m_rowSelection[n] += numRows;
+          }
+          else if ( numRows < 0 )
+          {
+              if ((size_t)rowOrCol_ >= (pos - numRows))
+                  m_rowSelection[n] += numRows;
+              else
+              {
+                  m_rowSelection.RemoveAt( n );
+                  n--;
+                  count--;
+              }
+          }
+      }

     }
     }

+    // No need to touch selected columns, unless we removed _all_
+    // rows, in this case, we remove all columns from the selection.
+
+    if ( !m_grid->GetNumberRows() )
+        m_colSelection.Clear();

 }
 
 }
 

+

 void wxGridSelection::UpdateCols( size_t pos, int numCols )
 {
     size_t count = m_cellSelection.GetCount();
     size_t n;
 void wxGridSelection::UpdateCols( size_t pos, int numCols )
 {
     size_t count = m_cellSelection.GetCount();
     size_t n;

+

     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords = m_cellSelection[n];
     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords = m_cellSelection[n];


@@ -825,7 +1063,8 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
                 {
                     // ...or remove the attribute
                     m_cellSelection.RemoveAt(n);
                 {
                     // ...or remove the attribute
                     m_cellSelection.RemoveAt(n);

-                    n--; count--;
+                    n--;
+                    count--;

                 }
             }
         }
                 }
             }
         }


@@ -838,13 +1077,14 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         wxCoord col1 = coords1.GetCol();
         wxCoord col2 = coords2.GetCol();
         wxGridCellCoords& coords2 = m_blockSelectionBottomRight[n];
         wxCoord col1 = coords1.GetCol();
         wxCoord col2 = coords2.GetCol();

+

         if ((size_t)col2 >= pos)
         {
             if (numCols > 0)
             {
                 // If rows inserted, increase row counter where necessary
                 coords2.SetCol(col2 + numCols);
         if ((size_t)col2 >= pos)
         {
             if (numCols > 0)
             {
                 // If rows inserted, increase row counter where necessary
                 coords2.SetCol(col2 + numCols);

-                if ( (size_t)col1 >= pos )
+                if ((size_t)col1 >= pos)

                     coords1.SetCol(col1 + numCols);
             }
             else if (numCols < 0)
                     coords1.SetCol(col1 + numCols);
             }
             else if (numCols < 0)


@@ -855,17 +1095,18 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
                     // ...either decrement col counter (if col still exists)...
                     coords2.SetCol(col2 + numCols);
                     if ( (size_t) col1 >= pos)
                     // ...either decrement col counter (if col still exists)...
                     coords2.SetCol(col2 + numCols);
                     if ( (size_t) col1 >= pos)

-                        coords1.SetCol( wxMax(col1 + numCols, (int) pos) );
-                    
+                        coords1.SetCol( wxMax(col1 + numCols, (int)pos) );
+

                 }
                 else
                 {
                 }
                 else
                 {

-                    if ( (size_t) col1 >= pos)
+                    if ((size_t)col1 >= pos)

                     {
                         // ...or remove the attribute
                         m_blockSelectionTopLeft.RemoveAt(n);
                         m_blockSelectionBottomRight.RemoveAt(n);
                     {
                         // ...or remove the attribute
                         m_blockSelectionTopLeft.RemoveAt(n);
                         m_blockSelectionBottomRight.RemoveAt(n);

-                        n--; count--;
+                        n--;
+                        count--;

                     }
                     else
                         coords2.SetCol(pos);
                     }
                     else
                         coords2.SetCol(pos);


@@ -877,27 +1118,30 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
     count = m_colSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
     count = m_colSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {

-        int & rowOrCol = m_colSelection[n];
-        if ( (size_t)rowOrCol >= pos )
+        int   rowOrCol = m_colSelection[n];
+
+        if ((size_t)rowOrCol >= pos)

         {
             if ( numCols > 0 )
         {
             if ( numCols > 0 )

+                m_colSelection[n] += numCols;
+            else if ( numCols < 0 )

             {
             {

-                // If cols inserted, include col counter where necessary
-                rowOrCol += numCols;
-            }
-            else if ( numCols < 0)
-            {
-                // If cols deleted, either decrement col counter (if col still exists)
-                if ((size_t)rowOrCol >= pos - numCols)
-                    rowOrCol += numCols;
+                if ((size_t)rowOrCol >= (pos - numCols))
+                    m_colSelection[n] += numCols;

                 else
                 {
                 else
                 {

-                    m_colSelection.RemoveAt(n);
-                    n--; count--;
+                    m_colSelection.RemoveAt( n );
+                    n--;
+                    count--;

                 }
             }
         }
     }
                 }
             }
         }
     }

+
+    // No need to touch selected rows, unless we removed _all_
+    // columns, in this case, we remove all rows from the selection.
+    if ( !m_grid->GetNumberCols() )
+        m_rowSelection.Clear();

 }
 
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,
 }
 
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,


@@ -914,6 +1158,7 @@ int wxGridSelection::BlockContain( int topRow1, int leftCol1,
     else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 &&
               leftCol2 <= leftCol1 && rightCol1 <= rightCol2 )
         return -1;
     else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 &&
               leftCol2 <= leftCol1 && rightCol1 <= rightCol2 )
         return -1;

+

     return 0;
 }
 
     return 0;
 }