New tests.
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / DataGridView.cs
index db49129399ebaa3d8aefaa715f1c38c19b08ffc7..6e811bfe84bbc930753ad9b6a8f889cfbb3f4a01 100644 (file)
@@ -135,9 +135,6 @@ namespace System.Windows.Forms {
                private DataGridViewSelectedColumnCollection selected_columns;
                private DataGridViewRow editing_row;
                
-               private int gridWidth;
-               private int gridHeight;
-
                DataGridViewHeaderCell pressed_header_cell;
                DataGridViewHeaderCell entered_header_cell;
 
@@ -215,6 +212,7 @@ namespace System.Windows.Forms {
                        selectionMode = DataGridViewSelectionMode.RowHeaderSelect;
                        showCellErrors = true;
                        showEditingIcon = true;
+                       scrollBars = ScrollBars.Both;
                        userSetCursor = Cursor.Current;
                        virtualMode = false;
 
@@ -274,8 +272,14 @@ namespace System.Windows.Forms {
                        set {
                                if (allowUserToAddRows != value) {
                                        allowUserToAddRows = value;
+                                       if (!value) {
+                                               if (new_row_editing)
+                                                       CancelEdit ();
+                                               RemoveEditingRow ();
+                                       } else {
+                                               PrepareEditingRow (false, false);
+                                       }
                                        OnAllowUserToAddRowsChanged(EventArgs.Empty);
-                                       PrepareEditingRow (false, false);
                                        Invalidate ();
                                }
                        }
@@ -578,12 +582,12 @@ namespace System.Windows.Forms {
                                        throw new InvalidOperationException("Cant change column count if DataSource is set.");
                                }
                                if (value < columns.Count) {
-                                       for (int i = value; i < columns.Count; i++) {
+                                       for (int i = columns.Count -1; i >= value; i--) {
                                                columns.RemoveAt(i);
                                        }
                                }
                                else if (value > columns.Count) {
-                                       for (int i = 0; i < value; i++) {
+                                       for (int i = columns.Count; i < value; i++) {
                                                DataGridViewTextBoxColumn col = new DataGridViewTextBoxColumn ();
                                                columns.Add(col);
                                        }
@@ -680,13 +684,12 @@ namespace System.Windows.Forms {
                                /// to the data cache, or the new cell is in a hidden
                                /// row.
                                /////////////////////////////////////////////////////
-                               if (value.DataGridView != this)
+                               if (value == null)
+                                       MoveCurrentCell (-1, -1, true, false, false, true);
+                               else if (value.DataGridView != this)
                                        throw new ArgumentException("The cell is not in this DataGridView.");
-
-                               if (value != null)
-                                       MoveCurrentCell (value.OwningColumn.Index, value.OwningRow.Index, true, false, false, true);
                                else
-                                       MoveCurrentCell (-1, -1, true, false, false, true);
+                                       MoveCurrentCell (value.OwningColumn.Index, value.OwningRow.Index, true, false, false, true);
                        }
                }
 
@@ -711,7 +714,8 @@ namespace System.Windows.Forms {
                        set {
                                if (dataMember != value) {
                                        dataMember = value;
-                                       ReBind ();
+                                       if (BindingContext != null)
+                                               ReBind ();
                                        OnDataMemberChanged(EventArgs.Empty);
                                }
                        }
@@ -732,9 +736,23 @@ namespace System.Windows.Forms {
                                if (!(value == null || value is IList || value is IListSource || value is IBindingList || value is IBindingListView))
                                        throw new NotSupportedException ("Type cannot be bound.");
                                        
-                               dataSource = value;
-                               ReBind ();
-                               OnDataSourceChanged (EventArgs.Empty);
+                               if (value != DataSource) {
+                                       if (IsHandleCreated && value != null && BindingContext != null && BindingContext[value] != null)
+                                               DataMember = String.Empty;
+                                       ClearBinding ();
+       
+       
+                                       // Do not set dataSource prior to te BindingContext check because there is some lazy initialization 
+                                       // code which might result in double call to ReBind here and in OnBindingContextChanged
+                                       if (BindingContext != null) {
+                                               dataSource = value;
+                                               ReBind ();
+                                       } else {
+                                               dataSource = value;
+                                       }
+
+                                       OnDataSourceChanged (EventArgs.Empty);
+                               }
                        }
                }
 
@@ -902,11 +920,12 @@ namespace System.Windows.Forms {
                [Browsable (false)]
                public bool IsCurrentRowDirty {
                        get {
-                               if (!virtualMode) {
+                               if (!virtualMode)
                                        return IsCurrentCellDirty;
-                               }
-                               // Calcular
-                               throw new NotImplementedException();
+
+                               QuestionEventArgs args = new QuestionEventArgs ();
+                               OnRowDirtyStateNeeded (args);
+                               return args.Response;
                        }
                }
 
@@ -1004,24 +1023,28 @@ namespace System.Windows.Forms {
                                if (dataSource != null) {
                                        throw new InvalidOperationException("Cant change row count if DataSource is set.");
                                }
+
                                if (value < rows.Count) {
-                                       for (int i = value; i < rows.Count; i++) {
+                                       int removeRangeEndIndex = rows.Count - 1;
+                                       if (AllowUserToAddRows)
+                                               removeRangeEndIndex--; // do not remove editing row
+
+                                       int removeRangeStartIndex = value - 1;
+                                       if (AllowUserToAddRows)
+                                               removeRangeStartIndex--; // remove an extra row before/instead of the editing row
+
+                                       for (int i = removeRangeEndIndex; i > removeRangeStartIndex; i--)
                                                rows.RemoveAt(i);
-                                       }
-                               }
-                               else if (value > rows.Count) {
+                               } else if (value > rows.Count) {
                                        // If we need to add rows and don't have any columns,
                                        // we create one column
                                        if (ColumnCount == 0)
                                                ColumnCount = 1;
 
-                                       for (int i = rows.Count; i < value; i++) {
-                                               DataGridViewRow row = (DataGridViewRow) RowTemplateFull;
-                                               rows.AddInternal (row, false);
-                                               
-                                               foreach (DataGridViewColumn col in columns)
-                                                       row.Cells.Add (col.CellTemplate.Clone () as DataGridViewCell);
-                                       }
+                                       List<DataGridViewRow> newRows = new List<DataGridViewRow> (value - rows.Count);
+                                       for (int i = rows.Count; i < value; i++)
+                                               newRows.Add ((DataGridViewRow) RowTemplateFull);
+                                       rows.AddRange (newRows.ToArray());
                                }
                        }
                }
@@ -1124,7 +1147,6 @@ namespace System.Windows.Forms {
                        }
                        set {
                                rowTemplate = value;
-                               rowTemplate.SetDataGridView(this);
                        }
                }
 
@@ -1166,6 +1188,8 @@ namespace System.Windows.Forms {
                                /// or canceled.
                                ///////////////////////////////////////////////////////////
                                scrollBars = value;
+                               PerformLayout ();
+                               Invalidate ();
                        }
                }
 
@@ -1290,8 +1314,16 @@ namespace System.Windows.Forms {
                                return topLeftHeaderCell;
                        }
                        set {
+                               if (topLeftHeaderCell == value)
+                                       return;
+
+                               if (topLeftHeaderCell != null)
+                                       topLeftHeaderCell.SetDataGridView (null);
+
                                topLeftHeaderCell = value;
-                               topLeftHeaderCell.SetDataGridView (this);
+
+                               if (topLeftHeaderCell != null)
+                                       topLeftHeaderCell.SetDataGridView (this);
                        }
                }
 
@@ -2354,8 +2386,22 @@ namespace System.Windows.Forms {
                                return true;
 
                        try {
-                               currentCell.Value = currentCell.ParseFormattedValue (currentCell.EditedFormattedValue, 
-                                                                                    currentCell.InheritedStyle, null, null);
+                               // convert
+                               object newValue = currentCell.ParseFormattedValue (currentCell.EditedFormattedValue, 
+                                                                                  currentCell.InheritedStyle, null, null);
+
+                               DataGridViewCellValidatingEventArgs validateArgs = new DataGridViewCellValidatingEventArgs (currentCell.ColumnIndex, 
+                                                                                                                           currentCell.RowIndex, 
+                                                                                                                           newValue);
+                               // validate
+                               OnCellValidating (validateArgs);
+                               if (validateArgs.Cancel)
+                                       return false;
+                               OnCellValidated (new DataGridViewCellEventArgs (currentCell.ColumnIndex, currentCell.RowIndex));
+
+                               // commit
+                               currentCell.Value = newValue;
+
                        } catch (Exception e) {
                                DataGridViewDataErrorEventArgs args = new DataGridViewDataErrorEventArgs (e, currentCell.ColumnIndex, currentCell.RowIndex, 
                                                                                                          DataGridViewDataErrorContexts.Commit);
@@ -2367,17 +2413,32 @@ namespace System.Windows.Forms {
                        return true;
                }
 
-               [MonoTODO ("Always includes partial columns")]
                public int DisplayedColumnCount (bool includePartialColumns)
                {
                        int result = 0;
-                       
-                       for (int i = first_col_index; i < Columns.Count; i++)
-                               if (Columns.ColumnDisplayIndexSortedArrayList[i].Displayed)
+                       int columnLeft = 0;
+
+                       if (RowHeadersVisible)
+                               columnLeft += RowHeadersWidth;
+
+                       Size visibleClientArea = ClientSize;
+                       if (verticalScrollBar.Visible)
+                               visibleClientArea.Width -= verticalScrollBar.Width;
+                       if (horizontalScrollBar.Visible)
+                               visibleClientArea.Height -= horizontalScrollBar.Height;
+
+                       for (int index = first_col_index; index < Columns.Count; index++) {
+                               DataGridViewColumn column = Columns[ColumnDisplayIndexToIndex (index)];
+                               if (columnLeft + column.Width <= visibleClientArea.Width) {
                                        result++;
-                               else
+                                       columnLeft += column.Width;
+                               } else {
+                                       if (includePartialColumns)
+                                               result++;
                                        break;
-
+                               }
+                       }
+                                       
                        return result;
                }
 
@@ -2389,9 +2450,15 @@ namespace System.Windows.Forms {
                        if (ColumnHeadersVisible)
                                rowTop += ColumnHeadersHeight;
 
+                       Size visibleClientArea = ClientSize;
+                       if (verticalScrollBar.Visible)
+                               visibleClientArea.Width -= verticalScrollBar.Width;
+                       if (horizontalScrollBar.Visible)
+                               visibleClientArea.Height -= horizontalScrollBar.Height;
+
                        for (int index = first_row_index; index < Rows.Count; index++) {
                                DataGridViewRow row = GetRowInternal (index);
-                               if (rowTop + row.Height <= ClientSize.Height) {
+                               if (rowTop + row.Height <= visibleClientArea.Height) {
                                        result++;
                                        rowTop += row.Height;
                                } else {
@@ -2489,7 +2556,10 @@ namespace System.Windows.Forms {
                        }
                        
                        for (int i = first_row_index; i < Rows.Count; i++) {
-                               if (i == rowIndex) {
+                               if (!rows[i].Visible)
+                                       continue;
+                                       
+                               if (rows[i].Index == rowIndex) {
                                        h = rows [i].Height;
                                        break;
                                }
@@ -2749,13 +2819,17 @@ namespace System.Windows.Forms {
                        if (ColumnHeadersVisible)
                                y += ColumnHeadersHeight;
 
+
                        for (int i = first_row_index; i < Rows.Count; i++) {
-                               if (i == rowIndex) {
-                                       h = rows[i].Height;
+                               if (!rows[i].Visible)
+                                       continue;
+                                       
+                               if (rows[i].Index == rowIndex) {
+                                       h = rows [i].Height;
                                        break;
                                }
-
-                               y += rows[i].Height;
+                               
+                               y += rows [i].Height;
                        }
 
                        return new Rectangle (0, y, Width, h);
@@ -2791,6 +2865,8 @@ namespace System.Windows.Forms {
                        
                        for (int i = first_row_index; i < Rows.Count; i++) {
                                DataGridViewRow row = Rows[i];
+                               if (!row.Visible)
+                                       continue;
                                
                                if (y > top && y <= (top + row.Height)) {
                                        rowindex = i;
@@ -2828,7 +2904,6 @@ namespace System.Windows.Forms {
                        return new HitTestInfo (-1, x, -1, y, DataGridViewHitTestType.None);
                }
 
-               [MonoTODO ("Invalidates whole grid")]
                public void InvalidateCell (DataGridViewCell dataGridViewCell)
                {
                        if (dataGridViewCell == null)
@@ -2840,7 +2915,6 @@ namespace System.Windows.Forms {
                        InvalidateCell (dataGridViewCell.ColumnIndex, dataGridViewCell.RowIndex);
                }
 
-               [MonoTODO ("Invalidates whole grid")]
                public void InvalidateCell (int columnIndex, int rowIndex)
                {
                        if (columnIndex < 0 || columnIndex >= columns.Count)
@@ -2849,25 +2923,26 @@ namespace System.Windows.Forms {
                        if (rowIndex < 0 || rowIndex >= rows.Count)
                                throw new ArgumentOutOfRangeException ("Row index is out of range.");
 
-                       Invalidate (GetCellDisplayRectangle (columnIndex, rowIndex, true));
+                       if (!is_binding)
+                               Invalidate (GetCellDisplayRectangle (columnIndex, rowIndex, true));
                }
 
-               [MonoTODO ("Invalidates whole grid")]
                public void InvalidateColumn (int columnIndex)
                {
                        if (columnIndex < 0 || columnIndex >= columns.Count)
                                throw new ArgumentOutOfRangeException ("Column index is out of range.");
 
-                       Invalidate (GetColumnDisplayRectangle (columnIndex, true));
+                       if (!is_binding)
+                               Invalidate (GetColumnDisplayRectangle (columnIndex, true));
                }
 
-               [MonoTODO ("Invalidates whole grid")]
                public void InvalidateRow (int rowIndex)
                {
                        if (rowIndex < 0 || rowIndex >= rows.Count)
                                throw new ArgumentOutOfRangeException ("Row index is out of range.");
 
-                       Invalidate (GetRowDisplayRectangle (rowIndex, true));
+                       if (!is_binding)
+                               Invalidate (GetRowDisplayRectangle (rowIndex, true));
                }
 
                public virtual void NotifyCurrentCellDirty (bool dirty) {
@@ -3028,8 +3103,53 @@ namespace System.Windows.Forms {
                                InvalidateRow (i);
                }
 
-               public void UpdateRowHeightInfo (int rowIndex, bool updateToEnd) {
-                       throw new NotImplementedException();
+               public void UpdateRowHeightInfo (int rowIndex, bool updateToEnd)
+               {
+                       if (rowIndex < 0 && updateToEnd)
+                               throw new ArgumentOutOfRangeException ("rowIndex");
+                       if (rowIndex < -1 && !updateToEnd)
+                               throw new ArgumentOutOfRangeException ("rowIndex");
+                       if (rowIndex >= Rows.Count)
+                               throw new ArgumentOutOfRangeException ("rowIndex");
+                       
+                       if (!VirtualMode && DataManager == null)
+                               return;
+
+                       if (rowIndex == -1) {
+                               updateToEnd = true;
+                               rowIndex = 0;
+                       }
+
+                       if (updateToEnd) {
+                               for (int i = rowIndex; i < Rows.Count; i++) {
+                                       DataGridViewRow row = Rows[i];
+                                       if (!row.Visible)
+                                               continue;
+
+                                       DataGridViewRowHeightInfoNeededEventArgs rowInfo = 
+                                               new DataGridViewRowHeightInfoNeededEventArgs (row.Index, row.Height, row.MinimumHeight);
+                                       OnRowHeightInfoNeeded (rowInfo);
+
+                                       if (row.Height != rowInfo.Height || row.MinimumHeight != rowInfo.MinimumHeight) {
+                                               row.Height = rowInfo.Height;
+                                               row.MinimumHeight = rowInfo.MinimumHeight;
+                                               OnRowHeightInfoPushed (new DataGridViewRowHeightInfoPushedEventArgs (row.Index, rowInfo.Height, 
+                                                                                                                    rowInfo.MinimumHeight));
+                                       }
+                               }
+                       } else {
+                               DataGridViewRow row = Rows[rowIndex];
+                               DataGridViewRowHeightInfoNeededEventArgs rowInfo = 
+                                       new DataGridViewRowHeightInfoNeededEventArgs (row.Index, row.Height, row.MinimumHeight);
+                               OnRowHeightInfoNeeded (rowInfo);
+
+                               if (row.Height != rowInfo.Height || row.MinimumHeight != rowInfo.MinimumHeight) {
+                                       row.Height = rowInfo.Height;
+                                       row.MinimumHeight = rowInfo.MinimumHeight;
+                                       OnRowHeightInfoPushed (new DataGridViewRowHeightInfoPushedEventArgs (row.Index, rowInfo.Height, 
+                                                                                                            rowInfo.MinimumHeight));
+                               }
+                       }
                }
 
                protected override bool CanEnableIme {
@@ -3144,6 +3264,8 @@ namespace System.Windows.Forms {
                        }
                        
                        foreach (DataGridViewRow row in Rows) {
+                               if (!row.Visible)
+                                       continue;
                                if (!displayed_only || row.Displayed) {
                                        int new_height = row.GetPreferredHeight (row.Index, mode, fixedWidth);
 
@@ -3451,6 +3573,9 @@ namespace System.Windows.Forms {
 
                protected virtual void OnCellEnter (DataGridViewCellEventArgs e)
                {
+                       DataGridViewCell cell = GetCellInternal (e.ColumnIndex, e.RowIndex);
+                       cell.OnEnterInternal (e.RowIndex, true);
+
                        DataGridViewCellEventHandler eh = (DataGridViewCellEventHandler)(Events [CellEnterEvent]);
                        if (eh != null)
                                eh (this, e);
@@ -3484,6 +3609,9 @@ namespace System.Windows.Forms {
 
                protected virtual void OnCellLeave (DataGridViewCellEventArgs e)
                {
+                       DataGridViewCell cell = GetCellInternal (e.ColumnIndex, e.RowIndex);
+                       cell.OnLeaveInternal (e.RowIndex, true);
+
                        DataGridViewCellEventHandler eh = (DataGridViewCellEventHandler)(Events [CellLeaveEvent]);
                        if (eh != null)
                                eh (this, e);
@@ -3667,15 +3795,36 @@ namespace System.Windows.Forms {
                                if (!is_autogenerating_columns && columns.Count == 1)
                                        ReBind ();
 
-                               foreach (DataGridViewRow row in Rows)
-                                       row.Cells.Add ((DataGridViewCell)e.Column.CellTemplate.Clone ());
+                               foreach (DataGridViewRow row in Rows) {
+                                       DataGridViewCell newCell = (DataGridViewCell)e.Column.CellTemplate.Clone ();
+                                       if (row.Cells.Count == columns.Count)
+                                               row.Cells.Replace (e.Column.Index, newCell);
+                                       else if (e.Column.Index >= row.Cells.Count)
+                                               row.Cells.Add (newCell);
+                                       else
+                                               row.Cells.Insert (e.Column.Index, newCell);
+                               }
                        }
                        
+                       e.Column.DataColumnIndex = FindDataColumnIndex (e.Column);
                        AutoResizeColumnsInternal ();
                        OnColumnAdded (e);
                        PrepareEditingRow (false, true);
                }
 
+               private int FindDataColumnIndex (DataGridViewColumn column)
+               {
+                       if (column != null && DataManager != null) {
+                               PropertyDescriptorCollection properties = DataManager.GetItemProperties();
+                               for (int i = 0; i < properties.Count; i++) {
+                                       if (String.Compare (column.DataPropertyName, properties[i].Name, true) == 0)
+                                               return i;
+                               }
+                       }
+
+                       return -1;
+               }
+
                protected virtual void OnColumnAdded (DataGridViewColumnEventArgs e)
                {
                        DataGridViewColumnEventHandler eh = (DataGridViewColumnEventHandler)(Events [ColumnAddedEvent]);
@@ -3803,7 +3952,22 @@ namespace System.Windows.Forms {
                                eh (this, e);
                }
 
-               internal void OnColumnRemovedInternal (DataGridViewColumnEventArgs e)
+               internal void OnColumnPreRemovedInternal (DataGridViewColumnEventArgs e)
+               {
+                       if (Columns.Count - 1 == 0) {
+                               MoveCurrentCell (-1, -1, true, false, false, true);
+                               rows.ClearInternal ();
+                       } else if (currentCell != null && CurrentCell.ColumnIndex == e.Column.Index) {
+                               int nextColumnIndex = e.Column.Index;
+                               if (nextColumnIndex >= Columns.Count - 1)
+                                       nextColumnIndex = Columns.Count - 1 - 1;
+                               MoveCurrentCell (nextColumnIndex, currentCell.RowIndex, true, false, false, true);
+                               if (hover_cell != null && hover_cell.ColumnIndex >= e.Column.Index)
+                                       hover_cell = null;
+                       }
+               }
+
+               private void OnColumnPostRemovedInternal (DataGridViewColumnEventArgs e)
                {
                        if (e.Column.CellTemplate != null) {
                                int index = e.Column.Index;
@@ -3813,8 +3977,9 @@ namespace System.Windows.Forms {
                        }
 
                        AutoResizeColumnsInternal ();
-                       OnColumnRemoved (e);
                        PrepareEditingRow (false, true);
+
+                       OnColumnRemoved (e);
                }
 
                protected virtual void OnColumnRemoved (DataGridViewColumnEventArgs e)
@@ -3913,6 +4078,11 @@ namespace System.Windows.Forms {
 
                protected override void OnDoubleClick (EventArgs e) {
                        base.OnDoubleClick(e);
+
+                       Point mouseLocation = this.PointToClient (Control.MousePosition);
+                       HitTestInfo hitInfo = HitTest (mouseLocation.X, mouseLocation.Y);
+                       if (hitInfo.Type == DataGridViewHitTestType.Cell)
+                               OnCellDoubleClick (new DataGridViewCellEventArgs (hitInfo.ColumnIndex, hitInfo.RowIndex));
                }
 
                protected virtual void OnEditingControlShowing (DataGridViewEditingControlShowingEventArgs e) {
@@ -3967,8 +4137,9 @@ namespace System.Windows.Forms {
                protected override void OnHandleCreated (EventArgs e)
                {
                        base.OnHandleCreated(e);
+                       ReBind ();
                        
-                       if (CurrentCell == null && Rows.Count > 0 && Columns.Count > 0)
+                       if (DataManager == null && CurrentCell == null && Rows.Count > 0 && Columns.Count > 0)
                                MoveCurrentCell (ColumnDisplayIndexToIndex (0), 0, true, false, false, false);
                }
 
@@ -4062,6 +4233,11 @@ namespace System.Windows.Forms {
                protected override void OnMouseDoubleClick (MouseEventArgs e)
                {
                        base.OnMouseDoubleClick(e);
+
+                       HitTestInfo hitInfo = HitTest (e.X, e.Y);
+                       if (hitInfo.Type == DataGridViewHitTestType.Cell)
+                               OnCellMouseDoubleClick (new DataGridViewCellMouseEventArgs (hitInfo.ColumnIndex, hitInfo.RowIndex,
+                                                                                           hitInfo.ColumnX, hitInfo.RowY, e));
                }
 
                private void DoSelectionOnMouseDown (HitTestInfo hitTest)
@@ -4216,7 +4392,9 @@ namespace System.Windows.Forms {
                        DataGridViewRow row = null;
                        Rectangle cellBounds;
 
-                       if (hitTest.Type == DataGridViewHitTestType.ColumnHeader && MouseOverColumnResize (hitTest.ColumnIndex, e.X)) {
+                       if ((hitTest.Type == DataGridViewHitTestType.ColumnHeader ||
+                            (hitTest.Type == DataGridViewHitTestType.Cell && !ColumnHeadersVisible)) 
+                           && MouseOverColumnResize (hitTest.ColumnIndex, e.X)) {
                                if (e.Clicks == 2) {
                                        AutoResizeColumn (hitTest.ColumnIndex);
                                        return;
@@ -4320,7 +4498,12 @@ namespace System.Windows.Forms {
                        Cursor new_cursor = Cursors.Default;
                        HitTestInfo hit = this.HitTest (e.X, e.Y);
                        
-                       if (hit.Type == DataGridViewHitTestType.Cell) {
+                       if (hit.Type == DataGridViewHitTestType.ColumnHeader || 
+                           (!ColumnHeadersVisible && hit.Type == DataGridViewHitTestType.Cell && MouseOverColumnResize (hit.ColumnIndex, e.X))) {
+                               EnteredHeaderCell = Columns [hit.ColumnIndex].HeaderCell;
+                               if (MouseOverColumnResize (hit.ColumnIndex, e.X))
+                                       new_cursor = Cursors.VSplit;
+                       } else if (hit.Type == DataGridViewHitTestType.Cell) {
                                EnteredHeaderCell = null;
 
                                DataGridViewCell new_cell = GetCellInternal (hit.ColumnIndex, hit.RowIndex);
@@ -4341,6 +4524,8 @@ namespace System.Windows.Forms {
                                                MouseLeftErrorIcon (new_cell);
                                }
                                
+                               Cursor = new_cursor;
+
                                // We have never been in a cell before
                                if (hover_cell == null) {
                                        hover_cell = new_cell;
@@ -4416,13 +4601,7 @@ namespace System.Windows.Forms {
                                }
                        
                        } else {
-                               if (hit.Type == DataGridViewHitTestType.ColumnHeader) {
-                                       EnteredHeaderCell = Columns [hit.ColumnIndex].HeaderCell;
-                                       
-                                       if (MouseOverColumnResize (hit.ColumnIndex, e.X))
-                                               new_cursor = Cursors.VSplit;
-                               } else
-                                       EnteredHeaderCell = null;
+                               EnteredHeaderCell = null;
 
                                // We have left the cell area
                                if (hover_cell != null) {
@@ -4478,6 +4657,14 @@ namespace System.Windows.Forms {
                protected override void OnMouseWheel (MouseEventArgs e)
                {
                        base.OnMouseWheel(e);
+
+                       int delta = SystemInformation.MouseWheelScrollLines * verticalScrollBar.SmallChange;
+                       if (e.Delta < 0)
+                               verticalScrollBar.SafeValueSet (verticalScrollBar.Value + delta);
+                       else
+                               verticalScrollBar.SafeValueSet (verticalScrollBar.Value - delta);
+
+                       OnVScrollBarScroll (this, new ScrollEventArgs (ScrollEventType.ThumbPosition, verticalScrollBar.Value));
                }
 
                protected virtual void OnMultiSelectChanged (EventArgs e)
@@ -4496,8 +4683,6 @@ namespace System.Windows.Forms {
 
                protected override void OnPaint (PaintEventArgs e)
                {
-                       base.OnPaint(e);
-
                        Graphics g = e.Graphics;
                        Rectangle bounds = ClientRectangle;
                        
@@ -4544,16 +4729,12 @@ namespace System.Windows.Forms {
                                bounds.Y += columnHeadersHeight;
                        }
                        
-                       gridWidth = rowHeadersVisible ? rowHeadersWidth : 0;
-                       gridHeight = 0;
-                       
-                       int first_row_height = Rows.Count > 0 ? Rows[Math.Min (Rows.Count - 1, first_row_index)].Height : 0;
-//                     int room_left = this.Height;
-                       
-                       // Reset all columns to !Displayed
-                       for (int i = 0; i < Columns.Count; i++)
+                       // Reset not displayed columns to !Displayed
+                       for (int i = 0; i < first_col_index; i++)
                                Columns[i].DisplayedInternal = false;
                        
+                       int gridWidth = rowHeadersVisible ? rowHeadersWidth : 0;
+
                        // Set Displayed columns
                        for (int i = first_col_index; i < Columns.Count; i++) {
                                DataGridViewColumn col = Columns.ColumnDisplayIndexSortedArrayList[i];
@@ -4563,18 +4744,19 @@ namespace System.Windows.Forms {
                        
                                col.DisplayedInternal = true;
                                gridWidth += col.Width;
-                               
                                if (gridWidth >= Width)
                                        break;
                        }
                        
-                       // Reset all rows to !Displayed
-                       for (int i = 0; i < Rows.Count; i++)
+                       // Reset all not displayed rows to !Displayed
+                       for (int i = 0; i < first_row_index; i++)
                                GetRowInternal (i).DisplayedInternal = false;
                        
                        // Draw rows
                        for (int index = first_row_index; index < Rows.Count; index++) {
                                DataGridViewRow row = Rows[index];
+                               if (!row.Visible)
+                                       continue;
                                GetRowInternal (index).DisplayedInternal = true;
        
                                bounds.Height = row.Height;
@@ -4588,62 +4770,91 @@ namespace System.Windows.Forms {
                                
                                if (bounds.Y >= ClientSize.Height - (horizontalScrollBar.Visible ? horizontalScrollBar.Height : 0))
                                        break;
-                                       
-                               gridHeight += row.Height;
                        }
 
-                       gridWidth = 0;
+                       RefreshScrollBars ();
+                       
+                       // Paint the bottom right square if both scrollbars are displayed
+                       if (horizontalScrollBar.Visible && verticalScrollBar.Visible)
+                               g.FillRectangle (SystemBrushes.Control, new Rectangle (horizontalScrollBar.Right, verticalScrollBar.Bottom, verticalScrollBar.Width, horizontalScrollBar.Height));
+
+                       // Paint the border
+                       bounds = ClientRectangle;
                        
-                       foreach (DataGridViewColumn col in sortedColumns)
+                       switch (BorderStyle) {
+                               case BorderStyle.FixedSingle:
+                                       g.DrawRectangle (Pens.Black, new Rectangle (bounds.Left, bounds.Top, bounds.Width - 1, bounds.Height - 1));
+                                       break;
+                               case BorderStyle.Fixed3D:
+                                       ControlPaint.DrawBorder3D (g, bounds, Border3DStyle.Sunken);
+                                       break;
+                       }
+
+                       // Call the base impl at the end.
+                       base.OnPaint(e);
+               }
+
+               private void RefreshScrollBars ()
+               {
+                       int gridWidth = 0;
+                       int gridHeight = 0;
+
+                       foreach (DataGridViewColumn col in columns.ColumnDisplayIndexSortedArrayList)
                                if (col.Visible)
                                        gridWidth += col.Width;
-
-                       gridHeight = 0;
                        
                        foreach (DataGridViewRow row in Rows)
-                               gridHeight += row.Height;
+                               if (row.Visible)
+                                       gridHeight += row.Height;
 
                        if (rowHeadersVisible)
                                gridWidth += rowHeadersWidth;
-
                        if (columnHeadersVisible)
                                gridHeight += columnHeadersHeight;
-                       
+
                        bool horizontalVisible = false;
                        bool verticalVisible = false;
                        
                        if (AutoSize) {
-                               if (gridWidth > Size.Width || gridHeight > Size.Height) {
+                               if (gridWidth > Size.Width || gridHeight > Size.Height)
                                        Size = new Size(gridWidth, gridHeight);
-                               }
                        }
                        else {
-                               if (gridWidth > Size.Width) {
+                               if (gridWidth > Size.Width)
                                        horizontalVisible = true;
-                               }
-                               if (gridHeight > Size.Height) {
+                               if (gridHeight > Size.Height)
                                        verticalVisible = true;
-                               }
-                               if (horizontalScrollBar.Visible && (gridHeight + horizontalScrollBar.Height) > Size.Height) {
+
+                               if (horizontalScrollBar.Visible && (gridHeight + horizontalScrollBar.Height) > Size.Height)
                                        verticalVisible = true;
-                               }
-                               if (verticalScrollBar.Visible && (gridWidth + verticalScrollBar.Width) > Size.Width) {
+                               if (verticalScrollBar.Visible && (gridWidth + verticalScrollBar.Width) > Size.Width) 
                                        horizontalVisible = true;
-                               }
+
+                               if (scrollBars != ScrollBars.Vertical && scrollBars != ScrollBars.Both)
+                                       verticalVisible = false;
+                               if (scrollBars != ScrollBars.Horizontal && scrollBars != ScrollBars.Both)
+                                       horizontalVisible = false;
+
+                               // MSNET compatibility here
+                               if (RowCount <= 1)
+                                       verticalVisible = false;
+
                                if (horizontalVisible) {
                                        horizontalScrollBar.Minimum = 0;
                                        horizontalScrollBar.Maximum = gridWidth;
                                        horizontalScrollBar.SmallChange = Columns[first_col_index].Width;
-                                       int largeChange = ClientSize.Width - rowHeadersWidth;
+                                       int largeChange = ClientSize.Width - rowHeadersWidth - horizontalScrollBar.Height;
                                        if (largeChange <= 0)
                                                largeChange = ClientSize.Width;
                                        horizontalScrollBar.LargeChange = largeChange;
                                }
+
                                if (verticalVisible) {
                                        verticalScrollBar.Minimum = 0;
                                        verticalScrollBar.Maximum = gridHeight;
+                                       int first_row_height = Rows.Count > 0 ? Rows[Math.Min (Rows.Count - 1, first_row_index)].Height : 0;
                                        verticalScrollBar.SmallChange = first_row_height + 1;
-                                       int largeChange = ClientSize.Height - columnHeadersHeight;
+                                       int largeChange = ClientSize.Height - columnHeadersHeight - verticalScrollBar.Width;
                                        if (largeChange <= 0)
                                                largeChange = ClientSize.Height;
                                        verticalScrollBar.LargeChange = largeChange;
@@ -4652,22 +4863,6 @@ namespace System.Windows.Forms {
 
                        horizontalScrollBar.Visible = horizontalVisible;
                        verticalScrollBar.Visible = verticalVisible;
-                       
-                       // Paint the bottom right square if both scrollbars are displayed
-                       if (horizontalScrollBar.Visible && verticalScrollBar.Visible)
-                               g.FillRectangle (SystemBrushes.Control, new Rectangle (horizontalScrollBar.Right, verticalScrollBar.Bottom, verticalScrollBar.Width, horizontalScrollBar.Height));
-
-                       // Paint the border
-                       bounds = ClientRectangle;
-                       
-                       switch (BorderStyle) {
-                               case BorderStyle.FixedSingle:
-                                       g.DrawRectangle (Pens.Black, new Rectangle (bounds.Left, bounds.Top, bounds.Width - 1, bounds.Height - 1));
-                                       break;
-                               case BorderStyle.Fixed3D:
-                                       ControlPaint.DrawBorder3D (g, bounds, Border3DStyle.Sunken);
-                                       break;
-                       }
                }
 
                protected virtual void OnReadOnlyChanged (EventArgs e) {
@@ -4787,6 +4982,7 @@ namespace System.Windows.Forms {
 
                protected internal virtual void OnRowHeightChanged (DataGridViewRowEventArgs e)
                {
+                       UpdateRowHeightInfo (e.Row.Index, false);
                        DataGridViewRowEventHandler eh = (DataGridViewRowEventHandler)(Events [RowHeightChangedEvent]);
                        if (eh != null) eh (this, e);
                }
@@ -4829,12 +5025,20 @@ namespace System.Windows.Forms {
 
                internal void OnRowsAddedInternal (DataGridViewRowsAddedEventArgs e)
                {
+                       if (hover_cell != null && hover_cell.RowIndex >= e.RowIndex)
+                               hover_cell = null;
+
+                       // Select the first row if we are not databound. 
+                       // If we are databound selection is managed by the data manager.
+                       if (IsHandleCreated && DataManager == null && CurrentCell == null && Rows.Count > 0 && Columns.Count > 0)
+                               MoveCurrentCell (ColumnDisplayIndexToIndex (0), 0, true, false, false, true);
+
                        AutoResizeColumnsInternal ();
                        Invalidate ();
                        OnRowsAdded (e);
                }
 
-               protected internal virtual void OnRowsAdded (DataGridViewRowsAddedEventArgs e)
+               protected virtual void OnRowsAdded (DataGridViewRowsAddedEventArgs e)
                {
                        DataGridViewRowsAddedEventHandler eh = (DataGridViewRowsAddedEventHandler)(Events [RowsAddedEvent]);
                        if (eh != null) eh (this, e);
@@ -4846,25 +5050,32 @@ namespace System.Windows.Forms {
                        if (eh != null) eh (this, e);
                }
 
-               internal void OnRowsRemovedInternal (DataGridViewRowsRemovedEventArgs e)
+               internal void OnRowsPreRemovedInternal (DataGridViewRowsRemovedEventArgs e)
                {
                        if (selected_rows != null)
                                selected_rows.InternalClear ();
                        if (selected_columns != null)
                                selected_columns.InternalClear ();
 
-                       if (Rows.Count == 0) {
+                       if (Rows.Count - e.RowCount <= 0) {
                                MoveCurrentCell (-1, -1, true, false, false, true);
+                               hover_cell = null;
                        } else if (Columns.Count == 0) {
                                MoveCurrentCell (-1, -1, true, false, false, true);
-                       } else {
+                               hover_cell = null;
+                       } else if (currentCell != null && currentCell.RowIndex == e.RowIndex) {
                                int nextRowIndex = e.RowIndex;
-                               if (nextRowIndex >= Rows.Count)
-                                       nextRowIndex = Rows.Count - 1;
+                               if (nextRowIndex >= Rows.Count - e.RowCount)
+                                       nextRowIndex = Rows.Count - 1 - e.RowCount;
                                MoveCurrentCell (currentCell != null ? currentCell.ColumnIndex : 0, nextRowIndex, 
                                                 true, false, false, true);
+                               if (hover_cell != null && hover_cell.RowIndex >= e.RowIndex)
+                                       hover_cell = null;
                        }
+               }
 
+               internal void OnRowsPostRemovedInternal (DataGridViewRowsRemovedEventArgs e)
+               {
                        Invalidate ();
                        OnRowsRemoved (e);
                }
@@ -5024,7 +5235,7 @@ namespace System.Windows.Forms {
 
                protected bool ProcessDeleteKey (Keys keyData)
                {
-                       if (!allowUserToDeleteRows || SelectedRows.Count == 0)
+                       if (!AllowUserToDeleteRows || SelectedRows.Count == 0)
                                return false;
 
                        int index = Math.Max (selected_row - SelectedRows.Count + 1, 0);
@@ -5038,8 +5249,8 @@ namespace System.Windows.Forms {
                                if (hover_cell != null && hover_cell.OwningRow == row)
                                        hover_cell = null;
                                        
-                               if (DataSource != null && DataSource is DataSet)
-                                       (DataSource as DataSet).Tables[dataMember].Rows.RemoveAt (row.Index);
+                               if (DataManager != null)
+                                       DataManager.RemoveAt (row.Index);
                                else
                                        Rows.RemoveAt (row.Index);
                        }
@@ -5165,7 +5376,7 @@ namespace System.Windows.Forms {
                        return false;
                }
 
-               [MonoTODO ("What does insert do?")]
+               [MonoInternalNote ("What does insert do?")]
                protected bool ProcessInsertKey (Keys keyData)
                {
                        return false;
@@ -5423,6 +5634,10 @@ namespace System.Windows.Forms {
                                                        return false;
                                                else if (currentCell.RowIndex == NewRowIndex && new_row_editing)
                                                        CancelEdit ();
+                                       } else {
+                                               // CancelEdit will replace the uncommited real editing row with a place holder row
+                                               if (new_row_editing && currentCell.RowIndex == NewRowIndex)
+                                                       CancelEdit ();
                                        }
                                        OnCellLeave (new DataGridViewCellEventArgs(currentCell.ColumnIndex, currentCell.RowIndex));
                                        OnRowLeave (new DataGridViewCellEventArgs (currentCell.ColumnIndex, currentCell.RowIndex));
@@ -5441,7 +5656,7 @@ namespace System.Windows.Forms {
                                OnCurrentCellChanged (EventArgs.Empty);
 
                                if (cell != null) {
-                                       // If the user begins an edit in the NewRow, add a new row
+                                       // If the user begins an edit in the NewRow, add a new real row
                                        if (AllowUserToAddRows && cell.RowIndex == NewRowIndex && !is_binding && !new_row_editing) {
                                                // OnUserAddedRow will add a real row and reset the current cell
                                                OnUserAddedRow (new DataGridViewRowEventArgs (Rows[NewRowIndex]));
@@ -5548,13 +5763,18 @@ namespace System.Windows.Forms {
 
                internal void OnHScrollBarScroll (object sender, ScrollEventArgs e)
                {
+                       int lastRightVisibleColumntIndex = Columns.Count - DisplayedColumnCount (false);
                        horizontalScrollingOffset = e.NewValue;
                        int left = 0;
 
                        for (int index = 0; index < Columns.Count; index++) {
                                DataGridViewColumn col = Columns[index];
 
-                               if (e.NewValue < left + col.Width) {
+                               if (col.Index >= lastRightVisibleColumntIndex) {
+                                       first_col_index = lastRightVisibleColumntIndex;
+                                       Invalidate ();
+                                       OnScroll (e);
+                               } else if (e.NewValue < left + col.Width) {
                                        if (first_col_index != index) {
                                                first_col_index = index;
                                                Invalidate ();
@@ -5575,10 +5795,18 @@ namespace System.Windows.Forms {
                                return;
 
                        int top = 0;
-                       
+                       int lastTopVisibleRowIndex = Rows.Count - DisplayedRowCount (false);
+
                        for (int index = 0; index < Rows.Count; index++) {
                                DataGridViewRow row = Rows[index];
-                               if (e.NewValue < top + row.Height) {
+                               if (!row.Visible)
+                                       continue;
+
+                               if (row.Index >= lastTopVisibleRowIndex) {
+                                       first_row_index = lastTopVisibleRowIndex;
+                                       Invalidate ();
+                                       OnScroll (e);
+                               } else if (e.NewValue < top + row.Height) {
                                        if (first_row_index != index) {
                                                first_row_index = index;
                                                Invalidate ();
@@ -5591,7 +5819,7 @@ namespace System.Windows.Forms {
                                top += row.Height;
                        }
                        
-                       first_row_index = Rows.Count - DisplayedRowCount (false);
+                       first_row_index = lastTopVisibleRowIndex;
                        Invalidate ();
                        OnScroll (e);
                }
@@ -5606,9 +5834,11 @@ namespace System.Windows.Forms {
                                        OnColumnAddedInternal(new DataGridViewColumnEventArgs(e.Element as DataGridViewColumn));
                                        break;
                                case CollectionChangeAction.Remove:
-                                       OnColumnRemovedInternal(new DataGridViewColumnEventArgs(e.Element as DataGridViewColumn));
+                                       OnColumnPostRemovedInternal(new DataGridViewColumnEventArgs(e.Element as DataGridViewColumn));
                                        break;
                                case CollectionChangeAction.Refresh:
+                                       hover_cell = null;
+                                       MoveCurrentCell (-1, -1, true, false, false, true);
                                        break;
                        }
                }
@@ -5641,6 +5871,9 @@ namespace System.Windows.Forms {
                        for (int i = 0; i < Columns.Count; i++) {
                                DataGridViewColumn col = Columns [i];
 
+                               if (!col.Visible)
+                                       continue;
+
                                switch (col.InheritedAutoSizeMode) {
                                case DataGridViewAutoSizeColumnMode.Fill:
                                        FillCount++;
@@ -5667,6 +5900,9 @@ namespace System.Windows.Forms {
                                        
                                        if (col.InheritedAutoSizeMode != DataGridViewAutoSizeColumnMode.Fill)
                                                continue;
+                               
+                                       if (!col.Visible)
+                                               continue;
                                                
                                        if (fixed_widths [i] != 0)
                                                continue;
@@ -5691,7 +5927,10 @@ namespace System.Windows.Forms {
                        for (int i = 0; i < columns.Count; i++) {
                                if (Columns [i].InheritedAutoSizeMode != DataGridViewAutoSizeColumnMode.Fill)
                                        continue;
-                                       
+
+                               if (!Columns[i].Visible)
+                                       continue;
+
                                Columns [i].Width = new_widths [i];
                        }
                }
@@ -5732,24 +5971,20 @@ namespace System.Windows.Forms {
                internal int CalculateColumnCellWidth (int index, DataGridViewAutoSizeColumnMode mode)
                {
                        int first_row = 0;
+                       int last_row = Rows.Count;
                        int result = 0;
-                       bool only_visible = false;
-                       
-                       if (mode == DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader || 
-                               mode == DataGridViewAutoSizeColumnMode.AllCellsExceptHeader)
-                               first_row++;
-                       
-                       only_visible = (mode == DataGridViewAutoSizeColumnMode.DisplayedCells || mode == DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader);
+
+                       if (mode == DataGridViewAutoSizeColumnMode.DisplayedCells || 
+                           mode == DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader) {
+                               first_row = first_row_index;
+                               last_row = DisplayedRowCount (true);;
+                       }
                        
-                       for (int i = first_row; i < Rows.Count; i++) {
-                               if (only_visible) {
-                                       Rectangle row_rect = this.GetRowDisplayRectangle (i, false);
-                                       if (!ClientRectangle.IntersectsWith (row_rect))
-                                               continue;
-                               }
+                       for (int i = first_row; i < last_row; i++) {
+                               if (!Rows[i].Visible)
+                                       continue;
                                
                                int cell_width = Rows[i].Cells[index].PreferredSize.Width;
-
                                result = Math.Max (result, cell_width);
                        }
                        
@@ -5782,7 +6017,7 @@ namespace System.Windows.Forms {
                        return bounds;
                }
 
-               internal void PrepareEditingRow (bool cell_changed, bool column_changed)
+               private void PrepareEditingRow (bool cell_changed, bool column_changed)
                {
                        if (new_row_editing)
                                return;
@@ -5791,16 +6026,14 @@ namespace System.Windows.Forms {
                        
                        show = ColumnCount > 0 && AllowUserToAddRows;
 
-                       if (!show && editing_row != null) {
-                               Rows.RemoveInternal (editing_row);
-                               editing_row = null;
+                       if (!show) {
+                               RemoveEditingRow ();
                        } else if (show) {
                                if (editing_row != null && (cell_changed || column_changed)) {
                                        // The row changed, it's no longer an editing row.
                                        //    or
                                        // The number of columns has changed, we need a new editing row.
-                                       Rows.RemoveInternal (editing_row);
-                                       editing_row = null;
+                                       RemoveEditingRow ();
                                }
                                if (editing_row == null) {
                                        editing_row = RowTemplateFull;
@@ -5809,6 +6042,15 @@ namespace System.Windows.Forms {
                        }
                }
                
+               internal void RemoveEditingRow ()
+               {
+                       if (editing_row != null) {
+                               if (Rows.Contains (editing_row))
+                                   Rows.RemoveInternal (editing_row);
+                               editing_row = null;
+                       }
+               }
+
                internal DataGridViewRow EditingRow {
                        get { return editing_row; }
                }
@@ -5820,30 +6062,13 @@ namespace System.Windows.Forms {
                                return;
                                
                        DataGridViewRow row = (DataGridViewRow)RowTemplateFull;
-                       rows.InternalAdd (row);
-
-                       PropertyDescriptorCollection properties = TypeDescriptor.GetProperties (element);
-                       
-                       foreach (PropertyDescriptor property in properties) {
-                               if (property.PropertyType == typeof (IBindingList))
-                                       continue;
-                               
-                               // We do it this way because there may not be a column
-                               // for every cell, ignore cells with no column  
-                               DataGridViewCell cell = row.Cells.GetBoundCell (property.Name);
-                               
-                               if (cell == null)
-                                       continue;
-                                       
-                               cell.Value = property.GetValue (element);
-                               cell.ValueType = property.PropertyType;
-                       }
+                       rows.AddInternal (row, false);
                }
                
                private bool IsColumnAlreadyBound (string name)
                {
                        foreach (DataGridViewColumn col in Columns)
-                               if (col.DataPropertyName == name)
+                               if (String.Compare (col.DataPropertyName, name, true) == 0)
                                        return true;
 
                        return false;
@@ -5853,20 +6078,38 @@ namespace System.Windows.Forms {
                {
                        if (type == typeof (bool))
                                return new DataGridViewCheckBoxColumn ();
+                       else if (typeof(Bitmap).IsAssignableFrom (type))
+                               return new DataGridViewImageColumn ();
                                
                        return new DataGridViewTextBoxColumn ();
                }
                
                private void ClearBinding ()
                {
-                       columns.ClearAutoGeneratedColumns ();
-                       rows.Clear ();
-                       PrepareEditingRow (false, true);
+                       if (IsCurrentCellInEditMode && !EndEdit ())
+                               CancelEdit ();
+                       MoveCurrentCell (-1, -1, false, false, false, true);
+
                        if (DataManager != null) {
                                DataManager.ListChanged -= OnListChanged;
                                DataManager.PositionChanged -= OnListPositionChanged;
+                               columns.ClearAutoGeneratedColumns ();
+                               rows.Clear ();
+                               RemoveEditingRow ();
                        }
                }
+
+               private void ResetRows ()
+               {
+                       rows.Clear ();
+                       RemoveEditingRow ();
+                       if (DataManager != null) {
+                               foreach (object element in DataManager.List)
+                                       AddBoundRow (element);
+                       }
+                       PrepareEditingRow (false, true);
+                       OnListPositionChanged (this, EventArgs.Empty);
+               }
                
                private void DoBinding ()
                {
@@ -5885,13 +6128,15 @@ namespace System.Windows.Forms {
                                                // This keeps out things like arrays
                                                if ((typeof(ICollection).IsAssignableFrom (property.PropertyType)))
                                                        continue;
+                                               if (!property.IsBrowsable)
+                                                       continue;
 
-                                               if (IsColumnAlreadyBound (property.DisplayName))
+                                               if (IsColumnAlreadyBound (property.Name))
                                                        continue;
 
                                                DataGridViewColumn col = CreateColumnByType (property.PropertyType);
                                                col.Name = property.DisplayName;
-                                               col.DataPropertyName = property.DisplayName;
+                                               col.DataPropertyName = property.Name;
                                                col.ReadOnly = !DataManager.AllowEdit || property.IsReadOnly;
                                                col.SetIsDataBound (true);
                                                col.ValueType = property.PropertyType;
@@ -5903,11 +6148,10 @@ namespace System.Windows.Forms {
                                }
 
                                // DataBind both autogenerated and not columns if there is a matching property
-                               foreach (PropertyDescriptor property in DataManager.GetItemProperties()) {
-                                       foreach (DataGridViewColumn col in Columns) {
-                                               if (col.DataPropertyName == property.Name)
-                                                       col.SetIsDataBound (true);
-                                       }
+                               foreach (DataGridViewColumn column in columns) {
+                                       column.DataColumnIndex = FindDataColumnIndex (column);
+                                       if (column.DataColumnIndex != -1)
+                                               column.SetIsDataBound (true);
                                }
 
                                foreach (object element in DataManager.List)
@@ -5922,14 +6166,41 @@ namespace System.Windows.Forms {
                                        MoveCurrentCell (0, 0, true, false, false, false);
                        }
 
-                       PerformLayout();
-                       Invalidate ();
+                       PrepareEditingRow (false, true);
                }
                
                private void MoveCurrentCell (int x, int y, bool select, bool isControl, bool isShift, bool scroll)
                {
                        if (x == -1 || y == -1)
                                x = y = -1;
+                       else {
+                               if (x < 0 || x > Columns.Count - 1)
+                                       throw new ArgumentOutOfRangeException ("x");
+                               if (y < 0 || y > Rows.Count - 1)
+                                       throw new ArgumentOutOfRangeException ("y");
+
+                               if (!Rows[y].Visible) {
+                                       for (int i = y; i < Rows.Count; i++) {
+                                               if (Rows[i].Visible) {
+                                                       y = i;
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               if (!Columns[x].Visible) {
+                                       for (int i = x; i < Columns.Count; i++) {
+                                               if (Columns[i].Visible) {
+                                                       x = i;
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               // in case either no visible columns or rows
+                               if (!Rows[y].Visible || !Columns[x].Visible)
+                                       x = y = -1;
+                       }
 
                        if (!SetCurrentCellAddressCore (x, y, true, false, false)) {
                                ClearSelection ();
@@ -5961,18 +6232,40 @@ namespace System.Windows.Forms {
                        // If the current cell isn't visible, scroll to it
                        if (scroll) {
                                int disp_x = ColumnIndexToDisplayIndex (x);
+                               bool scrollbarsRefreshed = false;
+                               int displayedColumnsCount = DisplayedColumnCount (false);
+                               int delta_x = 0;
 
+                               // The trick here is that in order to avoid unnecessary calculations each time a row/column 
+                               // is added/removed we recalculate the whole grid size just before the scroll to selection.
                                if (disp_x < first_col_index) {
-                                       int delta_x = 0;
+                                       RefreshScrollBars ();
+                                       scrollbarsRefreshed = true;
 
                                        if (disp_x == 0)
                                                delta_x = horizontalScrollBar.Value;
-                                       else
+                                       else {
+                                               // in case the column got removed
+                                               if (first_col_index >= ColumnCount)
+                                                       first_col_index = ColumnCount - 1;
                                                for (int i = disp_x; i < first_col_index; i++)
                                                        delta_x += Columns[ColumnDisplayIndexToIndex (i)].Width;
+                                       }
                                
                                        horizontalScrollBar.SafeValueSet (horizontalScrollBar.Value - delta_x);
                                        OnHScrollBarScroll (this, new ScrollEventArgs (ScrollEventType.ThumbPosition, horizontalScrollBar.Value));
+                               } else if (disp_x > first_col_index + displayedColumnsCount - 1) {
+                                       RefreshScrollBars ();
+                                       scrollbarsRefreshed = true;
+                                       
+                                       if (disp_x == Columns.Count - 1)
+                                               delta_x = horizontalScrollBar.Maximum - horizontalScrollBar.Value;
+                                       else
+                                               for (int i = first_col_index + displayedColumnsCount - 1; i < disp_x; i++)
+                                                       delta_x += Columns[ColumnDisplayIndexToIndex (i)].Width;
+
+                                       horizontalScrollBar.SafeValueSet (horizontalScrollBar.Value + delta_x);
+                                       OnHScrollBarScroll (this, new ScrollEventArgs (ScrollEventType.ThumbPosition, horizontalScrollBar.Value));
                                }
 
                                int disp_y = y;
@@ -5980,15 +6273,25 @@ namespace System.Windows.Forms {
                                int delta_y = 0;
 
                                if (disp_y < first_row_index) {
+                                       if (!scrollbarsRefreshed)
+                                               RefreshScrollBars ();
+
                                        if (disp_y == 0)
                                                delta_y = verticalScrollBar.Value;
-                                       else
+                                       else {
+                                               // in case the row got removed
+                                               if (first_row_index >= RowCount)
+                                                       first_row_index = RowCount - 1;
                                                for (int i = disp_y; i < first_row_index; i++)
                                                        delta_y += GetRowInternal (i).Height;
+                                       }
 
                                        verticalScrollBar.SafeValueSet (verticalScrollBar.Value - delta_y);
                                        OnVScrollBarScroll (this, new ScrollEventArgs (ScrollEventType.ThumbPosition, verticalScrollBar.Value));
                                } else if (disp_y > first_row_index + displayedRowsCount - 1) {
+                                       if (!scrollbarsRefreshed)
+                                               RefreshScrollBars ();
+
                                        if (disp_y == Rows.Count - 1)
                                                delta_y = verticalScrollBar.Maximum - verticalScrollBar.Value;
                                        else
@@ -6046,7 +6349,7 @@ namespace System.Windows.Forms {
                                case ListChangedType.ItemChanged:
                                        break;
                                default:
-                                       ReBind ();
+                                       ResetRows ();
                                        break;
                        }
                        
@@ -6065,10 +6368,15 @@ namespace System.Windows.Forms {
                private void ReBind ()
                {
                        if (!is_binding) {
+                               SuspendLayout ();
+
                                is_binding = true;
                                ClearBinding ();
                                DoBinding ();
                                is_binding = false;
+
+                               ResumeLayout (true);
+                               Invalidate ();
                        }
                }