2007-08-29 Carlos Alberto Cortez <calberto.cortez@gmail.com>

	* ListView.cs: Add/fix some override differences between 1.1 and 2.0,
	as well as add new ones. This should make work the BackgroundImage
	property for ListView again.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index aebb3e8292269629ab4f49b306894b9269780467..8be911a49b4b989ac7945736b57f0377c238c37d 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-29  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+       * ListView.cs: Add/fix some override differences between 1.1 and 2.0,
+       as well as add new ones. This should make work the BackgroundImage
+       property for ListView again.
+
 2007-08-28  Jonathan Pobst  <monkey@jpobst.com>
 
        * DataGrid.cs, DataGridViewButtonColumn.cs, DataGridViewCheckBoxColumn.cs,

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
index 91ca38a9c80d55ead0a582fdbd78ed65059d9ffd..d4556258082ac15613512899e40b454f57967989 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
@@ -141,12 +141,23 @@ namespace System.Windows.Forms
                        remove { Events.RemoveHandler (AfterLabelEditEvent, value); }
                }
 
+#if !NET_2_0
                [Browsable (false)]
                [EditorBrowsable (EditorBrowsableState.Never)]
                public new event EventHandler BackgroundImageChanged {
                        add { base.BackgroundImageChanged += value; }
                        remove { base.BackgroundImageChanged -= value; }
                }
+#endif
+
+#if NET_2_0
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public new event EventHandler BackgroundImageLayoutChanged {
+                       add { base.BackgroundImageLayoutChanged += value; }
+                       remove { base.BackgroundImageLayoutChanged -= value; }
+               }
+#endif
 
                public event LabelEditEventHandler BeforeLabelEdit {
                        add { Events.AddHandler (BeforeLabelEditEvent, value); }
@@ -207,6 +218,11 @@ namespace System.Windows.Forms
                        add { Events.AddHandler (ItemSelectionChangedEvent, value); }
                        remove { Events.RemoveHandler (ItemSelectionChangedEvent, value); }
                }
+
+               public new event EventHandler PaddingChanged {
+                       add { base.PaddingChanged += value; }
+                       remove { base.PaddingChanged -= value; }
+               }
 #endif
 
                [Browsable (false)]
@@ -437,12 +453,27 @@ namespace System.Windows.Forms
                        set { background_color = value; }
                }
 
+#if !NET_2_0
                [Browsable (false)]
                [EditorBrowsable (EditorBrowsableState.Never)]
                public override Image BackgroundImage {
                        get { return base.BackgroundImage; }
                        set { base.BackgroundImage = value; }
                }
+#endif
+
+#if NET_2_0
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public override ImageLayout BackgroundImageLayout {
+                       get {
+                               return base.BackgroundImageLayout;
+                       }
+                       set {
+                               base.BackgroundImageLayout = value;
+                       }
+               }
+#endif
 
                [DefaultValue (BorderStyle.Fixed3D)]
                [DispId (-504)]
@@ -671,6 +702,16 @@ namespace System.Windows.Forms
                                Redraw (true);
                        }
                }
+
+               [Browsable (false)]
+               public new Padding Padding {
+                       get {
+                               return base.Padding;
+                       }
+                       set {
+                               base.Padding = value;
+                       }
+               }
 #endif
 
                [DefaultValue (true)]