Changeset 945

Timestamp:

5/1/2009 3:22:02 AM (4 years ago)

Author:

lowjoel

Message:

Fully implemented the ToolBarItemCollection? class.

File:

• branches/eraser6/Eraser/ToolBar.cs (modified) (4 diffs)

branches/eraser6/Eraser/ToolBar.cs

@@ -43 +43 @@
 
             //Hook mouse move events to show the currently selected item
-            MouseMove += new MouseEventHandler(ToolBar_MouseMove);
-            MouseLeave += new EventHandler(ToolBar_MouseLeave);
-            MouseClick += new MouseEventHandler(ToolBar_MouseClick);
+            MouseMove += ToolBar_MouseMove;
+            MouseLeave += ToolBar_MouseLeave;
+            MouseClick += ToolBar_MouseClick;
         }
 
@@ -175 +175 @@
         {
             get;
-            set;
+            private set;
         }
     }
@@ -284 +284 @@
         #region ICollection<ToolBarItem> Members
         public void Add(ToolBarItem item)
+        {
+            Insert(Count, item);
+        }
+
+        public void Clear()
+        {
+            foreach (ToolBarItem item in list)
+                item.Window = null;
+            list.Clear();
+            window.Redraw();
+        }
+
+        public bool Contains(ToolBarItem item)
+        {
+            return list.Contains(item);
+        }
+
+        public void CopyTo(ToolBarItem[] array, int arrayIndex)
+        {
+            list.CopyTo(array, arrayIndex);
+        }
+
+        public int Count
+        {
+            get { return list.Count; }
+        }
+
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        public bool Remove(ToolBarItem item)
+        {
+            int index = IndexOf(item);
+            if (index < 0)
+                return false;
+
+            RemoveAt(index);
+            return true;
+        }
+        #endregion
+
+        #region IEnumerable<ToolBarItem> Members
+        public IEnumerator<ToolBarItem> GetEnumerator()
+        {
+            return list.GetEnumerator();
+        }
+        #endregion
+
+        #region IEnumerable Members
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return list.GetEnumerator();
+        }
+        #endregion
+
+        #region IList<ToolBarItem> Members
+        public int IndexOf(ToolBarItem item)
+        {
+            return list.IndexOf(item);
+        }
+
+        public void Insert(int index, ToolBarItem item)
         {
             if (item.Window != null)
@@ -291 +355 @@
 
             item.Window = window;
-            list.Add(item);
+            list.Insert(index, item);
             window.Redraw();
         }
 
-        public void Clear()
-        {
-            foreach (ToolBarItem item in list)
-                item.Window = null;
-            list.Clear();
+        public void RemoveAt(int index)
+        {
+            ToolBarItem item = list[index];
+            item.Window = null;
+            list.RemoveAt(index);
             window.Redraw();
         }
 
-        public bool Contains(ToolBarItem item)
-        {
-            return list.Contains(item);
-        }
-
-        public void CopyTo(ToolBarItem[] array, int arrayIndex)
-        {
-            list.CopyTo(array, arrayIndex);
-        }
-
-        public int Count
-        {
-            get { return list.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        public bool Remove(ToolBarItem item)
-        {
-            item.Window = null;
-            bool result = list.Remove(item);
-            window.Redraw();
-            return result;
-        }
-        #endregion
-
-        #region IEnumerable<ToolBarItem> Members
-        public IEnumerator<ToolBarItem> GetEnumerator()
-        {
-            return list.GetEnumerator();
-        }
-        #endregion
-
-        #region IEnumerable Members
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return list.GetEnumerator();
-        }
-        #endregion
-
-        #region IList<ToolBarItem> Members
-        public int IndexOf(ToolBarItem item)
-        {
-            return list.IndexOf(item);
-        }
-
-        public void Insert(int index, ToolBarItem item)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RemoveAt(int index)
-        {
-            throw new NotImplementedException();
-        }
-
         public ToolBarItem this[int index]
         {
             get
             {
-                throw new NotImplementedException();
+                return list[index];
             }
             set
             {
-                throw new NotImplementedException();
+                list[index] = value;
+                if (window != null)
+                    window.Redraw();
             }
         }