reformat for readability; more prep. for patch 1376506

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 8fcdcde92fe9671fac5b4938bea9d1cfce05f28f..f1d62b07f64764a477ec5f4b0e6734188bb230a9 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -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"
 


@@ -69,7 +65,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 +79,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 +87,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,14 +100,14 @@ 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


@@ -165,7 +161,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,7 +172,7 @@ 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 );

                 }
             }
         }
                 }
             }
         }


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


@@ -222,7 +218,7 @@ void wxGridSelection::SelectRow( int row,
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
             n--; count--;
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
             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,13 +229,13 @@ 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;
+            }

         }
     }
 
         }
     }
 


@@ -259,10 +255,12 @@ void wxGridSelection::SelectRow( int row,
     }
 
     // Update View:
     }
 
     // Update View:

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

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

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

 
     // Send Event
     wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
 
     // Send Event
     wxGridRangeSelectEvent gridEvt( m_grid->GetId(),


@@ -270,7 +268,7 @@ 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 );
 


@@ -303,7 +301,7 @@ void wxGridSelection::SelectCol( int col,
 
     // 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];


@@ -326,13 +324,13 @@ 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;
+            }

         }
     }
 
         }
     }
 


@@ -352,10 +350,12 @@ void wxGridSelection::SelectCol( int col,
     }
 
     // Update View:
     }
 
     // Update View:

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

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

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

 
     // Send Event
     wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
 
     // Send Event
     wxGridRangeSelectEvent gridEvt( m_grid->GetId(),


@@ -363,7 +363,7 @@ 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 );
 


@@ -373,7 +373,7 @@ void wxGridSelection::SelectCol( int col,
 void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                    int bottomRow, int rightCol,
                                    bool ControlDown, bool ShiftDown,
 void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                    int bottomRow, int rightCol,
                                    bool ControlDown, bool ShiftDown,

-                                   bool AltDown, bool MetaDown, 
+                                   bool AltDown, bool MetaDown,

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


@@ -439,14 +439,17 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                coords2.GetRow(), coords2.GetCol(),
                                topRow, leftCol, bottomRow, rightCol ) )
         {
                                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;

         }
     }
 
         }
     }
 


@@ -461,13 +464,16 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                    m_rowSelection[n], m_grid->GetNumberCols()-1,
                                    topRow, leftCol, bottomRow, rightCol ) )
             {
                                    m_rowSelection[n], m_grid->GetNumberCols()-1,
                                    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;

             }
         }
     }
             }
         }
     }


@@ -477,16 +483,19 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
         for ( n = 0; n < count; n++ )
         {
             switch ( BlockContain( 0, m_colSelection[n],
         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;

             }
         }
     }
             }
         }
     }


@@ -494,10 +503,12 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 
     // Update View:
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 
     // Update View:

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

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

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

 
     // Send Event, if not disabled.
     if ( sendEvent )
 
     // Send Event, if not disabled.
     if ( sendEvent )


@@ -507,7 +518,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                         m_grid,
                                         wxGridCellCoords( topRow, leftCol ),
                                         wxGridCellCoords( bottomRow, rightCol ),
                                         m_grid,
                                         wxGridCellCoords( topRow, leftCol ),
                                         wxGridCellCoords( bottomRow, rightCol ),

-                                        TRUE,
+                                        true,

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


@@ -536,10 +547,12 @@ void wxGridSelection::SelectCell( int row, int col,
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:

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

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

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

 
     // Send event
     if (sendEvent)
 
     // Send event
     if (sendEvent)


@@ -549,7 +562,7 @@ void wxGridSelection::SelectCell( int row, int col,
                                         m_grid,
                                         wxGridCellCoords( row, col ),
                                         wxGridCellCoords( row, col ),
                                         m_grid,
                                         wxGridCellCoords( row, col ),
                                         wxGridCellCoords( row, col ),

-                                        TRUE, 
+                                        true,

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


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

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

             {
             {

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

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

-                n--; count--;

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

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

 
                 // Send event
                 wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
 
                 // Send event
                 wxGridRangeSelectEvent gridEvt( m_grid->GetId(),


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


@@ -648,19 +661,19 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
             {
                 if ( topRow < row )
                     SelectBlock( topRow, leftCol, row - 1, rightCol,
             {
                 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 );

             }
         }
     }
             }
         }
     }


@@ -679,11 +692,11 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 {
                     if ( col > 0 )
                         SelectBlock( row, 0, row, col - 1,
                 {
                     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 );

                 }
             }
         }
                 }
             }
         }


@@ -703,11 +716,11 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 {
                     if ( row > 0 )
                         SelectBlock( 0, col, row - 1, col,
                 {
                     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 );

                 }
             }
         }
                 }
             }
         }


@@ -720,16 +733,19 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     {
       case wxGrid::wxGridSelectCells:
       {
     {
       case wxGrid::wxGridSelectCells:
       {

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

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

-              ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+          {
+              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 ),
           wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
                                           wxEVT_GRID_RANGE_SELECT,
                                           m_grid,
                                           wxGridCellCoords( row, col ),
                                           wxGridCellCoords( row, col ),

-                                          FALSE,
+                                          false,

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


@@ -737,16 +753,19 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
       }
       case wxGrid::wxGridSelectRows:
       {
       }
       case wxGrid::wxGridSelectRows:
       {

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

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

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

           wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
                                           wxEVT_GRID_RANGE_SELECT,
                                           m_grid,
                                           wxGridCellCoords( row, 0 ),
                                           wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
           wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
                                           wxEVT_GRID_RANGE_SELECT,
                                           m_grid,
                                           wxGridCellCoords( row, 0 ),
                                           wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),

-                                          FALSE,
+                                          false,

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


@@ -754,16 +773,19 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
       }
       case wxGrid::wxGridSelectColumns:
       {
       }
       case wxGrid::wxGridSelectColumns:
       {

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

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

-              ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+          {
+              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 ),
           wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
                                           wxEVT_GRID_RANGE_SELECT,
                                           m_grid,
                                           wxGridCellCoords( 0, col ),
                                           wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),

-                                          FALSE,
+                                          false,

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


@@ -775,34 +797,44 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
 void wxGridSelection::ClearSelection()
 {
     size_t n;
 void wxGridSelection::ClearSelection()
 {
     size_t n;

+    wxRect r;
+    wxGridCellCoords coords1, coords2;

 
     // deselect all invidiual cells and update the screen
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {
 
     // deselect all invidiual cells and update the screen
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {

-      

         while( ( n = m_cellSelection.GetCount() ) > 0)
         {
         while( ( n = m_cellSelection.GetCount() ) > 0)
         {

-            wxRect r;

             n--;
             n--;

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

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

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

         }
     }
 
     // deselect all blocks and update the screen
     while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
     {
         }
     }
 
     // deselect all blocks and update the screen
     while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
     {

-        wxRect r;

         n--;
         n--;

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

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

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

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


@@ -811,13 +843,17 @@ void wxGridSelection::ClearSelection()
         while( ( n = m_rowSelection.GetCount() ) > 0)
         {
             n--;
         while( ( n = m_rowSelection.GetCount() ) > 0)
         {
             n--;

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

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

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

         }
     }
 
         }
     }
 


@@ -827,13 +863,17 @@ void wxGridSelection::ClearSelection()
         while( ( n = m_colSelection.GetCount() ) > 0)
         {
             n--;
         while( ( n = m_colSelection.GetCount() ) > 0)
         {
             n--;

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

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

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

         }
     }
 
         }
     }
 


@@ -846,7 +886,7 @@ void wxGridSelection::ClearSelection()
                                     wxGridCellCoords( 0, 0 ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1,
                                                       m_grid->GetNumberCols() - 1 ),
                                     wxGridCellCoords( 0, 0 ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1,
                                                       m_grid->GetNumberCols() - 1 ),

-                                    FALSE );
+                                    false );

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


@@ -910,7 +950,7 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
                     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
                 {


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

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

     }
     // No need to touch selected columns, unless we removed _all_
     // rows, in this case, we remove all columns from the selection.
     }
     // No need to touch selected columns, unless we removed _all_
     // rows, in this case, we remove all columns from the selection.

+

     if ( !m_grid->GetNumberRows() )
         m_colSelection.Clear();
 }
 
     if ( !m_grid->GetNumberRows() )
         m_colSelection.Clear();
 }
 

+

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


@@ -1016,7 +1058,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
                     coords2.SetCol(col2 + numCols);
                     if ( (size_t) col1 >= pos)
                         coords1.SetCol( wxMax(col1 + numCols, (int) pos) );
                     coords2.SetCol(col2 + numCols);
                     if ( (size_t) col1 >= pos)
                         coords1.SetCol( wxMax(col1 + numCols, (int) pos) );

-                    
+

                 }
                 else
                 {
                 }
                 else
                 {


@@ -1037,26 +1079,25 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
     count = m_colSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
     count = m_colSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {

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

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

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

             {
             {

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

                 else
                 {
                 else
                 {

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

                 }
             }
         }
                 }
             }
         }

+

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


@@ -1065,6 +1106,7 @@ 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,


@@ -1083,4 +1125,3 @@ int wxGridSelection::BlockContain( int topRow1, int leftCol1,
 }
 
 #endif
 }
 
 #endif

-