2009-03-26 Ivan N. Zlatev <contact@i-nz.net>

	* DataGridViewColumn.cs, DataGridViewTextBoxColumn.cs:
	Fix SortMode clash handling.
	[Fixes bug #488263]

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 7f1946e413d8b42d2c5bd1b89a50aa2119242f32..6979d9c17421a3f74402cc0d13965f1781d59c85 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 @@
+2009-03-26  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * DataGridViewColumn.cs, DataGridViewTextBoxColumn.cs: 
+       Fix SortMode clash handling.
+       [Fixes bug #488263]
+
 2009-03-26  Ivan N. Zlatev  <contact@i-nz.net>
 
        * DataGridView.cs: Do not show the vertical scrollbar if there is only 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
index 32fb2076d52926dba26a3708ebd4ec1d4bfb1178..de61e7ab632cf926224967b7b5860e24108713ca 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
@@ -368,8 +368,13 @@ Example */
                public DataGridViewColumnSortMode SortMode {
                        get { return sortMode; }
                        set {
-                               if (value == DataGridViewColumnSortMode.Automatic && DataGridView != null && DataGridView.SelectionMode == DataGridViewSelectionMode.FullColumnSelect)
-                                       throw new InvalidOperationException ("Column's SortMode cannot be set to Automatic while the DataGridView control's SelectionMode is set to FullColumnSelect.");
+                               if (DataGridView != null && value == DataGridViewColumnSortMode.Automatic) {
+                                       if (DataGridView.SelectionMode == DataGridViewSelectionMode.FullColumnSelect ||
+                                           DataGridView.SelectionMode == DataGridViewSelectionMode.ColumnHeaderSelect)
+                                               throw new InvalidOperationException ("Column's SortMode cannot be set to Automatic "+
+                                                                                    "while the DataGridView control's SelectionMode "+
+                                                                                    "is set to FullColumnSelect or ColumnHeaderSelect.");
+                               }
 
                                if (sortMode != value) {
                                        sortMode = value;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
index eace307824cfe0b2e0798641962c21ffa9d01407..84936a200271b0350d7852dc68b62d4f7a827051 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
@@ -64,12 +64,7 @@ namespace System.Windows.Forms {
                [DefaultValue (DataGridViewColumnSortMode.Automatic)]
                public new DataGridViewColumnSortMode SortMode {
                        get { return base.SortMode; }
-                       set {
-                               if (DataGridView != null && DataGridView.SelectionMode == DataGridViewSelectionMode.FullRowSelect && value != DataGridViewColumnSortMode.NotSortable) {
-                                       throw new InvalidOperationException("Value conflicts with DataGridView.SelectionMode.");
-                               }
-                               base.SortMode = value;
-                       }
+                       set { base.SortMode = value; }
                }
 
                public override string ToString ()