New tests.
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / ListView.cs
index 98659fa5f17662d5555e4401d7d2fb2de83a7524..6702dad150c14797a7a5026b92fc7796a39f1c5b 100644 (file)
@@ -26,7 +26,6 @@
 //
 // TODO:
 //   - Feedback for item activation, change in cursor types as mouse moves.
-//   - HideSelection
 //   - LabelEdit
 //   - Drag and drop
 
@@ -166,6 +165,9 @@ namespace System.Windows.Forms
                        // event handlers
                        base.KeyDown += new KeyEventHandler(ListView_KeyDown);
                        SizeChanged += new EventHandler (ListView_SizeChanged);
+                       GotFocus += new EventHandler (FocusChanged);
+                       LostFocus += new EventHandler (FocusChanged);
+                       MouseWheel += new MouseEventHandler(ListView_MouseWheel);
 
                        this.SetStyle (ControlStyles.UserPaint | ControlStyles.StandardClick, false);
                }
@@ -299,6 +301,13 @@ namespace System.Windows.Forms
                        get { return check_boxes; }
                        set {
                                if (check_boxes != value) {
+#if NET_2_0
+                                       if (value && View == View.Tile)
+                                               throw new NotSupportedException ("CheckBoxes are not"
+                                                       + " supported in Tile view. Choose a different"
+                                                       + " view or set CheckBoxes to false.");
+#endif
+
                                        check_boxes = value;
                                        this.Redraw (true);
                                }
@@ -436,8 +445,17 @@ namespace System.Windows.Forms
                [Browsable (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public IComparer ListViewItemSorter {
-                       get { return item_sorter; }
-                       set { item_sorter = value; }
+                       get {
+                               if (View != View.SmallIcon && View != View.LargeIcon && item_sorter is ItemComparer)
+                                       return null;
+                               return item_sorter;
+                       }
+                       set {
+                               if (item_sorter != value) {
+                                       item_sorter = value;
+                                       Sort ();
+                               }
+                       }
                }
 
                [DefaultValue (true)]
@@ -494,15 +512,46 @@ namespace System.Windows.Forms
                public SortOrder Sorting {
                        get { return sort_order; }
                        set { 
-                               if (value != SortOrder.Ascending && value != SortOrder.Descending  && 
-                                       value != SortOrder.None) {
-                                       throw new InvalidEnumArgumentException (string.Format
-                                               ("Enum argument value '{0}' is not valid for Sorting", value));
+                               if (!Enum.IsDefined (typeof (SortOrder), value)) {
+                                       throw new InvalidEnumArgumentException ("value", (int) value,
+                                               typeof (SortOrder));
                                }
                                
-                               if (sort_order != value)  {                     
-                                       sort_order = value; 
+                               if (sort_order == value)
+                                       return;
+
+                               sort_order = value;
+
+                               if (value == SortOrder.None) {
+                                       if (item_sorter != null) {
+                                               // ListViewItemSorter should never be reset for SmallIcon
+                                               // and LargeIcon view
+                                               if (View != View.SmallIcon && View != View.LargeIcon)
+#if NET_2_0
+                                                       item_sorter = null;
+#else
+                                                       // in .NET 1.1, only internal IComparer would be
+                                                       // set to null
+                                                       if (item_sorter is ItemComparer)
+                                                               item_sorter = null;
+#endif
+                                       }
                                        this.Redraw (false);
+                               } else {
+                                       if (item_sorter == null)
+                                               item_sorter = new ItemComparer (value);
+                                       if (item_sorter is ItemComparer) {
+#if NET_2_0
+                                               item_sorter = new ItemComparer (value);
+#else
+                                               // in .NET 1.1, the sort order is not updated for
+                                               // SmallIcon and LargeIcon views if no custom IComparer
+                                               // is set
+                                               if (View != View.SmallIcon && View != View.LargeIcon)
+                                                       item_sorter = new ItemComparer (value);
+#endif
+                                       }
+                                       Sort ();
                                }
                        }
                }
@@ -570,13 +619,18 @@ namespace System.Windows.Forms
                public View View {
                        get { return view; }
                        set { 
-                               if (value != View.Details && value != View.LargeIcon  && 
-                                       value != View.List  && value != View.SmallIcon  ) {
-                                       throw new InvalidEnumArgumentException (string.Format
-                                               ("Enum argument value '{0}' is not valid for View", value));
-                               }
-                               
+                               if (!Enum.IsDefined (typeof (View), value))
+                                       throw new InvalidEnumArgumentException ("value", (int) value,
+                                               typeof (View));
+
                                if (view != value) {
+#if NET_2_0
+                                       if (CheckBoxes && value == View.Tile)
+                                               throw new NotSupportedException ("CheckBoxes are not"
+                                                       + " supported in Tile view. Choose a different"
+                                                       + " view or set CheckBoxes to false.");
+#endif
+
                                        h_scroll.Value = v_scroll.Value = 0;
                                        view = value; 
                                        Redraw (true);
@@ -775,9 +829,17 @@ namespace System.Windows.Forms
                        if (!this.scrollable || this.items.Count <= 0) {
                                h_scroll.Visible = false;
                                v_scroll.Visible = false;
+                               item_control.Location = new Point (0, header_control.Height);
+                               item_control.Height = ClientRectangle.Width - header_control.Height;
+                               item_control.Width = ClientRectangle.Width;
+                               header_control.Width = ClientRectangle.Width;
                                return;
                        }
 
+                       // Don't calculate if the view is not displayable
+                       if (client_area.Height < 0 || client_area.Width < 0)
+                               return;
+
                        // making a scroll bar visible might make
                        // other scroll bar visible                     
                        if (layout_wd > client_area.Right) {
@@ -911,6 +973,7 @@ namespace System.Windows.Forms
                {
                        header_control.Visible = false;
                        header_control.Size = Size.Empty;
+                       item_control.Visible = true;
                        item_control.Location = Point.Empty;
 
                        if (items.Count == 0)
@@ -963,12 +1026,6 @@ namespace System.Windows.Forms
 
                void LayoutHeader ()
                {
-                       if (columns.Count == 0 || header_style == ColumnHeaderStyle.None) {
-                               header_control.Visible = false;
-                               header_control.Size = Size.Empty;
-                               return;
-                       }
-
                        int x = 0;
                        for (int i = 0; i < Columns.Count; i++) {
                                ColumnHeader col = GetReorderedColumn (i);
@@ -981,15 +1038,27 @@ namespace System.Windows.Forms
                        if (x < ClientRectangle.Width)
                                x = ClientRectangle.Width;
 
-                       header_control.Width = x;
-                       header_control.Height = columns [0].Ht;
-                       header_control.is_visible = true;
+                       if (header_style == ColumnHeaderStyle.None) {
+                               header_control.Visible = false;
+                               header_control.Size = Size.Empty;
+                       } else {
+                               header_control.Width = x;
+                               header_control.Height = columns [0].Ht;
+                               header_control.Visible = true;
+                       }
                }
 
                void LayoutDetails ()
                {
+                       if (columns.Count == 0) {
+                               header_control.Visible = false;
+                               item_control.Visible = false;
+                               return;
+                       }
+
                        LayoutHeader ();
 
+                       item_control.Visible = true;
                        item_control.Location = new Point (0, header_control.Height);
 
                        int y = 0; 
@@ -1042,16 +1111,13 @@ namespace System.Windows.Forms
 
                                if (!CanMultiselect && SelectedItems.Count > 0) {
                                        SelectedItems.Clear ();
-                                       SelectedIndices.list.Clear ();
                                }
 
-                               if (!SelectedItems.Contains (item)) {
+                               if (!SelectedItems.list.Contains (item)) {
                                        SelectedItems.list.Add (item);
-                                       SelectedIndices.list.Add (item.Index);
                                }
                        } else {
                                SelectedItems.list.Remove (item);
-                               SelectedIndices.list.Remove (item.Index);
                        }
                }
 
@@ -1120,7 +1186,7 @@ namespace System.Windows.Forms
                                return item_matrix [row - 1, col].Index;
 
                        case Keys.Down:
-                               if (row == (rows - 1))
+                               if (row == (rows - 1) || row == Items.Count - 1)
                                        return -1;
                                while (item_matrix [row + 1, col] == null)
                                       col--;   
@@ -1133,16 +1199,23 @@ namespace System.Windows.Forms
 
                ListViewItem selection_start;
 
-               private void SelectItems (ArrayList sel_items)
+               private bool SelectItems (ArrayList sel_items)
                {
+                       bool changed = false;
                        multiselecting = true;
                        ArrayList curr_items = (ArrayList) SelectedItems.list.Clone ();
                        foreach (ListViewItem item in curr_items)
-                               if (!sel_items.Contains (item))
+                               if (!sel_items.Contains (item)) {
                                        item.Selected = false;
+                                       changed = true;
+                               }
                        foreach (ListViewItem item in sel_items)
-                               item.Selected = true;
+                               if (!item.Selected) {
+                                       item.Selected = true;
+                                       changed = true;
+                               }
                        multiselecting = false;
+                       return changed;
                }
 
                private void UpdateMultiSelection (int index)
@@ -1168,23 +1241,27 @@ namespace System.Windows.Forms
                                                    curr.col >= left && curr.col <= right)
                                                        list.Add (curr);
                                }
-                               SelectItems (list);
+                               if (SelectItems (list))
+                                       OnSelectedIndexChanged (EventArgs.Empty);
                        } else if (!ctrl_pressed) {
                                SelectedItems.Clear ();
-                               SelectedIndices.list.Clear ();
                                item.Selected = true;
                                selection_start = item;
+                               OnSelectedIndexChanged (EventArgs.Empty);
                        }
                }
 
                private void ListView_KeyDown (object sender, KeyEventArgs ke)
                {                       
-                       if (ke.Handled || Items.Count == 0)
+                       if (ke.Handled || Items.Count == 0 || !item_control.Visible)
                                return;
 
                        int index = -1;
                        ke.Handled = true;
 
+                       if (FocusedItem == null)
+                               SetFocusedItem (Items [0]);
+
                        switch (ke.KeyCode) {
 
                        case Keys.End:
@@ -1212,8 +1289,10 @@ namespace System.Windows.Forms
 
                        if (MultiSelect)
                                UpdateMultiSelection (index);
-                       else
+                       else if (!items [index].Selected) {
                                items [index].Selected = true;
+                               OnSelectedIndexChanged (EventArgs.Empty);
+                       }
 
                        SetFocusedItem (items [index]);                         
                        EnsureVisible (index);
@@ -1226,20 +1305,16 @@ namespace System.Windows.Forms
                        ListViewItem clicked_item;
                        ListViewItem last_clicked_item;
                        bool hover_processed = false;
+                       bool checking = false;
 
                        public ItemControl (ListView owner)
                        {
                                this.owner = owner;
                                DoubleClick += new EventHandler(ItemsDoubleClick);
-                               KeyDown += new KeyEventHandler (ItemsKeyDown);
-                               KeyUp += new KeyEventHandler (ItemsKeyUp);
                                MouseDown += new MouseEventHandler(ItemsMouseDown);
                                MouseMove += new MouseEventHandler(ItemsMouseMove);
                                MouseHover += new EventHandler(ItemsMouseHover);
                                MouseUp += new MouseEventHandler(ItemsMouseUp);
-                               MouseWheel += new MouseEventHandler(ItemsMouseWheel);
-                               GotFocus += new EventHandler (FocusChanged);
-                               LostFocus += new EventHandler (FocusChanged);
                        }
 
                        void ItemsDoubleClick (object sender, EventArgs e)
@@ -1248,16 +1323,6 @@ namespace System.Windows.Forms
                                        owner.ItemActivate (this, e);
                        }
 
-                       void ItemsKeyDown (object sender, KeyEventArgs args)
-                       {
-                               owner.OnKeyDown (args);
-                       }
-
-                       void ItemsKeyUp (object sender, KeyEventArgs args)
-                       {
-                               owner.OnKeyUp (args);
-                       }
-
                        enum BoxSelect {
                                None,
                                Normal,
@@ -1374,6 +1439,16 @@ namespace System.Windows.Forms
                                return true;
                        }
 
+                       private void ToggleCheckState (ListViewItem item)
+                       {
+                               CheckState curr_state = item.Checked ?  CheckState.Checked : CheckState.Unchecked;
+                               item.Checked = !item.Checked;
+                               CheckState new_state = item.Checked ?  CheckState.Checked : CheckState.Unchecked;
+
+                               ItemCheckEventArgs ice = new ItemCheckEventArgs (item.Index, curr_state, new_state);
+                               owner.OnItemCheck (ice);
+                       }
+
                        private void ItemsMouseDown (object sender, MouseEventArgs me)
                        {
                                if (owner.items.Count == 0)
@@ -1381,16 +1456,12 @@ namespace System.Windows.Forms
 
                                Point pt = new Point (me.X, me.Y);
                                foreach (ListViewItem item in owner.items) {
-                                       if (item.CheckRectReal.Contains (pt)) {
-                                               CheckState curr_state = item.Checked ?  CheckState.Checked : CheckState.Unchecked;
-                                               item.Checked = !item.Checked;
-
-                                               CheckState new_state = item.Checked ?  CheckState.Checked : CheckState.Unchecked;
-
-                                               // Raise the ItemCheck event
-                                               ItemCheckEventArgs ice = new ItemCheckEventArgs (item.Index, curr_state, new_state);
-                                               owner.OnItemCheck (ice);
-                                               break;
+                                       if (me.Clicks == 1 && item.CheckRectReal.Contains (pt)) {
+                                               checking = true;
+                                               if (me.Clicks > 1)
+                                                       return;
+                                               ToggleCheckState (item);
+                                               return;
                                        }
 
                                        if (owner.View == View.Details && !owner.FullRowSelect) {
@@ -1420,9 +1491,11 @@ namespace System.Windows.Forms
 
                                        // Raise double click if the item was clicked. On MS the
                                        // double click is only raised if you double click an item
-                                       if (me.Clicks > 1 && clicked_item != null)
+                                       if (me.Clicks > 1) {
                                                owner.OnDoubleClick (EventArgs.Empty);
-                                       else if (me.Clicks == 1 && clicked_item != null)
+                                               if (owner.CheckBoxes)
+                                                       ToggleCheckState (clicked_item);
+                                       } else if (me.Clicks == 1)
                                                owner.OnClick (EventArgs.Empty);
                                } else {
                                        if (owner.MultiSelect) {
@@ -1437,7 +1510,6 @@ namespace System.Windows.Forms
                                                prev_selection = (ArrayList) owner.SelectedItems.list.Clone ();
                                        } else if (owner.selected_indices.Count > 0) {
                                                owner.SelectedItems.Clear ();
-                                               owner.SelectedIndices.list.Clear ();
                                                owner.OnSelectedIndexChanged (EventArgs.Empty);
                                        }
                                }
@@ -1510,10 +1582,9 @@ namespace System.Windows.Forms
                                                        break;
                                                }
                                        }
-                               } else if (owner.SelectedItems.Count > 0 && BoxSelectRectangle.Size.IsEmpty) {
+                               } else if (!checking && owner.SelectedItems.Count > 0 && BoxSelectRectangle.Size.IsEmpty) {
                                        // Need this to clean up background clicks
                                        owner.SelectedItems.Clear ();
-                                       owner.SelectedIndices.list.Clear ();
                                        owner.OnSelectedIndexChanged (EventArgs.Empty);
                                }
 
@@ -1522,46 +1593,17 @@ namespace System.Windows.Forms
                                BoxSelectRectangle = Rectangle.Empty;
                                prev_selection = null;
                                box_select_mode = BoxSelect.None;
+                               checking = false;
                        }
 
-                       private void ItemsMouseWheel (object sender, MouseEventArgs me)
-                       {
-                               if (owner.Items.Count == 0)
-                                       return;
-
-                               int lines = me.Delta / 120;
-
-                               if (lines == 0)
-                                       return;
-
-                               switch (owner.View) {
-                               case View.Details:
-                               case View.SmallIcon:
-                                       owner.Scroll (owner.v_scroll, -owner.Items [0].Bounds.Height * SystemInformation.MouseWheelScrollLines * lines);
-                                       break;
-                               case View.LargeIcon:
-                                       owner.Scroll (owner.v_scroll, -(owner.Items [0].Bounds.Height + ThemeEngine.Current.ListViewVerticalSpacing)  * lines);
-                                       break;
-                               case View.List:
-                                       owner.Scroll (owner.h_scroll, -owner.Items [0].Bounds.Width * lines);
-                                       break;
-                               }
-                       }
-
-                       void FocusChanged (object o, EventArgs args)
+                       internal override void OnPaintInternal (PaintEventArgs pe)
                        {
-                               if (owner.Items.Count == 0)
-                                       return;
-
-                               if (owner.FocusedItem == null)
-                                       owner.SetFocusedItem (owner.Items [0]);
-
-                               Invalidate (owner.FocusedItem.Bounds);
+                               ThemeEngine.Current.DrawListViewItems (pe.Graphics, pe.ClipRectangle, owner);
                        }
 
-                       internal override void OnPaintInternal (PaintEventArgs pe)
+                       internal override void OnGotFocusInternal (EventArgs e)
                        {
-                               ThemeEngine.Current.DrawListViewItems (pe.Graphics, pe.ClipRectangle, owner);
+                               owner.Focus ();
                        }
                }
 
@@ -1573,6 +1615,41 @@ namespace System.Windows.Forms
                        CalculateScrollBars ();
                }
 
+               void FocusChanged (object o, EventArgs args)
+               {
+                       if (Items.Count == 0)
+                               return;
+
+                       if (FocusedItem == null)
+                               SetFocusedItem (Items [0]);
+
+                       item_control.Invalidate (FocusedItem.Bounds);
+               }
+
+               private void ListView_MouseWheel (object sender, MouseEventArgs me)
+               {
+                       if (Items.Count == 0)
+                               return;
+
+                       int lines = me.Delta / 120;
+
+                       if (lines == 0)
+                               return;
+
+                       switch (View) {
+                       case View.Details:
+                       case View.SmallIcon:
+                               Scroll (v_scroll, -Items [0].Bounds.Height * SystemInformation.MouseWheelScrollLines * lines);
+                               break;
+                       case View.LargeIcon:
+                               Scroll (v_scroll, -(Items [0].Bounds.Height + ThemeEngine.Current.ListViewVerticalSpacing)  * lines);
+                               break;
+                       case View.List:
+                               Scroll (h_scroll, -Items [0].Bounds.Width * lines);
+                               break;
+                       }
+               }
+
                private void ListView_SizeChanged (object sender, EventArgs e)
                {
                        CalculateListView (alignment);
@@ -1690,6 +1767,7 @@ namespace System.Windows.Forms
                protected override void OnHandleCreated (EventArgs e)
                {
                        base.OnHandleCreated (e);
+                       Sort ();
                }
 
                protected override void OnHandleDestroyed (EventArgs e)
@@ -1818,20 +1896,34 @@ namespace System.Windows.Forms
                public Rectangle GetItemRect (int index, ItemBoundsPortion portion)
                {
                        if (index < 0 || index >= items.Count)
-                               throw new IndexOutOfRangeException ("Invalid Index");
+                               throw new IndexOutOfRangeException ("index");
 
                        return items [index].GetBounds (portion);
                }
 
                public void Sort ()
                {
-                       if (sort_order != SortOrder.None)
-                               items.list.Sort (item_sorter);
-
-                       if (sort_order == SortOrder.Descending)
-                               items.list.Reverse ();
-
-                       this.Redraw (true);
+                       Sort (true);
+               }
+
+               // we need this overload to reuse the logic for sorting, while allowing
+               // redrawing to be done by caller or have it done by this method when
+               // sorting is really performed
+               //
+               // ListViewItemCollection's Add and AddRange methods call this overload
+               // with redraw set to false, as they take care of redrawing themselves
+               // (they even want to redraw the listview if no sort is performed, as 
+               // an item was added), while ListView.Sort () only wants to redraw if 
+               // sorting was actually performed
+               private void Sort (bool redraw)
+               {
+                       if (!IsHandleCreated || item_sorter == null) {
+                               return;
+                       }
+                       
+                       items.list.Sort (item_sorter);
+                       if (redraw)
+                               this.Redraw (true);
                }
 
                public override string ToString ()
@@ -1964,6 +2056,8 @@ namespace System.Windows.Forms
                                        zone.X = zone.Right - 5;
                                        zone.Width = 10;
                                        if (zone.Contains (pt)) {
+                                               if (i < owner.Columns.Count - 1 && owner.Columns [i + 1].Width == 0)
+                                                       i++;
                                                resize_column = owner.Columns [i];
                                                break;
                                        }
@@ -2025,17 +2119,46 @@ namespace System.Windows.Forms
                                        target_x = owner.GetReorderedColumn (drag_to_index).Rect.X - owner.h_marker;
                                theme.DrawListViewHeaderDragDetails (pe.Graphics, owner, drag_column, target_x);
                        }
+
+                       protected override void WndProc (ref Message m)
+                       {
+                               switch ((Msg)m.Msg) {
+                               case Msg.WM_SETFOCUS:
+                                       owner.Focus ();
+                                       break;
+                               default:
+                                       base.WndProc (ref m);
+                                       break;
+                               }
+                       }
+               }
+
+               private class ItemComparer : IComparer {
+                       readonly SortOrder sort_order;
+
+                       public ItemComparer (SortOrder sortOrder)
+                       {
+                               sort_order = sortOrder;
+                       }
+
+                       public int Compare (object x, object y)
+                       {
+                               ListViewItem item_x = x as ListViewItem;
+                               ListViewItem item_y = y as ListViewItem;
+                               if (sort_order == SortOrder.Ascending)
+                                       return String.Compare (item_x.Text, item_y.Text);
+                               else
+                                       return String.Compare (item_y.Text, item_x.Text);
+                       }
                }
 
                public class CheckedIndexCollection : IList, ICollection, IEnumerable
                {
-                       internal ArrayList list;
-                       private ListView owner;
+                       private readonly ListView owner;
 
                        #region Public Constructor
                        public CheckedIndexCollection (ListView owner)
                        {
-                               list = new ArrayList ();
                                this.owner = owner;
                        }
                        #endregion      // Public Constructor
@@ -2043,7 +2166,7 @@ namespace System.Windows.Forms
                        #region Public Properties
                        [Browsable (false)]
                        public int Count {
-                               get { return list.Count; }
+                               get { return owner.CheckedItems.Count; }
                        }
 
                        public bool IsReadOnly {
@@ -2052,9 +2175,10 @@ namespace System.Windows.Forms
 
                        public int this [int index] {
                                get {
-                                       if (index < 0 || index >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
-                                       return (int) list [index];
+                                       int [] indices = GetIndices ();
+                                       if (index < 0 || index >= indices.Length)
+                                               throw new ArgumentOutOfRangeException ("index");
+                                       return indices [index];
                                }
                        }
 
@@ -2079,17 +2203,24 @@ namespace System.Windows.Forms
                        #region Public Methods
                        public bool Contains (int checkedIndex)
                        {
-                               return list.Contains (checkedIndex);
+                               int [] indices = GetIndices ();
+                               for (int i = 0; i < indices.Length; i++) {
+                                       if (indices [i] == checkedIndex)
+                                               return true;
+                               }
+                               return false;
                        }
 
                        public IEnumerator GetEnumerator ()
                        {
-                               return list.GetEnumerator ();
+                               int [] indices = GetIndices ();
+                               return indices.GetEnumerator ();
                        }
 
                        void ICollection.CopyTo (Array dest, int index)
                        {
-                               list.CopyTo (dest, index);
+                               int [] indices = GetIndices ();
+                               Array.Copy (indices, 0, dest, index, indices.Length);
                        }
 
                        int IList.Add (object value)
@@ -2104,12 +2235,16 @@ namespace System.Windows.Forms
 
                        bool IList.Contains (object checkedIndex)
                        {
-                               return list.Contains (checkedIndex);
+                               if (!(checkedIndex is int))
+                                       return false;
+                               return Contains ((int) checkedIndex);
                        }
 
                        int IList.IndexOf (object checkedIndex)
                        {
-                               return list.IndexOf (checkedIndex);
+                               if (!(checkedIndex is int))
+                                       return -1;
+                               return IndexOf ((int) checkedIndex);
                        }
 
                        void IList.Insert (int index, object value)
@@ -2129,16 +2264,30 @@ namespace System.Windows.Forms
 
                        public int IndexOf (int checkedIndex)
                        {
-                               return list.IndexOf (checkedIndex);
+                               int [] indices = GetIndices ();
+                               for (int i = 0; i < indices.Length; i++) {
+                                       if (indices [i] == checkedIndex)
+                                               return i;
+                               }
+                               return -1;
                        }
                        #endregion      // Public Methods
 
+                       private int [] GetIndices ()
+                       {
+                               int [] indices = new int [Count];
+                               for (int i = 0; i < owner.CheckedItems.Count; i++) {
+                                       ListViewItem item = owner.CheckedItems [i];
+                                       indices [i] = item.Index;
+                               }
+                               return indices;
+                       }
                }       // CheckedIndexCollection
 
                public class CheckedListViewItemCollection : IList, ICollection, IEnumerable
                {
-                       internal ArrayList list;
-                       private ListView owner;
+                       internal readonly ArrayList list;
+                       private readonly ListView owner;
 
                        #region Public Constructor
                        public CheckedListViewItemCollection (ListView owner)
@@ -2151,7 +2300,11 @@ namespace System.Windows.Forms
                        #region Public Properties
                        [Browsable (false)]
                        public int Count {
-                               get { return list.Count; }
+                               get {
+                                       if (!owner.CheckBoxes)
+                                               return 0;
+                                       return list.Count;
+                               }
                        }
 
                        public bool IsReadOnly {
@@ -2160,8 +2313,8 @@ namespace System.Windows.Forms
 
                        public ListViewItem this [int index] {
                                get {
-                                       if (index < 0 || index >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
+                                       if (index < 0 || index >= Count)
+                                               throw new ArgumentOutOfRangeException ("index");
                                        return (ListViewItem) list [index];
                                }
                        }
@@ -2187,16 +2340,22 @@ namespace System.Windows.Forms
                        #region Public Methods
                        public bool Contains (ListViewItem item)
                        {
+                               if (!owner.CheckBoxes)
+                                       return false;
                                return list.Contains (item);
                        }
 
                        public void CopyTo (Array dest, int index)
                        {
+                               if (!owner.CheckBoxes)
+                                       return;
                                list.CopyTo (dest, index);
                        }
 
                        public IEnumerator GetEnumerator ()
                        {
+                               if (!owner.CheckBoxes)
+                                       return (new ListViewItem [0]).GetEnumerator ();
                                return list.GetEnumerator ();
                        }
 
@@ -2212,12 +2371,16 @@ namespace System.Windows.Forms
 
                        bool IList.Contains (object item)
                        {
-                               return list.Contains (item);
+                               if (!(item is ListViewItem))
+                                       return false;
+                               return Contains ((ListViewItem) item);
                        }
 
                        int IList.IndexOf (object item)
                        {
-                               return list.IndexOf (item);
+                               if (!(item is ListViewItem))
+                                       return -1;
+                               return IndexOf ((ListViewItem) item);
                        }
 
                        void IList.Insert (int index, object value)
@@ -2237,10 +2400,11 @@ namespace System.Windows.Forms
 
                        public int IndexOf (ListViewItem item)
                        {
+                               if (!owner.CheckBoxes)
+                                       return -1;
                                return list.IndexOf (item);
                        }
                        #endregion      // Public Methods
-
                }       // CheckedListViewItemCollection
 
                public class ColumnHeaderCollection : IList, ICollection, IEnumerable
@@ -2269,7 +2433,7 @@ namespace System.Windows.Forms
                        public virtual ColumnHeader this [int index] {
                                get {
                                        if (index < 0 || index >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
+                                               throw new ArgumentOutOfRangeException ("index");
                                        return (ColumnHeader) list [index];
                                }
                        }
@@ -2397,7 +2561,7 @@ namespace System.Windows.Forms
                                // LAMESPEC: MSDOCS say greater than or equal to the value of the Count property
                                // but it's really only greater.
                                if (index < 0 || index > list.Count)
-                                       throw new ArgumentOutOfRangeException ("Index out of range.");
+                                       throw new ArgumentOutOfRangeException ("index");
 
                                value.owner = this.owner;
                                list.Insert (index, value);
@@ -2420,7 +2584,7 @@ namespace System.Windows.Forms
                        public virtual void RemoveAt (int index)
                        {
                                if (index < 0 || index >= list.Count)
-                                       throw new ArgumentOutOfRangeException ("Index out of range.");
+                                       throw new ArgumentOutOfRangeException ("index");
 
                                // TODO: Update Column internal index ?
                                list.RemoveAt (index);
@@ -2434,7 +2598,7 @@ namespace System.Windows.Forms
                public class ListViewItemCollection : IList, ICollection, IEnumerable
                {
                        internal ArrayList list;
-                       private ListView owner;
+                       private readonly ListView owner;
 
                        #region Public Constructor
                        public ListViewItemCollection (ListView owner)
@@ -2457,13 +2621,13 @@ namespace System.Windows.Forms
                        public virtual ListViewItem this [int displayIndex] {
                                get {
                                        if (displayIndex < 0 || displayIndex >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
+                                               throw new ArgumentOutOfRangeException ("displayIndex");
                                        return (ListViewItem) list [displayIndex];
                                }
 
                                set {
                                        if (displayIndex < 0 || displayIndex >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
+                                               throw new ArgumentOutOfRangeException ("displayIndex");
 
                                        if (list.Contains (value))
                                                throw new ArgumentException ("An item cannot be added more than once. To add an item again, you need to clone it.", "value");
@@ -2507,11 +2671,8 @@ namespace System.Windows.Forms
                                value.Owner = owner;
                                list.Add (value);
 
-                               if (owner.Sorting != SortOrder.None)
-                                       owner.Sort ();
-
+                               owner.Sort (false);
                                owner.Redraw (true);
-
                                return value;
                        }
 
@@ -2531,18 +2692,14 @@ namespace System.Windows.Forms
                        {
                                list.Clear ();
                                owner.SelectedItems.list.Clear ();
-                               owner.SelectedIndices.list.Clear ();
                                owner.CheckedItems.list.Clear ();
-                               owner.CheckedIndices.list.Clear ();
 
                                foreach (ListViewItem item in values) {
                                        item.Owner = owner;
                                        list.Add (item);
                                }
 
-                               if (owner.Sorting != SortOrder.None)
-                                       owner.Sort ();
-
+                               owner.Sort (false);
                                owner.Redraw (true);
                        }
 
@@ -2552,9 +2709,7 @@ namespace System.Windows.Forms
                                owner.h_scroll.Value = owner.v_scroll.Value = 0;
                                list.Clear ();
                                owner.SelectedItems.list.Clear ();
-                               owner.SelectedIndices.list.Clear ();
                                owner.CheckedItems.list.Clear ();
-                               owner.CheckedIndices.list.Clear ();
                                owner.Redraw (true);
                        }
 
@@ -2623,10 +2778,8 @@ namespace System.Windows.Forms
 
                        public ListViewItem Insert (int index, ListViewItem item)
                        {
-                               // LAMESPEC: MSDOCS say greater than or equal to the value of the Count property
-                               // but it's really only greater.
                                if (index < 0 || index > list.Count)
-                                       throw new ArgumentOutOfRangeException ("Index out of range.");
+                                       throw new ArgumentOutOfRangeException ("index");
 
                                if (list.Contains (item))
                                        throw new ArgumentException ("An item cannot be added more than once. To add an item again, you need to clone it.", "item");
@@ -2653,23 +2806,17 @@ namespace System.Windows.Forms
                                        return;
                                        
                                owner.SelectedItems.list.Remove (item);
-                               owner.SelectedIndices.list.Remove (item.Index);
                                owner.CheckedItems.list.Remove (item);
-                               owner.CheckedIndices.list.Remove (item.Index);
                                list.Remove (item);
                                owner.Redraw (true);                            
                        }
 
                        public virtual void RemoveAt (int index)
                        {
-                               if (index < 0 || index >= list.Count)
-                                       throw new ArgumentOutOfRangeException ("Index out of range.");
-
+                               ListViewItem item = this [index];
                                list.RemoveAt (index);
-                               owner.SelectedItems.list.RemoveAt (index);
-                               owner.SelectedIndices.list.RemoveAt (index);
-                               owner.CheckedItems.list.RemoveAt (index);
-                               owner.CheckedIndices.list.RemoveAt (index);
+                               owner.SelectedItems.list.Remove (item);
+                               owner.CheckedItems.list.Remove (item);
                                owner.Redraw (false);
                        }
                        #endregion      // Public Methods
@@ -2678,13 +2825,11 @@ namespace System.Windows.Forms
 
                public class SelectedIndexCollection : IList, ICollection, IEnumerable
                {
-                       internal ArrayList list;
-                       private ListView owner;
+                       private readonly ListView owner;
 
                        #region Public Constructor
                        public SelectedIndexCollection (ListView owner)
                        {
-                               list = new ArrayList ();
                                this.owner = owner;
                        }
                        #endregion      // Public Constructor
@@ -2692,7 +2837,9 @@ namespace System.Windows.Forms
                        #region Public Properties
                        [Browsable (false)]
                        public int Count {
-                               get { return list.Count; }
+                               get {
+                                       return owner.SelectedItems.Count;
+                               }
                        }
 
                        public bool IsReadOnly {
@@ -2701,14 +2848,15 @@ namespace System.Windows.Forms
 
                        public int this [int index] {
                                get {
-                                       if (index < 0 || index >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
-                                       return (int) list [index];
+                                       int [] indices = GetIndices ();
+                                       if (index < 0 || index >= indices.Length)
+                                               throw new ArgumentOutOfRangeException ("index");
+                                       return indices [index];
                                }
                        }
 
                        bool ICollection.IsSynchronized {
-                               get { return list.IsSynchronized; }
+                               get { return false; }
                        }
 
                        object ICollection.SyncRoot {
@@ -2728,17 +2876,24 @@ namespace System.Windows.Forms
                        #region Public Methods
                        public bool Contains (int selectedIndex)
                        {
-                               return list.Contains (selectedIndex);
+                               int [] indices = GetIndices ();
+                               for (int i = 0; i < indices.Length; i++) {
+                                       if (indices [i] == selectedIndex)
+                                               return true;
+                               }
+                               return false;
                        }
 
                        public void CopyTo (Array dest, int index)
                        {
-                               list.CopyTo (dest, index);
+                               int [] indices = GetIndices ();
+                               Array.Copy (indices, 0, dest, index, indices.Length);
                        }
 
                        public IEnumerator GetEnumerator ()
                        {
-                               return list.GetEnumerator ();
+                               int [] indices = GetIndices ();
+                               return indices.GetEnumerator ();
                        }
 
                        int IList.Add (object value)
@@ -2753,12 +2908,16 @@ namespace System.Windows.Forms
 
                        bool IList.Contains (object selectedIndex)
                        {
-                               return list.Contains (selectedIndex);
+                               if (!(selectedIndex is int))
+                                       return false;
+                               return Contains ((int) selectedIndex);
                        }
 
                        int IList.IndexOf (object selectedIndex)
                        {
-                               return list.IndexOf (selectedIndex);
+                               if (!(selectedIndex is int))
+                                       return -1;
+                               return IndexOf ((int) selectedIndex);
                        }
 
                        void IList.Insert (int index, object value)
@@ -2778,16 +2937,31 @@ namespace System.Windows.Forms
 
                        public int IndexOf (int selectedIndex)
                        {
-                               return list.IndexOf (selectedIndex);
+                               int [] indices = GetIndices ();
+                               for (int i = 0; i < indices.Length; i++) {
+                                       if (indices [i] == selectedIndex)
+                                               return i;
+                               }
+                               return -1;
                        }
                        #endregion      // Public Methods
 
+                       private int [] GetIndices ()
+                       {
+                               int [] indices = new int [Count];
+                               for (int i = 0; i < owner.SelectedItems.Count; i++) {
+                                       ListViewItem item = owner.SelectedItems [i];
+                                       indices [i] = item.Index;
+                               }
+                               return indices;
+                       }
+
                }       // SelectedIndexCollection
 
                public class SelectedListViewItemCollection : IList, ICollection, IEnumerable
                {
                        internal ArrayList list;
-                       private ListView owner;
+                       private readonly ListView owner;
 
                        #region Public Constructor
                        public SelectedListViewItemCollection (ListView owner)
@@ -2800,7 +2974,11 @@ namespace System.Windows.Forms
                        #region Public Properties
                        [Browsable (false)]
                        public int Count {
-                               get { return list.Count; }
+                               get {
+                                       if (!owner.IsHandleCreated)
+                                               return 0;
+                                       return list.Count;
+                               }
                        }
 
                        public bool IsReadOnly {
@@ -2809,8 +2987,8 @@ namespace System.Windows.Forms
 
                        public ListViewItem this [int index] {
                                get {
-                                       if (index < 0 || index >= list.Count)
-                                               throw new ArgumentOutOfRangeException ("Index out of range.");
+                                       if (index < 0 || index >= Count)
+                                               throw new ArgumentOutOfRangeException ("index");
                                        return (ListViewItem) list [index];
                                }
                        }
@@ -2836,6 +3014,9 @@ namespace System.Windows.Forms
                        #region Public Methods
                        public void Clear ()
                        {
+                               if (!owner.IsHandleCreated)
+                                       return;
+
                                ArrayList copy = (ArrayList) list.Clone ();
                                for (int i = 0; i < copy.Count; i++)
                                        ((ListViewItem) copy [i]).Selected = false;
@@ -2845,16 +3026,22 @@ namespace System.Windows.Forms
 
                        public bool Contains (ListViewItem item)
                        {
+                               if (!owner.IsHandleCreated)
+                                       return false;
                                return list.Contains (item);
                        }
 
                        public void CopyTo (Array dest, int index)
                        {
+                               if (!owner.IsHandleCreated)
+                                       return;
                                list.CopyTo (dest, index);
                        }
 
                        public IEnumerator GetEnumerator ()
                        {
+                               if (!owner.IsHandleCreated)
+                                       return (new ListViewItem [0]).GetEnumerator ();
                                return list.GetEnumerator ();
                        }
 
@@ -2865,12 +3052,16 @@ namespace System.Windows.Forms
 
                        bool IList.Contains (object item)
                        {
-                               return list.Contains (item);
+                               if (!(item is ListViewItem))
+                                       return false;
+                               return Contains ((ListViewItem) item);
                        }
 
                        int IList.IndexOf (object item)
                        {
-                               return list.IndexOf (item);
+                               if (!(item is ListViewItem))
+                                       return -1;
+                               return IndexOf ((ListViewItem) item);
                        }
 
                        void IList.Insert (int index, object value)
@@ -2890,6 +3081,8 @@ namespace System.Windows.Forms
 
                        public int IndexOf (ListViewItem item)
                        {
+                               if (!owner.IsHandleCreated)
+                                       return -1;
                                return list.IndexOf (item);
                        }
                        #endregion      // Public Methods