2008-03-24 Jonathan Pobst <monkey@jpobst.com>

	* DataGridView.cs: Turn off and on the "new row" when
	AllowUserToAddRows is toggled.  When the handle is created,
	set current cell and selected cell/row/col.

svn path=/trunk/mcs/; revision=98878

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 45f4fa2c4cd03b95cdc892ec18d5078f28e27de1..c27c3e5c4780a4edbdd083da5cefaad16da95c29 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-24  Jonathan Pobst  <monkey@jpobst.com>
+
+       * DataGridView.cs: Turn off and on the "new row" when 
+       AllowUserToAddRows is toggled.  When the handle is created,
+       set current cell and selected cell/row/col.
+
 2008-03-24  Jonathan Pobst  <monkey@jpobst.com>
 
        * ComboBox.cs: When navigating the drop down by keyboard, we

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
index e8573d58b8bb855532bbecfc2b4a383058c638c5..a10a3222ad7a6b29ddcd2facf8bd561d027cba96 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
@@ -247,6 +247,7 @@ namespace System.Windows.Forms {
                                if (allowUserToAddRows != value) {
                                        allowUserToAddRows = value;
                                        OnAllowUserToAddRowsChanged(EventArgs.Empty);
+                                       PrepareEditingRow (false, false);
                                }
                        }
                }
@@ -3411,6 +3412,24 @@ namespace System.Windows.Forms {
                protected override void OnHandleCreated (EventArgs e)
                {
                        base.OnHandleCreated(e);
+                       
+                       if (Rows.Count > 0 && Columns.Count > 0) {
+                               CurrentCell = Rows[0].Cells[0];
+
+                               switch (selectionMode) {
+                                       case DataGridViewSelectionMode.CellSelect:
+                                       case DataGridViewSelectionMode.RowHeaderSelect:
+                                       case DataGridViewSelectionMode.ColumnHeaderSelect:
+                                               SetSelectedCellCore (0, 0, true);
+                                               break;
+                                       case DataGridViewSelectionMode.FullRowSelect:
+                                               SetSelectedRowCore (0, true);
+                                               break;
+                                       case DataGridViewSelectionMode.FullColumnSelect:
+                                               SetSelectedColumnCore (0, true);
+                                               break;
+                               }
+                       }
                }
 
                protected override void OnHandleDestroyed(EventArgs e)