X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d95b0c2ba0aca17fe3d0088276dd2db8a4571eb8..b6c8bd695963b52cec60cf2247bf4b1651d889d8:/src/generic/gridsel.cpp

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 4cb1c27629..2781694fb5 100644
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -184,7 +184,7 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
     }
 }
 
-void wxGridSelection::SelectRow( int row, bool addToSelected,
+void wxGridSelection::SelectRow( int row,
                                  bool ControlDown,  bool ShiftDown,
                                  bool AltDown, bool MetaDown )
 {
@@ -277,7 +277,7 @@ void wxGridSelection::SelectRow( int row, bool addToSelected,
     m_grid->GetEventHandler()->ProcessEvent(gridEvt);
 }
 
-void wxGridSelection::SelectCol( int col, bool addToSelected,
+void wxGridSelection::SelectCol( int col,
                                  bool ControlDown,  bool ShiftDown,
                                  bool AltDown, bool MetaDown )
 {
@@ -402,7 +402,11 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     }
 
     // Handle single cell selection in SelectCell.
-    if ( topRow == bottomRow && leftCol == rightCol )
+    // (MB: added check for selection mode here to prevent
+    //  crashes if, for example, we are select rows and the
+    //  grid only has 1 col)
+    if ( m_selectionMode == wxGrid::wxGridSelectCells &&
+         topRow == bottomRow && leftCol == rightCol )
         SelectCell( topRow, leftCol, ControlDown,  ShiftDown,
                     AltDown, MetaDown, sendEvent );
 
@@ -517,12 +521,14 @@ void wxGridSelection::SelectCell( int row, int col,
 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
     {
-        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1 );
+        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
+                    ControlDown, ShiftDown, AltDown, MetaDown);
         return;
     }
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     {
-        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col );
+        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
+                    ControlDown, ShiftDown, AltDown, MetaDown);
         return;
     }
     else if ( IsInSelection ( row, col ) )
@@ -538,14 +544,14 @@ void wxGridSelection::SelectCell( int row, int col,
     // Send event
     if (sendEvent)
     {
-        wxGridEvent gridEvt( m_grid->GetId(),
-                             wxEVT_GRID_SELECT_CELL,
-                             m_grid,
-                             row, col,
-                             -1, -1,
-                             TRUE, 
-                             ControlDown, ShiftDown,
-                             AltDown, MetaDown);
+        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);
     }
 }
@@ -586,16 +592,18 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 n--; count--;
                 if ( !m_grid->GetBatchCount() )
                     ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
-                return;
 
                 // Send event
-                wxGridEvent gridEvt( m_grid->GetId(),
-                                     wxEVT_GRID_SELECT_CELL,
-                                     m_grid,
-                                     row, col, -1, -1, FALSE,
-                                     ControlDown, ShiftDown,
-                                     AltDown, MetaDown );
+                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);
+                return;
             }
         }
     }
@@ -712,12 +720,14 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                                          wxGridCellCoords( row, col ) );
           if ( !m_grid->GetBatchCount() )
               ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
-          wxGridEvent gridEvt( m_grid->GetId(),
-                               wxEVT_GRID_SELECT_CELL,
-                               m_grid,
-                               row, col, -1, -1, FALSE,
-                               ControlDown, ShiftDown,
-                               AltDown, MetaDown );
+          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;
       }
@@ -760,7 +770,6 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
 
 void wxGridSelection::ClearSelection()
 {
-    // Should this send deselection events?
     size_t n;
 
     // deselect all invidiual cells and update the screen
@@ -823,6 +832,19 @@ void wxGridSelection::ClearSelection()
                 ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );   
         }
     }
+
+    // One deselection event, indicating deselection of _all_ cells.
+    // (No finer grained events for each of the smaller regions
+    //  deselected above!)
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( 0, 0 ),
+                                    wxGridCellCoords( m_grid->GetNumberRows() - 1,
+                                                      m_grid->GetNumberCols() - 1 ),
+                                    FALSE );
+
+    m_grid->GetEventHandler()->ProcessEvent(gridEvt);
 }
 
 
@@ -926,6 +948,10 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
             }
         }
     }
+    // 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 )
@@ -1028,6 +1054,11 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
             }
         }
     }
+
+    // No need to touch selected rows, unless we removed _all_
+    // columns, in this case, we remove all rows from the selection.
+    if ( !m_grid->GetNumberCols() )
+        m_rowSelection.Clear();
 }
 
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,