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

	* ListView.cs, ListViewItem.cs: corcompare stuffs.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 80e1a9615240081db972e21a3d8f4c2e8c3b1548..8e73258c6e8dc2418319d53b289be51821a7c82f 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,7 @@
+2007-08-30  Jonathan Pobst  <monkey@jpobst.com>
+
+       * ListView.cs, ListViewItem.cs: corcompare stuffs.
+
 2007-08-30  Jonathan Pobst  <monkey@jpobst.com>
 
        * BindingMemberInfo.cs: Implement == and != operators.

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 d4556258082ac15613512899e40b454f57967989..3ad77e613bfc921dcca9705fc4ce7b3d806a386e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
@@ -219,6 +219,8 @@ namespace System.Windows.Forms
                        remove { Events.RemoveHandler (ItemSelectionChangedEvent, value); }
                }
 
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
                public new event EventHandler PaddingChanged {
                        add { base.PaddingChanged += value; }
                        remove { base.PaddingChanged -= value; }
@@ -512,6 +514,9 @@ namespace System.Windows.Forms
                        get { return checked_items; }
                }
 
+#if NET_2_0
+               [Editor ("System.Windows.Forms.Design.ColumnHeaderCollectionEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
                [Localizable (true)]
                [MergableProperty (false)]
@@ -636,6 +641,9 @@ namespace System.Windows.Forms
                        }
                }
 
+#if NET_2_0
+               [Editor ("System.Windows.Forms.Design.ListViewItemCollectionEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
                [Localizable (true)]
                [MergableProperty (false)]
@@ -704,6 +712,8 @@ namespace System.Windows.Forms
                }
 
                [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public new Padding Padding {
                        get {
                                return base.Padding;
@@ -752,6 +762,7 @@ namespace System.Windows.Forms
                [LocalizableAttribute (true)]
                [MergableProperty (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
+               [Editor ("System.Windows.Forms.Design.ListViewGroupCollectionEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
                public ListViewGroupCollection Groups {
                        get { return groups; }
                }
@@ -3414,6 +3425,7 @@ namespace System.Windows.Forms
                        return new ListViewHitTestInfo (item, subitem, locations);
                }
 
+               [EditorBrowsable (EditorBrowsableState.Advanced)]
                public void RedrawItems (int startIndex, int endIndex, bool invalidateOnly)
                {
                        if (startIndex < 0 || startIndex >= items.Count)
@@ -3704,6 +3716,9 @@ namespace System.Windows.Forms
                        }
                }
 
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class CheckedIndexCollection : IList, ICollection, IEnumerable
                {
                        private readonly ListView owner;
@@ -3837,6 +3852,9 @@ namespace System.Windows.Forms
                        }
                }       // CheckedIndexCollection
 
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class CheckedListViewItemCollection : IList, ICollection, IEnumerable
                {
                        private readonly ListView owner;
@@ -4039,6 +4057,9 @@ namespace System.Windows.Forms
                        }
                }       // CheckedListViewItemCollection
 
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class ColumnHeaderCollection : IList, ICollection, IEnumerable
                {
                        internal ArrayList list;
@@ -4366,6 +4387,9 @@ namespace System.Windows.Forms
 
                }       // ColumnHeaderCollection
 
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class ListViewItemCollection : IList, ICollection, IEnumerable
                {
                        private readonly ArrayList list;
@@ -4926,6 +4950,9 @@ namespace System.Windows.Forms
                //
                // In virtual mode, SelectedIndexCollection directly saves the selection
                // information, instead of getting it from Items, making List read-and-write
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class SelectedIndexCollection : IList, ICollection, IEnumerable
                {
                        private readonly ListView owner;
@@ -5162,6 +5189,9 @@ namespace System.Windows.Forms
 
                }       // SelectedIndexCollection
 
+#if NET_2_0
+               [ListBindable (false)]
+#endif
                public class SelectedListViewItemCollection : IList, ICollection, IEnumerable
                {
                        private readonly ListView owner;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
index b76394a8c492e2bd3573c1ddb73c3cd0eabd6a1d..042f2e75c2e226d6698ab4ddc4d3b12c81627b9c 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
@@ -338,7 +338,7 @@ namespace System.Windows.Forms
                [Localizable (true)]
 #if NET_2_0
                [RefreshProperties (RefreshProperties.Repaint)]
-               // [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
+               [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
 #else
                [TypeConverter (typeof (ImageIndexConverter))]
 #endif
@@ -366,7 +366,7 @@ namespace System.Windows.Forms
                [Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design,
                         typeof (System.Drawing.Design.UITypeEditor))]
                [RefreshProperties (RefreshProperties.Repaint)]
-               // XXX [TypeConverter (typeof (ImageKeyConverter))
+               [TypeConverter (typeof (ImageKeyConverter))]
                public string ImageKey {
                        get {
                                return image_key;
@@ -480,8 +480,8 @@ namespace System.Windows.Forms
                [Localizable (true)]
 #if NET_2_0
                [RefreshProperties (RefreshProperties.Repaint)]
-               // XXX [RelatedImageListAttribute ("ListView.StateImageList")]
-               // XXX [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
+               [RelatedImageListAttribute ("ListView.StateImageList")]
+               [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
 #else
                [TypeConverter (typeof (ImageIndexConverter))]
 #endif
@@ -1035,6 +1035,7 @@ namespace System.Windows.Forms
                        }
 
 #if NET_2_0
+                       [Browsable (false)]
                        public 
 #else