missing commit

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 317b5038e175de9d4653085ebbd3e3184747fd11..bf449f7c4280462f7eafa6f5e9805080d9542c69 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGridSelection
 // Author:      Stefan Neis
 // Modified by:
 // Purpose:     wxGridSelection
 // Author:      Stefan Neis
 // Modified by:


@@ -9,6 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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 wxUSE_GRID
 
 #include "wx/generic/gridsel.h"
 
 #if wxUSE_GRID
 
 #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)


@@ -148,8 +144,8 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                 SelectCol( col );
         }
 
                 SelectCol( col );
         }
 

-        for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++)

         // Note that m_blockSelectionTopLeft's size may be changing!
         // Note that m_blockSelectionTopLeft's size may be changing!

+        for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++)

         {
             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();
         {
             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();


@@ -157,15 +153,15 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
             coords = m_blockSelectionBottomRight[n];
             int bottomRow = coords.GetRow();
             int rightCol = 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,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent( topRow, 0,
+                                 bottomRow, m_grid->GetNumberCols() - 1);

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


@@ -174,22 +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,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(0, leftCol,
+                                 m_grid->GetNumberRows() - 1, rightCol);

                 }
             }
         }
                 }
             }
         }

+

         m_selectionMode = selmode;
     }
 }
 
         m_selectionMode = selmode;
     }
 }
 

-void wxGridSelection::SelectRow( int row,
-                                 bool ControlDown,  bool ShiftDown,
-                                 bool AltDown, bool MetaDown )
+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.


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

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

             }
         }
     }
             }
         }
     }


@@ -211,6 +207,7 @@ void wxGridSelection::SelectRow( int row,
     // 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];


@@ -221,7 +218,8 @@ void wxGridSelection::SelectRow( int row,
         {
             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 )


@@ -273,15 +271,12 @@ void wxGridSelection::SelectRow( int row,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
                                     true,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
                                     true,

-                                    ControlDown,  ShiftDown,
-                                    AltDown, MetaDown );
+                                    kbd);

 
 

-    m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+    m_grid->GetEventHandler()->ProcessEvent( gridEvt );

 }
 
 }
 

-void wxGridSelection::SelectCol( int col,
-                                 bool ControlDown,  bool ShiftDown,
-                                 bool AltDown, bool MetaDown )
+void wxGridSelection::SelectCol(int col, const wxKeyboardState& kbd)

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


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

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

             }
         }
     }
             }
         }
     }


@@ -316,7 +312,8 @@ void wxGridSelection::SelectCol( int col,
         {
             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 )


@@ -368,29 +365,43 @@ void wxGridSelection::SelectCol( int col,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
                                     true,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
                                     true,

-                                    ControlDown,  ShiftDown,
-                                    AltDown, MetaDown );
+                                    kbd );

 
 

-    m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+    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,

-                                   bool ControlDown, bool ShiftDown,
-                                   bool AltDown, bool MetaDown,
+                                   const wxKeyboardState& kbd,

                                    bool sendEvent )
 {
     // Fix the coordinates of the block if needed.
                                    bool sendEvent )
 {
     // Fix the coordinates of the block if needed.

-    if ( m_selectionMode == wxGrid::wxGridSelectRows )
+    switch ( m_selectionMode )

     {
     {

-        leftCol = 0;
-        rightCol = m_grid->GetNumberCols() - 1;
-    }
-    else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
-    {
-        topRow = 0;
-        bottomRow = m_grid->GetNumberRows() - 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;

     }
     }

+

     if ( topRow > bottomRow )
     {
         int temp = topRow;
     if ( topRow > bottomRow )
     {
         int temp = topRow;


@@ -411,92 +422,153 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     //  grid only has 1 col)
     if ( m_selectionMode == wxGrid::wxGridSelectCells &&
          topRow == bottomRow && leftCol == rightCol )
     //  grid only has 1 col)
     if ( m_selectionMode == wxGrid::wxGridSelectCells &&
          topRow == bottomRow && leftCol == rightCol )

-        SelectCell( topRow, leftCol, ControlDown,  ShiftDown,
-                    AltDown, MetaDown, sendEvent );
+    {
+        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 )
+
+    if ( m_selectionMode == wxGrid::wxGridSelectRows )

     {
     {

-        count = m_cellSelection.GetCount();
-        for ( n = 0; n < count; n++ )
+        // find out which rows are already selected:
+        wxArrayInt alreadyselected;
+        alreadyselected.Add(0,bottomRow-topRow+1);
+        for( n = 0; n < m_rowSelection.GetCount(); n++)

         {
         {

-            wxGridCellCoords& coords = m_cellSelection[n];
-            if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol,
-                                    coords.GetRow(), coords.GetCol() ) )
+            int row = m_rowSelection[n];
+            if( (row >= topRow) && (row <= bottomRow) )

             {
             {

-                m_cellSelection.RemoveAt(n);
-                n--; count--;
+                alreadyselected[ row - topRow ]=1;

             }
         }
             }
         }

-    }

 
 

-    // If a block containing the selection is already selected, return,
-    // if a block contained in the selection is found, remove it.
-
-    count = m_blockSelectionTopLeft.GetCount();
-    for ( n = 0; n < count; 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 ) )
+        // add the newly selected rows:
+        for ( int row = topRow; row <= bottomRow; row++ )

         {
         {

-          case 1:
-            return;
-          case -1:
-            m_blockSelectionTopLeft.RemoveAt(n);
-            m_blockSelectionBottomRight.RemoveAt(n);
-            n--; count--;
-          default:
-            ;
+            if ( alreadyselected[ row - topRow ] == 0 )
+            {
+                m_rowSelection.Add( row );
+            }

         }
     }
         }
     }

+    else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
+    {
+        // find out which columns are already selected:
+        wxArrayInt alreadyselected;
+        alreadyselected.Add(0,rightCol-leftCol+1);
+        for( n = 0; n < m_colSelection.GetCount(); n++)
+        {
+            int col = m_colSelection[n];
+            if( (col >= leftCol) && (col <= rightCol) )
+            {
+                alreadyselected[ col - leftCol ]=1;
+            }
+        }

 
 

-    // If a row containing the selection is already selected, return,
-    // if a row contained in newly selected block is found, remove it.
-    if ( m_selectionMode != wxGrid::wxGridSelectColumns )
+        // add the newly selected columns:
+        for ( int col = leftCol; col <= rightCol; col++ )
+        {
+            if ( alreadyselected[ col - leftCol ] == 0 )
+            {
+                m_colSelection.Add( col );
+            }
+        }
+    }
+    else

     {
     {

+        // Remove single cells contained in newly selected block.
+        if ( m_selectionMode == wxGrid::wxGridSelectCells )
+        {
+            count = m_cellSelection.GetCount();
+            for ( n = 0; n < count; n++ )
+            {
+                wxGridCellCoords& coords = m_cellSelection[n];
+                if ( BlockContainsCell( topRow, leftCol, bottomRow, rightCol,
+                                        coords.GetRow(), coords.GetCol() ) )
+                {
+                    m_cellSelection.RemoveAt(n);
+                    n--;
+                    count--;
+                }
+            }
+        }
+
+        // If a block containing the selection is already selected, return,
+        // if a block contained in the selection is found, remove it.
+
+        count = m_blockSelectionTopLeft.GetCount();
+        for ( n = 0; n < count; 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 ) )
+            {
+                case 1:
+                    return;
+
+                case -1:
+                    m_blockSelectionTopLeft.RemoveAt(n);
+                    m_blockSelectionBottomRight.RemoveAt(n);
+                    n--;
+                    count--;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        // If a row containing the selection is already selected, return,
+        // if a row contained in newly selected block is found, remove it.

         count = m_rowSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( m_rowSelection[n], 0,
         count = m_rowSelection.GetCount();
         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 )
-    {
+
+        // Same for columns.

         count = m_colSelection.GetCount();
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( 0, m_colSelection[n],
         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 ) );

 
 

+        m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) );
+        m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
+    }

     // Update View:
     if ( !m_grid->GetBatchCount() )
     {
     // Update View:
     if ( !m_grid->GetBatchCount() )
     {


@@ -509,43 +581,49 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     if ( sendEvent )
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
     if ( sendEvent )
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),

-                                        wxEVT_GRID_RANGE_SELECT,
-                                        m_grid,
-                                        wxGridCellCoords( topRow, leftCol ),
-                                        wxGridCellCoords( bottomRow, rightCol ),
-                                        true,
-                                        ControlDown, ShiftDown,
-                                        AltDown, MetaDown );
-        m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+            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,

-                                  bool ControlDown, bool ShiftDown,
-                                  bool AltDown, bool MetaDown,
+                                  const wxKeyboardState& kbd,

                                   bool sendEvent )
 {
                                   bool sendEvent )
 {

+    if ( IsInSelection ( row, col ) )
+        return;
+
+    wxGridCellCoords selectedTopLeft, selectedBottomRight;

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

-        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
-                    ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
-        return;
+        m_rowSelection.Add( row );
+        selectedTopLeft = wxGridCellCoords( row, 0 );
+        selectedBottomRight = wxGridCellCoords( row, m_grid->GetNumberCols() - 1 );

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

-        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
-                    ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
-        return;
+        m_colSelection.Add( col );
+        selectedTopLeft = wxGridCellCoords( 0, col );
+        selectedBottomRight = wxGridCellCoords( m_grid->GetNumberRows() - 1, col );
+    }
+    else
+    {
+        m_cellSelection.Add( wxGridCellCoords( row, col ) );
+        selectedTopLeft = wxGridCellCoords( row, col );
+        selectedBottomRight = wxGridCellCoords( row, col );

     }
     }

-    else if ( IsInSelection ( row, col ) )
-        return;
-    m_cellSelection.Add( wxGridCellCoords( row, col ) );

 
     // Update View:
     if ( !m_grid->GetBatchCount() )
     {
 
     // Update View:
     if ( !m_grid->GetBatchCount() )
     {

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

         ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
     }
 
         ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
     }
 


@@ -553,26 +631,25 @@ void wxGridSelection::SelectCell( int row, int col,
     if (sendEvent)
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
     if (sendEvent)
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),

-                                        wxEVT_GRID_RANGE_SELECT,
-                                        m_grid,
-                                        wxGridCellCoords( row, col ),
-                                        wxGridCellCoords( row, col ),
-                                        true,
-                                        ControlDown, ShiftDown,
-                                        AltDown, MetaDown);
-        m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+            wxEVT_GRID_RANGE_SELECT,
+            m_grid,
+            selectedTopLeft,
+            selectedBottomRight,
+            true,
+            kbd);
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );

     }
 }
 
     }
 }
 

-void wxGridSelection::ToggleCellSelection( int row, int col,
-                                           bool ControlDown, bool ShiftDown,
-                                           bool AltDown, bool MetaDown )
+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, ControlDown, ShiftDown,
-                    AltDown, MetaDown );
+        SelectCell(row, col, kbd);
+

         return;
     }
 
         return;
     }
 


@@ -590,8 +667,8 @@ 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() )

             {
                 wxGridCellCoords coords = m_cellSelection[n];
                 m_cellSelection.RemoveAt(n);
             {
                 wxGridCellCoords coords = m_cellSelection[n];
                 m_cellSelection.RemoveAt(n);


@@ -608,9 +685,9 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),
                                                 false,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),
                                                 false,

-                                                ControlDown, ShiftDown,
-                                                AltDown, MetaDown );
-                m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+                                                kbd );
+                m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+

                 return;
             }
         }
                 return;
             }
         }


@@ -637,42 +714,42 @@ 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,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(topRow, leftCol, row - 1, rightCol);

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

-                    SelectBlock( row + 1, leftCol, bottomRow, rightCol,
-                                 false, false, false, false, false );
+                    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,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(row, leftCol, row, col - 1);

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

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

             }
         }
     }
 
             }
         }
     }
 

+    bool rowSelectionWasChanged = false;

     // remove a cell from a row, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {
     // remove a cell from a row, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {


@@ -682,21 +759,24 @@ 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--;
+
+                rowSelectionWasChanged = true;
+

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

-                        SelectBlock( row, 0, row, col - 1,
-                                     false, false, false, false, false );
+                        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,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent( row, col + 1,
+                                     row, m_grid->GetNumberCols() - 1);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

+    bool colSelectionWasChanged = false;

     // remove a cell from a column, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
     // remove a cell from a column, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {


@@ -706,16 +786,18 @@ 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--;
+
+                colSelectionWasChanged = true;
+

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

-                        SelectBlock( 0, col, row - 1, col,
-                                     false, false, false, false, false );
+                        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,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent(row + 1, col,
+                                     m_grid->GetNumberRows() - 1, col);

                 }
             }
         }
                 }
             }
         }


@@ -724,68 +806,92 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     // 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;
     // 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)
+    if ( m_selectionMode == wxGrid::wxGridSelectCells )

     {
     {

-      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 );
-          }
+        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,
-                                          ControlDown, ShiftDown,
-                                          AltDown, MetaDown );
-          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, col ),
+            wxGridCellCoords( row, col ),
+            false,
+            kbd );
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+    }
+    else  // rows/columns selection mode
+    {
+        if ( m_selectionMode != wxGrid::wxGridSelectColumns &&
+                rowSelectionWasChanged )
+        {
+            int numCols = m_grid->GetNumberCols();
+            for ( int colFrom = 0, colTo = 0; colTo <= numCols; ++colTo )
+            {
+                if ( m_colSelection.Index(colTo) >= 0 || colTo == numCols )
+                {
+                    if ( colFrom < colTo )
+                    {
+                        if ( !m_grid->GetBatchCount() )
+                        {
+                            r = m_grid->BlockToDeviceRect(
+                                wxGridCellCoords( row, colFrom ),
+                                wxGridCellCoords( row, colTo-1 ) );
+                            ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+                        }
+
+                        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                            wxEVT_GRID_RANGE_SELECT,
+                            m_grid,
+                            wxGridCellCoords( row, colFrom ),
+                            wxGridCellCoords( row, colTo - 1 ),
+                            false,
+                            kbd );
+                        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    }

 
 

-          wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
-                                          wxEVT_GRID_RANGE_SELECT,
-                                          m_grid,
-                                          wxGridCellCoords( row, 0 ),
-                                          wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
-                                          false,
-                                          ControlDown, ShiftDown,
-                                          AltDown, MetaDown );
-          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 );
-          }
+                    colFrom = colTo + 1;
+                }
+            }
+        }

 
 

-          wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
-                                          wxEVT_GRID_RANGE_SELECT,
-                                          m_grid,
-                                          wxGridCellCoords( 0, col ),
-                                          wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
-                                          false,
-                                          ControlDown, ShiftDown,
-                                          AltDown, MetaDown );
-          m_grid->GetEventHandler()->ProcessEvent(gridEvt);
-          break;
-      }
+        if ( m_selectionMode != wxGrid::wxGridSelectRows &&
+                colSelectionWasChanged )
+        {
+            int numRows = m_grid->GetNumberRows();
+            for ( int rowFrom = 0, rowTo = 0; rowTo <= numRows; ++rowTo )
+            {
+                if ( m_rowSelection.Index(rowTo) >= 0 || rowTo == numRows )
+                {
+                    if (rowFrom < rowTo)
+                    {
+                        if ( !m_grid->GetBatchCount() )
+                        {
+                            r = m_grid->BlockToDeviceRect(
+                                wxGridCellCoords( rowFrom, col ),
+                                wxGridCellCoords( rowTo - 1, col ) );
+                          ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+                        }
+
+                        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                            wxEVT_GRID_RANGE_SELECT,
+                            m_grid,
+                            wxGridCellCoords( rowFrom, col ),
+                            wxGridCellCoords( rowTo - 1, col ),
+                            false,
+                            kbd );
+                        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    }
+
+                    rowFrom = rowTo + 1;
+                }
+            }
+        }

     }
 }
 
     }
 }
 


@@ -795,10 +901,10 @@ void wxGridSelection::ClearSelection()
     wxRect r;
     wxGridCellCoords coords1, coords2;
 
     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)

         {
             n--;
             coords1 = m_cellSelection[n];
         {
             n--;
             coords1 = m_cellSelection[n];


@@ -807,12 +913,16 @@ void wxGridSelection::ClearSelection()
             {
                 r = m_grid->BlockToDeviceRect( coords1, coords1 );
                 ((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)

     {
         n--;
         coords1 = m_blockSelectionTopLeft[n];
     {
         n--;
         coords1 = m_blockSelectionTopLeft[n];


@@ -823,13 +933,17 @@ void wxGridSelection::ClearSelection()
         {
             r = m_grid->BlockToDeviceRect( coords1, coords2 );
             ((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--;
             int row = m_rowSelection[n];
         {
             n--;
             int row = m_rowSelection[n];


@@ -839,6 +953,10 @@ void wxGridSelection::ClearSelection()
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
                                                wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
                 ((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

             }
         }
     }
             }
         }
     }


@@ -846,7 +964,7 @@ void wxGridSelection::ClearSelection()
     // 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--;
             int col = m_colSelection[n];
         {
             n--;
             int col = m_colSelection[n];


@@ -856,6 +974,10 @@ void wxGridSelection::ClearSelection()
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
                                                wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
                 ((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

             }
         }
     }
             }
         }
     }


@@ -867,8 +989,9 @@ void wxGridSelection::ClearSelection()
                                     wxEVT_GRID_RANGE_SELECT,
                                     m_grid,
                                     wxGridCellCoords( 0, 0 ),
                                     wxEVT_GRID_RANGE_SELECT,
                                     m_grid,
                                     wxGridCellCoords( 0, 0 ),

-                                    wxGridCellCoords( m_grid->GetNumberRows() - 1,
-                                                      m_grid->GetNumberCols() - 1 ),
+                                    wxGridCellCoords(
+                                        m_grid->GetNumberRows() - 1,
+                                        m_grid->GetNumberCols() - 1 ),

                                     false );
 
     m_grid->GetEventHandler()->ProcessEvent(gridEvt);
                                     false );
 
     m_grid->GetEventHandler()->ProcessEvent(gridEvt);


@@ -902,7 +1025,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--;

                 }
             }
         }
                 }
             }
         }


@@ -915,14 +1039,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)
             {


@@ -930,22 +1055,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 );

                 }
             }
         }
                 }
             }
         }


@@ -954,21 +1080,21 @@ 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 ];
+    int  rowOrCol_ = m_rowSelection[n];

 
 

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

       {
           if ( numRows > 0 )
           {
       {
           if ( numRows > 0 )
           {

-              m_rowSelection [ n ] += numRows;
+              m_rowSelection[n] += numRows;

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

-              if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) )
-                  m_rowSelection [ n ] += numRows;
+              if ((size_t)rowOrCol_ >= (pos - numRows))
+                  m_rowSelection[n] += numRows;

               else
               {
               else
               {

-                  m_rowSelection.RemoveAt ( n );
+                  m_rowSelection.RemoveAt( n );

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


@@ -987,6 +1113,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
 {
     size_t count = m_cellSelection.GetCount();
     size_t n;
 {
     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];


@@ -1010,7 +1137,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--;

                 }
             }
         }
                 }
             }
         }


@@ -1023,13 +1151,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)


@@ -1040,17 +1169,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);


@@ -1062,25 +1192,24 @@ 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];

 
 

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

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

-                m_colSelection [ n ] += numCols;
+                m_colSelection[n] += numCols;

             else if ( numCols < 0 )
             {
             else if ( numCols < 0 )
             {

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

                 else
                 {
                 else
                 {

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

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

-

     }
 
     // No need to touch selected rows, unless we removed _all_
     }
 
     // No need to touch selected rows, unless we removed _all_


@@ -1089,7 +1218,6 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
         m_rowSelection.Clear();
 }
 
         m_rowSelection.Clear();
 }
 

-

 int wxGridSelection::BlockContain( int topRow1, int leftCol1,
                                    int bottomRow1, int rightCol1,
                                    int topRow2, int leftCol2,
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,
                                    int bottomRow1, int rightCol1,
                                    int topRow2, int leftCol2,


@@ -1104,6 +1232,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;
 }