Merge pull request #268 from pcc/menudeactivate

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / DataGridViewTextBoxColumn.cs

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 ea72209975db17df76b2e9b966955a3f5355e58d..ea896744bb214006e2ca92ee06de835c2855dbf2 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
@@ -23,27 +23,31 @@
 //     Pedro Martínez Juliá <pedromj@gmail.com>
 //
 
-
-#if NET_2_0
+using System.Drawing;
+using System.ComponentModel;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        public class DataGridViewTextBoxColumn : DataGridViewColumn {
 
                private int maxInputLength;
-               private DataGridViewColumnSortMode sortMode;
 
-               public DataGridViewTextBoxColumn () {
+               public DataGridViewTextBoxColumn ()
+               {
                        base.CellTemplate = new DataGridViewTextBoxCell();
                        maxInputLength = 32767;
-                       sortMode = DataGridViewColumnSortMode.Automatic;
+                       base.SortMode = DataGridViewColumnSortMode.Automatic;
                }
 
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public override DataGridViewCell CellTemplate {
                        get { return base.CellTemplate; }
                        set { base.CellTemplate = value as DataGridViewTextBoxCell; }
                }
 
+               [DefaultValue (32767)]
                public int MaxInputLength {
                        get { return maxInputLength; }
                        set {
@@ -54,18 +58,15 @@ namespace System.Windows.Forms {
                        }
                }
 
+               [DefaultValue (DataGridViewColumnSortMode.Automatic)]
                public new DataGridViewColumnSortMode SortMode {
-                       get { return sortMode; }
-                       set {
-                               if (DataGridView != null && DataGridView.SelectionMode == DataGridViewSelectionMode.FullRowSelect && value != DataGridViewColumnSortMode.NotSortable) {
-                                       throw new InvalidOperationException("Value conflicts with DataGridView.SelectionMode.");
-                               }
-                               sortMode = value;
-                       }
+                       get { return base.SortMode; }
+                       set { base.SortMode = value; }
                }
 
-               public override string ToString () {
-                       return GetType().Name;
+               public override string ToString ()
+               {
+                       return string.Format ("DataGridViewTextBoxColumn {{ Name={0}, Index={1} }}", Name, Index);
                }
 
 
@@ -74,4 +75,3 @@ namespace System.Windows.Forms {
 
 }
 
-#endif