diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h
index dc74d9395e..b521834cc7 100644
--- a/include/wx/generic/gridsel.h
+++ b/include/wx/generic/gridsel.h
@@ -29,10 +29,10 @@ public:
     bool IsSelection();
     bool IsInSelection ( int row, int col );
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
-    void SelectRow( int row, bool addToSelected = FALSE,
+    void SelectRow( int row,
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );
-    void SelectCol( int col, bool addToSelected = FALSE,
+    void SelectCol( int col,
                     bool ControlDown = FALSE,  bool ShiftDown = FALSE,
                     bool AltDown = FALSE, bool MetaDown = FALSE );
     void SelectBlock( int topRow, int leftCol,
diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 4cb1c27629..d3d2222a0d 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 )
 {
@@ -586,7 +586,6 @@ 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(),
@@ -596,6 +595,7 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                                      ControlDown, ShiftDown,
                                      AltDown, MetaDown );
                 m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+                return;
             }
         }
     }