]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/grid.cpp
Ported new double idle handlers for pending events
[wxWidgets.git] / src / generic / grid.cpp
index 4af11b94dbf1b6ebaca5f70c5a28523d98e3d587..2a92e9b7487827d48d2cd189ad874a8d777254ec 100644 (file)
@@ -474,7 +474,7 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
 bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     // accept the simple key presses, not anything with Ctrl/Alt/Meta
 bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
 {
     // accept the simple key presses, not anything with Ctrl/Alt/Meta
-    return !event.HasModifiers();
+    return !(event.ControlDown() || event.AltDown());
 }
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
 }
 
 void wxGridCellEditor::StartingKey(wxKeyEvent& event)
@@ -502,7 +502,8 @@ void wxGridCellTextEditor::Create(wxWindow* parent,
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
     m_control = new wxTextCtrl(parent, id, wxEmptyString,
                                wxDefaultPosition, wxDefaultSize
 #if defined(__WXMSW__)
-                               , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
+                               , wxTE_PROCESS_TAB | wxTE_MULTILINE |
+                                 wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
 #endif
                               );
 
 #endif
                               );
 
@@ -538,9 +539,9 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
     }
 #else // !GTK
     int extra_x = ( rect.x > 2 )? 2 : 1;
     }
 #else // !GTK
     int extra_x = ( rect.x > 2 )? 2 : 1;
-    
-// MB: treat MSW separately here otherwise the caret doesn't show 
-// when the editor is in the first row. 
+
+// MB: treat MSW separately here otherwise the caret doesn't show
+// when the editor is in the first row.
 #if defined(__WXMSW__)
     int extra_y = 2;
 #else
 #if defined(__WXMSW__)
     int extra_y = 2;
 #else
@@ -1189,7 +1190,10 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
     else
     if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
         m_startValue = grid->GetTable()->GetValueAsBool(row, col);
     else
-        m_startValue = !!grid->GetTable()->GetValue(row, col);
+    {
+        wxString cellval( grid->GetTable()->GetValue(row, col) );
+        m_startValue = !( !cellval || (cellval == "0") );
+    }
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
     CBox()->SetValue(m_startValue);
     CBox()->SetFocus();
 }
@@ -1389,6 +1393,7 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             event.Skip( m_grid->ProcessEvent( event ) );
             break;
 
             event.Skip( m_grid->ProcessEvent( event ) );
             break;
 
+        case WXK_NUMPAD_ENTER:
         case WXK_RETURN:
             if (!m_grid->ProcessEvent(event))
                 m_editor->HandleReturn(event);
         case WXK_RETURN:
             if (!m_grid->ProcessEvent(event))
                 m_editor->HandleReturn(event);
@@ -1407,6 +1412,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
         case WXK_ESCAPE:
         case WXK_TAB:
         case WXK_RETURN:
         case WXK_ESCAPE:
         case WXK_TAB:
         case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
             break;
 
         default:
             break;
 
         default:
@@ -1795,7 +1801,10 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
     if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
         value = grid.GetTable()->GetValueAsBool(row, col);
     else
     if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
         value = grid.GetTable()->GetValueAsBool(row, col);
     else
-        value = !!grid.GetTable()->GetValue(row, col);
+    {
+        wxString cellval( grid.GetTable()->GetValue(row, col) );
+        value = !( !cellval || (cellval == "0") );
+    }
 
     if ( value )
     {
 
     if ( value )
     {
@@ -2411,14 +2420,16 @@ int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
 wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
 {
     wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
-    renderer->IncRef();
+       if (renderer)
+               renderer->IncRef();
     return renderer;
 }
 
 wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
     return renderer;
 }
 
 wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
 {
     wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
-    editor->IncRef();
+       if (editor)
+               editor->IncRef();
     return editor;
 }
 
     return editor;
 }
 
@@ -3827,13 +3838,14 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
 // ifdef'd out following patch from Paul Gammans
 #if 0
                 attrProvider->UpdateAttrRows( pos, -((int)numRows) );
 // ifdef'd out following patch from Paul Gammans
 #if 0
+                // No need to touch column attributes, unless we
                 // removed _all_ rows, in this case, we remove
                 // all column attributes.
                 // I hate to do this here, but the
                 // needed data is not available inside UpdateAttrRows.
                 if ( !GetNumberRows() )
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
                 // removed _all_ rows, in this case, we remove
                 // all column attributes.
                 // I hate to do this here, but the
                 // needed data is not available inside UpdateAttrRows.
                 if ( !GetNumberRows() )
                     attrProvider->UpdateAttrCols( 0, -GetNumberCols() );
-#endif                    
+#endif
             }
             if ( !GetBatchCount() )
             {
             }
             if ( !GetBatchCount() )
             {
@@ -3960,7 +3972,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
             if (attrProvider) {
                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
             wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
             if (attrProvider) {
                 attrProvider->UpdateAttrCols( pos, -((int)numCols) );
-// ifdef'd out following patch from Paul Gammans                
+// ifdef'd out following patch from Paul Gammans
 #if 0
                 // No need to touch row attributes, unless we
                 // removed _all_ columns, in this case, we remove
 #if 0
                 // No need to touch row attributes, unless we
                 // removed _all_ columns, in this case, we remove
@@ -3969,7 +3981,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 // needed data is not available inside UpdateAttrCols.
                 if ( !GetNumberCols() )
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
                 // needed data is not available inside UpdateAttrCols.
                 if ( !GetNumberCols() )
                     attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
-#endif                    
+#endif
             }
             if ( !GetBatchCount() )
             {
             }
             if ( !GetBatchCount() )
             {
@@ -4674,17 +4686,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;
                 {
                     if ( m_selectingKeyboard == wxGridNoCellCoords)
                         m_selectingKeyboard = coords;
-                    SelectBlock ( m_selectingKeyboard, coords );
+                    HighlightBlock ( m_selectingKeyboard, coords );
                 }
                 else
                 {
                     if ( !IsSelection() )
                     {
                 }
                 else
                 {
                     if ( !IsSelection() )
                     {
-                        SelectBlock( coords, coords );
+                        HighlightBlock( coords, coords );
                     }
                     else
                     {
                     }
                     else
                     {
-                        SelectBlock( m_currentCellCoords, coords );
+                        HighlightBlock( m_currentCellCoords, coords );
                     }
                 }
 
                     }
                 }
 
@@ -4816,7 +4828,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                         SetCurrentCell( coords );
                         if ( m_selection->GetSelectionMode()
                              != wxGrid::wxGridSelectCells)
                         SetCurrentCell( coords );
                         if ( m_selection->GetSelectionMode()
                              != wxGrid::wxGridSelectCells)
-                            SelectBlock( coords, coords );
+                            HighlightBlock( coords, coords );
                     }
                     m_waitForSlowClick = TRUE;
                 }
                     }
                     m_waitForSlowClick = TRUE;
                 }
@@ -5412,6 +5424,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_RETURN:
                 break;
 
             case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
                 if ( event.ControlDown() )
                 {
                     event.Skip();  // to let the edit control have the return
                 if ( event.ControlDown() )
                 {
                     event.Skip();  // to let the edit control have the return
@@ -5595,7 +5608,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
         HideCellEditControl();
         DisableCellEditControl();
 
         HideCellEditControl();
         DisableCellEditControl();
 
-        if ( IsVisible( m_currentCellCoords ) )
+        if ( IsVisible( m_currentCellCoords, FALSE ) )
         {
             wxRect r;
             r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
         {
             wxRect r;
             r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
@@ -5608,7 +5621,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
             }
 
             CalcCellsExposed( r );
             }
 
             CalcCellsExposed( r );
-    
+
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
@@ -5625,6 +5638,141 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 }
 
 
 }
 
 
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+{
+    int temp;
+    wxGridCellCoords updateTopLeft, updateBottomRight;
+
+    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+    {
+        leftCol = 0;
+        rightCol = GetNumberCols() - 1;
+    }
+    else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+    {
+        topRow = 0;
+        bottomRow = GetNumberRows() - 1;
+    }
+    if ( topRow > bottomRow )
+    {
+        temp = topRow;
+        topRow = bottomRow;
+        bottomRow = temp;
+    }
+
+    if ( leftCol > rightCol )
+    {
+        temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;
+    }
+
+    updateTopLeft = wxGridCellCoords( topRow, leftCol );
+    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+    if ( m_selectingTopLeft != updateTopLeft ||
+         m_selectingBottomRight != updateBottomRight )
+    {
+        // Compute two optimal update rectangles:
+        // Either one rectangle is a real subset of the
+        // other, or they are (almost) disjoint!
+        wxRect  rect[4];
+        bool    need_refresh[4];
+        need_refresh[0] =
+        need_refresh[1] =
+        need_refresh[2] =
+        need_refresh[3] = FALSE;
+        int     i;
+
+        // Store intermediate values
+        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
+        wxCoord oldTop    = m_selectingTopLeft.GetRow();
+        wxCoord oldRight  = m_selectingBottomRight.GetCol();
+        wxCoord oldBottom = m_selectingBottomRight.GetRow();
+
+        // Determine the outer/inner coordinates.
+        if (oldLeft > leftCol)
+        {
+            temp = oldLeft;
+            oldLeft = leftCol;
+            leftCol = temp;
+        }
+        if (oldTop > topRow )
+        {
+            temp = oldTop;
+            oldTop = topRow;
+            topRow = temp;
+        }
+        if (oldRight < rightCol )
+        {
+            temp = oldRight;
+            oldRight = rightCol;
+            rightCol = temp;
+        }
+        if (oldBottom < bottomRow)
+        {
+            temp = oldBottom;
+            oldBottom = bottomRow;
+            bottomRow = temp;
+        }
+
+        // Now, either the stuff marked old is the outer
+        // rectangle or we don't have a situation where one
+        // is contained in the other.
+
+        if ( oldLeft < leftCol )
+        {
+            need_refresh[0] = TRUE;
+            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            oldLeft ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            leftCol - 1 ) );
+        }
+
+        if ( oldTop  < topRow )
+        {
+            need_refresh[1] = TRUE;
+            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            leftCol ),
+                                         wxGridCellCoords ( topRow - 1,
+                                                            rightCol ) );
+        }
+
+        if ( oldRight > rightCol )
+        {
+            need_refresh[2] = TRUE;
+            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+                                                            rightCol + 1 ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            oldRight ) );
+        }
+
+        if ( oldBottom > bottomRow )
+        {
+            need_refresh[3] = TRUE;
+            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+                                                            leftCol ),
+                                         wxGridCellCoords ( oldBottom,
+                                                            rightCol ) );
+        }
+
+
+        // Change Selection
+        m_selectingTopLeft = updateTopLeft;
+        m_selectingBottomRight = updateBottomRight;
+
+        // various Refresh() calls
+        for (i = 0; i < 4; i++ )
+            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+                m_gridWin->Refresh( FALSE, &(rect[i]) );
+    }
+
+    // never generate an event as it will be generated from
+    // wxGridSelection::SelectBlock!
+    // (old comment from when this was the body of SelectBlock)
+}
+
+
 //
 // ------ functions to get/send data (see also public functions)
 //
 //
 // ------ functions to get/send data (see also public functions)
 //
@@ -6282,7 +6430,7 @@ void wxGrid::ShowCellEditControl()
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
     {
         if ( !IsVisible( m_currentCellCoords ) )
         {
-            m_cellEditCtrlEnabled = false;        
+            m_cellEditCtrlEnabled = FALSE;
             return;
         }
         else
             return;
         }
         else
@@ -6622,7 +6770,7 @@ bool wxGrid::MoveCursorUp( bool expandSelection )
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                                  m_selectingKeyboard.GetCol() );
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                                  m_selectingKeyboard.GetCol() );
-                SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
         else if ( m_currentCellCoords.GetRow() > 0 )
             }
         }
         else if ( m_currentCellCoords.GetRow() > 0 )
@@ -6656,7 +6804,7 @@ bool wxGrid::MoveCursorDown( bool expandSelection )
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
                 m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
-                SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
         else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
             }
         }
         else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
@@ -6690,7 +6838,7 @@ bool wxGrid::MoveCursorLeft( bool expandSelection )
                 m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
                 m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
-                SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
         else if ( m_currentCellCoords.GetCol() > 0 )
             }
         }
         else if ( m_currentCellCoords.GetCol() > 0 )
@@ -6724,7 +6872,7 @@ bool wxGrid::MoveCursorRight( bool expandSelection )
                 m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
                 m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
                 MakeCellVisible( m_selectingKeyboard.GetRow(),
                         m_selectingKeyboard.GetCol() );
-                SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+                HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
             }
         }
         else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
             }
         }
         else if ( m_currentCellCoords.GetCol() < m_numCols - 1 )
@@ -6854,7 +7002,7 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection )
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
-            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
         {
         }
         else
         {
@@ -6917,7 +7065,7 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection )
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
-            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
         {
         }
         else
         {
@@ -6981,7 +7129,7 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
-            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
         {
         }
         else
         {
@@ -7045,7 +7193,7 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection )
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
         if ( expandSelection )
         {
             m_selectingKeyboard = wxGridCellCoords( row, col );
-            SelectBlock( m_currentCellCoords, m_selectingKeyboard );
+            HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
         }
         else
         {
         }
         else
         {
@@ -7202,14 +7350,14 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert )
         case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
         case wxCENTRE: horiz = wxALIGN_CENTRE; break;
     }
         case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
         case wxCENTRE: horiz = wxALIGN_CENTRE; break;
     }
-    
+
     switch ( vert )
     {
         case wxTOP:    vert = wxALIGN_TOP;    break;
         case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
         case wxCENTRE: vert = wxALIGN_CENTRE; break;
     }
     switch ( vert )
     {
         case wxTOP:    vert = wxALIGN_TOP;    break;
         case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
         case wxCENTRE: vert = wxALIGN_CENTRE; break;
     }
-    
+
     if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_rowLabelHorizAlign = horiz;
     if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_rowLabelHorizAlign = horiz;
@@ -7235,14 +7383,14 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert )
         case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
         case wxCENTRE: horiz = wxALIGN_CENTRE; break;
     }
         case wxRIGHT:  horiz = wxALIGN_RIGHT; break;
         case wxCENTRE: horiz = wxALIGN_CENTRE; break;
     }
-    
+
     switch ( vert )
     {
         case wxTOP:    vert = wxALIGN_TOP;    break;
         case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
         case wxCENTRE: vert = wxALIGN_CENTRE; break;
     }
     switch ( vert )
     {
         case wxTOP:    vert = wxALIGN_TOP;    break;
         case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
         case wxCENTRE: vert = wxALIGN_CENTRE; break;
     }
-    
+
     if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_colLabelHorizAlign = horiz;
     if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
     {
         m_colLabelHorizAlign = horiz;
@@ -7270,7 +7418,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
             if ( rect.height > 0 )
             {
                 CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
-                rect.x = m_left;
+                rect.x = 0;
                 rect.width = m_rowLabelWidth;
                 m_rowLabelWin->Refresh( TRUE, &rect );
             }
                 rect.width = m_rowLabelWidth;
                 m_rowLabelWin->Refresh( TRUE, &rect );
             }
@@ -7289,7 +7437,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
             if ( rect.width > 0 )
             {
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
             if ( rect.width > 0 )
             {
                 CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
-                rect.y = m_top;
+                rect.y = 0;
                 rect.height = m_colLabelHeight;
                 m_colLabelWin->Refresh( TRUE, &rect );
             }
                 rect.height = m_colLabelHeight;
                 m_colLabelWin->Refresh( TRUE, &rect );
             }
@@ -8111,139 +8259,17 @@ void wxGrid::SelectCol( int col, bool addToSelected )
 }
 
 
 }
 
 
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+                          bool addToSelected )
 {
 {
-    int temp;
-    wxGridCellCoords updateTopLeft, updateBottomRight;
-
-    if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
-    {
-        leftCol = 0;
-        rightCol = GetNumberCols() - 1;
-    }
-    else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
-    {
-        topRow = 0;
-        bottomRow = GetNumberRows() - 1;
-    }
-    if ( topRow > bottomRow )
-    {
-        temp = topRow;
-        topRow = bottomRow;
-        bottomRow = temp;
-    }
-
-    if ( leftCol > rightCol )
-    {
-        temp = leftCol;
-        leftCol = rightCol;
-        rightCol = temp;
-    }
-
-    updateTopLeft = wxGridCellCoords( topRow, leftCol );
-    updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
-
-    if ( m_selectingTopLeft != updateTopLeft ||
-         m_selectingBottomRight != updateBottomRight )
-    {
-        // Compute two optimal update rectangles:
-        // Either one rectangle is a real subset of the
-        // other, or they are (almost) disjoint!
-        wxRect  rect[4];
-        bool    need_refresh[4];
-        need_refresh[0] =
-        need_refresh[1] =
-        need_refresh[2] =
-        need_refresh[3] = FALSE;
-        int     i;
-
-        // Store intermediate values
-        wxCoord oldLeft   = m_selectingTopLeft.GetCol();
-        wxCoord oldTop    = m_selectingTopLeft.GetRow();
-        wxCoord oldRight  = m_selectingBottomRight.GetCol();
-        wxCoord oldBottom = m_selectingBottomRight.GetRow();
-
-        // Determine the outer/inner coordinates.
-        if (oldLeft > leftCol)
-        {
-            temp = oldLeft;
-            oldLeft = leftCol;
-            leftCol = temp;
-        }
-        if (oldTop > topRow )
-        {
-            temp = oldTop;
-            oldTop = topRow;
-            topRow = temp;
-        }
-        if (oldRight < rightCol )
-        {
-            temp = oldRight;
-            oldRight = rightCol;
-            rightCol = temp;
-        }
-        if (oldBottom < bottomRow)
-        {
-            temp = oldBottom;
-            oldBottom = bottomRow;
-            bottomRow = temp;
-        }
-
-        // Now, either the stuff marked old is the outer
-        // rectangle or we don't have a situation where one
-        // is contained in the other.
-
-        if ( oldLeft < leftCol )
-        {
-            need_refresh[0] = TRUE;
-            rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            oldLeft ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            leftCol - 1 ) );
-        }
-
-        if ( oldTop  < topRow )
-        {
-            need_refresh[1] = TRUE;
-            rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            leftCol ),
-                                         wxGridCellCoords ( topRow - 1,
-                                                            rightCol ) );
-        }
-
-        if ( oldRight > rightCol )
-        {
-            need_refresh[2] = TRUE;
-            rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
-                                                            rightCol + 1 ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            oldRight ) );
-        }
-
-        if ( oldBottom > bottomRow )
-        {
-            need_refresh[3] = TRUE;
-            rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
-                                                            leftCol ),
-                                         wxGridCellCoords ( oldBottom,
-                                                            rightCol ) );
-        }
-
-
-        // Change Selection
-        m_selectingTopLeft = updateTopLeft;
-        m_selectingBottomRight = updateBottomRight;
-
-        // various Refresh() calls
-        for (i = 0; i < 4; i++ )
-            if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
-                m_gridWin->Refresh( FALSE, &(rect[i]) );
-    }
+    if ( IsSelection() && !addToSelected )
+        ClearSelection();
 
 
-    // never generate an event as it will be generated from
-    // wxGridSelection::SelectBlock!
+    m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+                              FALSE, addToSelected );
 }
 
 }
 
+
 void wxGrid::SelectAll()
 {
     m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
 void wxGrid::SelectAll()
 {
     m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );