More name changes

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index bac2f8950bd93ff17fa08dcea3d7f98d3c4cce35..d7487cb1df5d725f0db3e4f7c327051b6508b213 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "gridsel.h"
 #endif
 
@@ -30,7 +30,7 @@
     #pragma hdrstop
 #endif
 
-#if defined(wxUSE_NEW_GRID) && (wxUSE_NEW_GRID)
+#if wxUSE_GRID
 
 #include "wx/generic/gridsel.h"
 
@@ -222,7 +222,7 @@ void wxGridSelection::SelectRow( int row,
             m_blockSelectionTopLeft.RemoveAt(n);
             m_blockSelectionBottomRight.RemoveAt(n);
             n--; count--;
-        }       
+        }
         else if ( coords1.GetCol() == 0  &&
                   coords2.GetCol() == m_grid->GetNumberCols() - 1 )
         {
@@ -239,7 +239,7 @@ void wxGridSelection::SelectRow( int row,
             {
                 coords2.SetRow(row);
                 done = TRUE;
-            }           
+            }
         }
     }
 
@@ -259,10 +259,12 @@ void wxGridSelection::SelectRow( int row,
     }
 
     // Update View:
-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                          wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
     if ( !m_grid->GetBatchCount() )
+    {
+        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(),
@@ -332,7 +334,7 @@ void wxGridSelection::SelectCol( int col,
             {
                 coords2.SetCol(col);
                 done = TRUE;
-            }           
+            }
         }
     }
 
@@ -352,10 +354,12 @@ void wxGridSelection::SelectCol( int col,
     }
 
     // Update View:
-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                          wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
     if ( !m_grid->GetBatchCount() )
+    {
+        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(),
@@ -373,7 +377,7 @@ void wxGridSelection::SelectCol( int col,
 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.
@@ -477,7 +481,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
         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 ) )
             {
               case 1:
@@ -494,10 +498,12 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     m_blockSelectionBottomRight.Add( wxGridCellCoords( bottomRow, rightCol ) );
 
     // Update View:
-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( topRow, leftCol ),
-                                          wxGridCellCoords( bottomRow, rightCol ) );
     if ( !m_grid->GetBatchCount() )
+    {
+        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 )
@@ -536,10 +542,12 @@ void wxGridSelection::SelectCell( int row, int col,
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
 
     // Update View:
-    wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                          wxGridCellCoords( row, col ) );
     if ( !m_grid->GetBatchCount() )
+    {
+        wxRect r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
+                                              wxGridCellCoords( row, col ) );
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+    }
 
     // Send event
     if (sendEvent)
@@ -549,7 +557,7 @@ void wxGridSelection::SelectCell( int row, int col,
                                         m_grid,
                                         wxGridCellCoords( row, col ),
                                         wxGridCellCoords( row, col ),
-                                        TRUE, 
+                                        TRUE,
                                         ControlDown, ShiftDown,
                                         AltDown, MetaDown);
         m_grid->GetEventHandler()->ProcessEvent(gridEvt);
@@ -585,13 +593,13 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
             wxGridCellCoords& coords = m_cellSelection[n];
             if ( row == coords.GetRow() && col == coords.GetCol() )
             {
-                wxRect r;
-                r = m_grid->BlockToDeviceRect( m_cellSelection[n],
-                                               m_cellSelection[n] );
+                wxGridCellCoords coords = m_cellSelection[n];
                 m_cellSelection.RemoveAt(n);
-                n--; count--;
                 if ( !m_grid->GetBatchCount() )
+                {
+                    wxRect r = m_grid->BlockToDeviceRect( coords, coords );
                     ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+                }
 
                 // Send event
                 wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
@@ -648,19 +656,19 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
             {
                 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,
-                                FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 FALSE, FALSE, FALSE, FALSE, FALSE );
             }
             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,
-                                FALSE, FALSE, FALSE, FALSE, FALSE );
+                                 FALSE, FALSE, FALSE, FALSE, FALSE );
             }
         }
     }
@@ -679,7 +687,7 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 {
                     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,
@@ -703,7 +711,7 @@ void wxGridSelection::ToggleCellSelection( int row, int 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,
@@ -720,10 +728,13 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     {
       case wxGrid::wxGridSelectCells:
       {
-          r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                         wxGridCellCoords( row, col ) );
           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,
@@ -737,10 +748,13 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
       }
       case wxGrid::wxGridSelectRows:
       {
-          r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                         wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
           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,
@@ -754,10 +768,13 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
       }
       case wxGrid::wxGridSelectColumns:
       {
-          r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                         wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
           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,
@@ -775,34 +792,38 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
 void wxGridSelection::ClearSelection()
 {
     size_t n;
+    wxRect r;
+    wxGridCellCoords coords1, coords2;
 
     // deselect all invidiual cells and update the screen
     if ( m_selectionMode == wxGrid::wxGridSelectCells )
     {
-      
         while( ( n = m_cellSelection.GetCount() ) > 0)
         {
-            wxRect r;
             n--;
-            r = m_grid->BlockToDeviceRect( m_cellSelection[n],
-                                           m_cellSelection[n] );
+            coords1 = m_cellSelection[n];
             m_cellSelection.RemoveAt(n);
             if ( !m_grid->GetBatchCount() )
+            {
+                r = m_grid->BlockToDeviceRect( coords1, coords1 );
                 ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+            }
         }
     }
 
     // deselect all blocks and update the screen
     while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
     {
-        wxRect r;
         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() )
-            ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );   
+        {
+            r = m_grid->BlockToDeviceRect( coords1, coords2 );
+            ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+        }
     }
 
     // deselect all rows and update the screen
@@ -811,13 +832,14 @@ void wxGridSelection::ClearSelection()
         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() )
-                ((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 );
+            }
         }
     }
 
@@ -827,13 +849,14 @@ void wxGridSelection::ClearSelection()
         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() )
-                ((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 );
+            }
         }
     }
 
@@ -910,7 +933,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) );
-                    
+
                 }
                 else
                 {
@@ -931,33 +954,35 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
     count = m_rowSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
-        int & rowOrCol = m_rowSelection[n];
-        if ( (size_t)rowOrCol >= pos )
-        {
-            if ( numRows > 0 )
-            {
-                // If rows inserted, include row counter where necessary
-                rowOrCol += numRows;
-            }
-            else if ( numRows < 0)
-            {
-                // If rows deleted, either decrement row counter (if row still exists)
-                if ((size_t)rowOrCol >= pos - numRows)
-                    rowOrCol += numRows;
-                else
-                {
-                    m_rowSelection.RemoveAt(n);
-                    n--; count--;
-                }
-            }
-        }
+    int  rowOrCol_ = m_rowSelection [ n ];
+
+      if ( ( size_t ) rowOrCol_ >= pos )
+      {
+          if ( numRows > 0 )
+          {
+              m_rowSelection [ n ] += numRows;
+          }
+          else if ( numRows < 0 )
+          {
+              if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) )
+                  m_rowSelection [ n ] += numRows;
+              else
+              {
+                  m_rowSelection.RemoveAt ( n );
+                  n--;
+                  count--;
+              }
+          }
+      }
     }
     // No need to touch selected columns, unless we removed _all_
     // rows, in this case, we remove all columns from the selection.
+
     if ( !m_grid->GetNumberRows() )
         m_colSelection.Clear();
 }
 
+
 void wxGridSelection::UpdateCols( size_t pos, int numCols )
 {
     size_t count = m_cellSelection.GetCount();
@@ -1016,7 +1041,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) );
-                    
+
                 }
                 else
                 {
@@ -1037,26 +1062,25 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
     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 )
+                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
                 {
-                    m_colSelection.RemoveAt(n);
-                    n--; count--;
+                    m_colSelection.RemoveAt ( n );
+                    n--;
+                    count--;
                 }
             }
         }
+
     }
 
     // No need to touch selected rows, unless we removed _all_
@@ -1065,6 +1089,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
         m_rowSelection.Clear();
 }
 
+
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,
                                    int bottomRow1, int rightCol1,
                                    int topRow2, int leftCol2,