2007-08-28 Jonathan Pobst <monkey@jpobst.com>

	* DataGrid.cs, DataGridViewButtonColumn.cs, DataGridViewCheckBoxColumn.cs,
	DataGridViewComboBoxColumn.cs, DataGridViewImageColumn.cs, DataGridViewLinkColumn.cs,
	DataGridViewTextBoxColumn.cs, ToolTip.cs: corcompare stuffs.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index b0d98eab8838b125900670d5eaaeac4430305b0f..aebb3e8292269629ab4f49b306894b9269780467 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 @@
+2007-08-28  Jonathan Pobst  <monkey@jpobst.com>
+
+       * DataGrid.cs, DataGridViewButtonColumn.cs, DataGridViewCheckBoxColumn.cs,
+       DataGridViewComboBoxColumn.cs, DataGridViewImageColumn.cs, DataGridViewLinkColumn.cs,
+       DataGridViewTextBoxColumn.cs, ToolTip.cs: corcompare stuffs.
+
 2007-08-28  Jonathan Pobst  <monkey@jpobst.com>
 
        * Control.cs, XPlatUI.cs, XPlatUIDriver.cs, XPlatUIWin32.cs: Implement

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
index 2cac0633ae7cb9f84bf9b6336a358ccf9633947e..98707038073a387eb4cf990aab24e1ddf704d8ce 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
@@ -374,6 +374,15 @@ namespace System.Windows.Forms
                        }
                }
 
+#if NET_2_0
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public override ImageLayout BackgroundImageLayout {
+                       get { return base.BackgroundImageLayout; }
+                       set { base.BackgroundImageLayout = value; }
+               }
+#endif
+
                [DispId(-504)]
                [DefaultValue(BorderStyle.Fixed3D)]
                public BorderStyle BorderStyle {
@@ -2645,6 +2654,15 @@ namespace System.Windows.Forms
                        remove { base.BackgroundImageChanged -= value; }
                }
 
+#if NET_2_0
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
+               public new event EventHandler BackgroundImageLayoutChanged {
+                       add { base.BackgroundImageLayoutChanged += value; }
+                       remove { base.BackgroundImageLayoutChanged -= value; }
+               }
+#endif
+
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
                public new event EventHandler TextChanged {

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs
index 0da9a23282900ffb6ee619d139038aac9540945e..f911f90ce67f190c256ad732c19074e277e0ad0e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs
@@ -25,11 +25,12 @@
 
 
 #if NET_2_0
-
+using System.Drawing;
 using System.ComponentModel;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        public class DataGridViewButtonColumn : DataGridViewColumn {
 
                private FlatStyle flatStyle;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs
index 515c6d8f95c72c35c4740d18cf852ee5157f58e1..560261095d287470d0c9eac19ff783da29329648 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs
@@ -25,11 +25,12 @@
 
 
 #if NET_2_0
-
+using System.Drawing;
 using System.ComponentModel;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        public class DataGridViewCheckBoxColumn : DataGridViewColumn {
 
                public DataGridViewCheckBoxColumn (bool threeState) {

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxColumn.cs
index 3136946760bb2e28c3867f5a3c28439cfed9e3df..5cbaca856c92dc2873f286a2a86af59a21735b8e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxColumn.cs
@@ -28,9 +28,11 @@
 
 using System.ComponentModel;
 using System.Drawing.Design;
+using System.Drawing;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        [Designer ("System.Windows.Forms.Design.DataGridViewComboBoxColumnDesigner, " + Consts.AssemblySystem_Design,
                   "System.ComponentModel.Design.IDesigner")]
        public class DataGridViewComboBoxColumn : DataGridViewColumn

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewImageColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewImageColumn.cs
index 18d23493e743817828b83b28af0ad5381bf632f7..6dbb03003296a9870ca03d321f98b9112afa4701 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewImageColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewImageColumn.cs
@@ -31,6 +31,7 @@ using System.Drawing;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        public class DataGridViewImageColumn : DataGridViewColumn {
 
                private Icon icon;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewLinkColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewLinkColumn.cs
index 9a544a95c9d6bdea8439538d3afbb8afed5adcf7..7bdff179d671597c17a6993f5deceff82d36cfd4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewLinkColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewLinkColumn.cs
@@ -34,6 +34,7 @@ using System.Drawing;
 \r
 namespace System.Windows.Forms\r
 {\r
+       [ToolboxBitmap ("")]\r
        public class DataGridViewLinkColumn : DataGridViewColumn\r
        {\r
                \r

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 550e41d34ac530a1da72cf0bb2e5b7d1caaa35a3..eace307824cfe0b2e0798641962c21ffa9d01407 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewTextBoxColumn.cs
@@ -31,6 +31,7 @@ using System.ComponentModel;
 
 namespace System.Windows.Forms {
 
+       [ToolboxBitmap ("")]
        public class DataGridViewTextBoxColumn : DataGridViewColumn {
 
                private int maxInputLength;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
index dbe5a9bed6f19dd51b1598a2931b0f2437603fcc..c5224e02f573041f327b247011271816f71be429 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
@@ -656,10 +656,12 @@ namespace System.Windows.Forms {
                        }
                }
 
+#if NET_2_0
                protected void StopTimer ()
                {
                        timer.Stop ();
                }
+#endif
                #endregion      // Protected Instance Methods
 
                enum TipState {