using new API (no visual difference)

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 6877aefa6e6ab40af7e94c6c466b158dcb7b4adf..c81506448412226922bb36e6c20b91aca4778cd3 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -6,7 +6,7 @@
 // Created:     20/02/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)
 // Created:     20/02/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // 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"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -34,6 +30,7 @@
 
 #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 +53,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;
 


@@ -69,7 +66,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         {
             wxGridCellCoords& coords = m_cellSelection[n];
             if ( row == coords.GetRow() && col == coords.GetCol() )
         {
             wxGridCellCoords& coords = m_cellSelection[n];
             if ( row == coords.GetRow() && col == coords.GetCol() )

-                return TRUE;
+                return true;

         }
     }
 
         }
     }
 


@@ -83,7 +80,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         if ( BlockContainsCell(coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                row, col ) )
         if ( BlockContainsCell(coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                row, col ) )

-            return TRUE;
+            return true;

     }
 
     // Now check whether the given cell is
     }
 
     // Now check whether the given cell is


@@ -91,11 +88,11 @@ 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] )

-              return TRUE;
+              return true;

         }
     }
 
         }
     }
 


@@ -104,18 +101,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] )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( col == m_colSelection[n] )

-              return TRUE;
+              return true;

         }
     }
         }
     }

-    return FALSE;
+
+    return false;

 }
 
 // Change the selection mode
 }
 
 // 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 +146,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,6 +155,7 @@ 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 )
             if (selmode == wxGrid::wxGridSelectRows)
             {
                 if (leftCol != 0 || rightCol != m_grid->GetNumberCols() - 1 )


@@ -165,7 +164,7 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( topRow, 0,
                                  bottomRow, m_grid->GetNumberCols() - 1,
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( topRow, 0,
                                  bottomRow, m_grid->GetNumberCols() - 1,

-                                 FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 false, false, false, false, false );

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


@@ -176,10 +175,11 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( 0, leftCol,
                                  m_grid->GetNumberRows() - 1, rightCol,
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( 0, leftCol,
                                  m_grid->GetNumberRows() - 1, rightCol,

-                                 FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 false, false, false, false, false );

                 }
             }
         }
                 }
             }
         }

+

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


@@ -190,6 +190,7 @@ void wxGridSelection::SelectRow( int row,
 {
     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,14 +204,16 @@ 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--;

             }
         }
     }
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
             }
         }
     }
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();

-    bool done = FALSE;
+    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 +224,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 )


@@ -233,12 +237,12 @@ void wxGridSelection::SelectRow( int row,
             else if ( coords1.GetRow() == row + 1)
             {
                 coords1.SetRow(row);
             else if ( coords1.GetRow() == row + 1)
             {
                 coords1.SetRow(row);

-                done = TRUE;
+                done = true;

             }
             else if ( coords2.GetRow() == row - 1)
             {
                 coords2.SetRow(row);
             }
             else if ( coords2.GetRow() == row - 1)
             {
                 coords2.SetRow(row);

-                done = TRUE;
+                done = true;

             }
         }
     }
             }
         }
     }


@@ -263,7 +267,7 @@ void wxGridSelection::SelectRow( int row,
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
                                               wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
                                               wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );

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

     }
 
     // Send Event
     }
 
     // Send Event


@@ -272,11 +276,11 @@ void wxGridSelection::SelectRow( int row,
                                     m_grid,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
                                     m_grid,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),

-                                    TRUE,
+                                    true,

                                     ControlDown,  ShiftDown,
                                     AltDown, MetaDown );
 
                                     ControlDown,  ShiftDown,
                                     AltDown, MetaDown );
 

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

 }
 
 void wxGridSelection::SelectCol( int col,
 }
 
 void wxGridSelection::SelectCol( int col,


@@ -298,14 +302,15 @@ 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--;

             }
         }
     }
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
             }
         }
     }
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();

-    bool done = FALSE;
+    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];


@@ -316,7 +321,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 )


@@ -328,12 +334,12 @@ void wxGridSelection::SelectCol( int col,
             else if ( coords1.GetCol() == col + 1)
             {
                 coords1.SetCol(col);
             else if ( coords1.GetCol() == col + 1)
             {
                 coords1.SetCol(col);

-                done = TRUE;
+                done = true;

             }
             else if ( coords2.GetCol() == col - 1)
             {
                 coords2.SetCol(col);
             }
             else if ( coords2.GetCol() == col - 1)
             {
                 coords2.SetCol(col);

-                done = TRUE;
+                done = true;

             }
         }
     }
             }
         }
     }


@@ -358,7 +364,7 @@ void wxGridSelection::SelectCol( int col,
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
                                               wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
                                               wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );

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

     }
 
     // Send Event
     }
 
     // Send Event


@@ -367,11 +373,11 @@ void wxGridSelection::SelectCol( int col,
                                     m_grid,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
                                     m_grid,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),

-                                    TRUE,
+                                    true,

                                     ControlDown,  ShiftDown,
                                     AltDown, MetaDown );
 
                                     ControlDown,  ShiftDown,
                                     AltDown, MetaDown );
 

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

 }
 
 void wxGridSelection::SelectBlock( int topRow, int leftCol,
 }
 
 void wxGridSelection::SelectBlock( int topRow, int leftCol,


@@ -391,6 +397,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
         topRow = 0;
         bottomRow = m_grid->GetNumberRows() - 1;
     }
         topRow = 0;
         bottomRow = m_grid->GetNumberRows() - 1;
     }

+

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


@@ -411,10 +418,13 @@ 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, ControlDown,  ShiftDown,
                     AltDown, MetaDown, 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 )
     {


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

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

             }
         }
     }
             }
         }
     }


@@ -439,18 +450,23 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     {
         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;

         }
     }
 
         }
     }
 


@@ -462,38 +478,48 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
         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 ) );
 
     m_blockSelectionTopLeft.Add( wxGridCellCoords( topRow, leftCol ) );
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 


@@ -502,21 +528,21 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ),
                                               wxGridCellCoords( bottomRow, rightCol ) );
     {
         wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ),
                                               wxGridCellCoords( bottomRow, rightCol ) );

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

     }
 
     // Send Event, if not disabled.
     if ( sendEvent )
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
     }
 
     // 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,
-                                        ControlDown, ShiftDown,
-                                        AltDown, MetaDown );
-        m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+            wxEVT_GRID_RANGE_SELECT,
+            m_grid,
+            wxGridCellCoords( topRow, leftCol ),
+            wxGridCellCoords( bottomRow, rightCol ),
+            true,
+            ControlDown, ShiftDown,
+            AltDown, MetaDown );
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );

     }
 }
 
     }
 }
 


@@ -529,38 +555,42 @@ void wxGridSelection::SelectCell( int row, int col,
     {
         SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
                     ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
     {
         SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
                     ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);

+

         return;
     }
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     {
         SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
                     ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
         return;
     }
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     {
         SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
                     ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);

+

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

+

     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:
     if ( !m_grid->GetBatchCount() )
     {
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:
     if ( !m_grid->GetBatchCount() )
     {

-        wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                              wxGridCellCoords( row, col ) );
-        ((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 );

     }
 
     // Send event
     if (sendEvent)
     {
         wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
     }
 
     // Send event
     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,
+            wxGridCellCoords( row, col ),
+            wxGridCellCoords( row, col ),
+            true,
+            ControlDown, ShiftDown,
+            AltDown, MetaDown );
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );

     }
 }
 
     }
 }
 


@@ -571,8 +601,8 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     // 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, ControlDown, ShiftDown, AltDown, MetaDown );
+

         return;
     }
 
         return;
     }
 


@@ -590,15 +620,15 @@ 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);
                 if ( !m_grid->GetBatchCount() )
                 {
                     wxRect r = m_grid->BlockToDeviceRect( coords, coords );
             {
                 wxGridCellCoords coords = m_cellSelection[n];
                 m_cellSelection.RemoveAt(n);
                 if ( !m_grid->GetBatchCount() )
                 {
                     wxRect r = m_grid->BlockToDeviceRect( coords, coords );

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

                 }
 
                 // Send event
                 }
 
                 // Send event


@@ -607,10 +637,11 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                                                 m_grid,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),
                                                 m_grid,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),

-                                                FALSE,
+                                                false,

                                                 ControlDown, ShiftDown,
                                                 AltDown, MetaDown );
                                                 ControlDown, ShiftDown,
                                                 AltDown, MetaDown );

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

                 return;
             }
         }
                 return;
             }
         }


@@ -637,38 +668,41 @@ 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 )
                     SelectBlock( topRow, leftCol, row - 1, rightCol,
             // 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 );
+                                 false, false, false, false, false );

                 if ( bottomRow > row )
                     SelectBlock( row + 1, leftCol, bottomRow, rightCol,
                 if ( bottomRow > row )
                     SelectBlock( row + 1, leftCol, bottomRow, rightCol,

-                                 FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 false, false, false, false, false );

             }
             }

+

             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )
                     SelectBlock( row, leftCol, row, col - 1,
             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )
                     SelectBlock( row, leftCol, row, col - 1,

-                                 FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 false, false, false, false, false );

                 if ( rightCol > col )
                     SelectBlock( row, col + 1, row, rightCol,
                 if ( rightCol > col )
                     SelectBlock( row, col + 1, row, rightCol,

-                                 FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 false, false, false, false, false );

             }
         }
     }
             }
         }
     }


@@ -682,16 +716,18 @@ 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 )
                         SelectBlock( row, 0, row, col - 1,
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )
                         SelectBlock( row, 0, row, col - 1,

-                                     FALSE, FALSE, FALSE, FALSE, FALSE );
+                                     false, false, false, false, false );

                     if ( col < m_grid->GetNumberCols() - 1 )
                         SelectBlock( row, col + 1,
                                      row, m_grid->GetNumberCols() - 1,
                     if ( col < m_grid->GetNumberCols() - 1 )
                         SelectBlock( row, col + 1,
                                      row, m_grid->GetNumberCols() - 1,

-                                     FALSE, FALSE, FALSE, FALSE, FALSE );
+                                     false, false, false, false, false );

                 }
             }
         }
                 }
             }
         }


@@ -706,16 +742,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--;
+

                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )
                         SelectBlock( 0, col, row - 1, col,
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )
                         SelectBlock( 0, col, row - 1, col,

-                                     FALSE, FALSE, FALSE, FALSE, FALSE );
+                                     false, false, false, false, false );

                     if ( row < m_grid->GetNumberRows() - 1 )
                         SelectBlock( row + 1, col,
                                      m_grid->GetNumberRows() - 1, col,
                     if ( row < m_grid->GetNumberRows() - 1 )
                         SelectBlock( row + 1, col,
                                      m_grid->GetNumberRows() - 1, col,

-                                     FALSE, FALSE, FALSE, FALSE, FALSE );
+                                     false, false, false, false, false );

                 }
             }
         }
                 }
             }
         }


@@ -726,66 +764,74 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     wxRect r;
     switch (m_selectionMode)
     {
     wxRect r;
     switch (m_selectionMode)
     {

-      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 );
-          }
+        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,
-                                          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,
+                ControlDown, ShiftDown,
+                AltDown, MetaDown );
+            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+        }
+            break;

 
 

-          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 );
-          }
+        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( 0, col ),
-                                          wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
-                                          FALSE,
-                                          ControlDown, ShiftDown,
-                                          AltDown, MetaDown );
-          m_grid->GetEventHandler()->ProcessEvent(gridEvt);
-          break;
-      }
+            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 );
+            }
+
+            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;
+
+        default:
+            break;

     }
 }
 
     }
 }
 


@@ -795,10 +841,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];


@@ -806,13 +852,17 @@ void wxGridSelection::ClearSelection()
             if ( !m_grid->GetBatchCount() )
             {
                 r = m_grid->BlockToDeviceRect( coords1, coords1 );
             if ( !m_grid->GetBatchCount() )
             {
                 r = m_grid->BlockToDeviceRect( coords1, coords1 );

-                ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+                ((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];


@@ -822,14 +872,18 @@ void wxGridSelection::ClearSelection()
         if ( !m_grid->GetBatchCount() )
         {
             r = m_grid->BlockToDeviceRect( coords1, coords2 );
         if ( !m_grid->GetBatchCount() )
         {
             r = m_grid->BlockToDeviceRect( coords1, coords2 );

-            ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+            ((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];


@@ -838,7 +892,11 @@ void wxGridSelection::ClearSelection()
             {
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
                                                wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
             {
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
                                                wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );

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

             }
         }
     }
             }
         }
     }


@@ -846,7 +904,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];


@@ -855,7 +913,11 @@ void wxGridSelection::ClearSelection()
             {
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
                                                wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
             {
                 r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
                                                wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );

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

             }
         }
     }
             }
         }
     }


@@ -867,9 +929,10 @@ 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 ),
-                                    FALSE );
+                                    wxGridCellCoords(
+                                        m_grid->GetNumberRows() - 1,
+                                        m_grid->GetNumberCols() - 1 ),
+                                    false );

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


@@ -902,7 +965,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 +979,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 +995,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 +1020,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 +1053,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 +1077,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 +1091,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 +1109,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 +1132,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 +1158,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 +1172,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;
 }