2003-08-24 Duncan Mak <duncan@ximian.com>

	* ListControl.cs: Indentation, coding style fixes.

2003-08-24  Duncan Mak  <duncan@ximian.com>

	Patches from Brian Takita <brian.takita@runbox.com>

	* GroupBox.cs (OnPaintBackground): Commented out.
	* ListControl.cs (DataSource): Fixed visibility of property and
	field.
	* MonthCalander.cs: Should match Specs better.

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

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs
index 086b709a7dcdad8ff851a925e94b70a326627a3c..9d9f14a9fec60b19484432430d41f97997786501 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs
@@ -32,9 +32,6 @@ namespace System.Windows.Forms {
                protected AxHost(string clsid,int flags){
                }
                
-               
-               
-               
                /// --- public Properties ---
                /// Properties supporting .NET framework, only. Not stubbed out:
                public bool EditMode {
@@ -172,7 +169,7 @@ namespace System.Windows.Forms {
                
                [MonoTODO]
                //FIXME
-               public virtual bool RightToLeft {
+               public new virtual bool RightToLeft {
                        get {
                                throw new NotImplementedException (); 
                        }
@@ -457,47 +454,6 @@ namespace System.Windows.Forms {
                        base.WndProc(ref m);
                }
                
-               /// --- events ---
-
-               //[MonoToDo]
-               //public event EventHandler BackColorChanged;
-               //public new event EventHandler BackgroundImageChanged;
-               //public new event EventHandler BindingContextChanged;
-               //public new event UICuesEventHandler ChangeUICues;
-               //public new event EventHandler Click;
-               //public new event EventHandler ContextMenuChanged;
-               //public new event EventHandler CursorChanged;
-               //public new event EventHandler DoubleClick;
-               //public new event DragEventHandler DragDrop;
-               //public new event DragEventHandler DragEnter;
-               //public new event EventHandler DragLeave;
-               //public new event DragEventHandler DragOver;
-               //public new event EventHandler EnabledChanged;
-               //public new event EventHandler FontChanged;
-               //public new event EventHandler ForeColorChanged;
-               //public new event GiveFeedbackEventHandler GiveFeedback;
-               //public new event HelpEventHandler HelpRequested;
-               //public new event EventHandler ImeModeChanged;
-               //public new event KeyEventHandler KeyDown;
-               //public new event KeyPressEventHandler KeyPress;
-               //public new event KeyEventHandler KeyUp;
-               //public new event LayoutEventHandler Layout;
-               //public new event MouseEventHandler MouseDown;
-               //public new event EventHandler MouseEnter;
-               //public new event EventHandler MouseHover;
-               //public new event EventHandler MouseLeave;
-               //public new event MouseEventHandler MouseMove;
-               //public new event MouseEventHandler MouseUp;
-               //public new event MouseEventHandler MouseWheel;
-               //public new event PaintEventHandler Paint;
-               //public new event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;
-               //public new event QueryContinueDragEventHandler QueryContinueDrag;
-               //public new event EventHandler RightToLeftChanged;
-               //public new event EventHandler StyleChanged;
-               //public new event EventHandler TabIndexChanged;
-               //public new event EventHandler TabStopChanged;
-               //public new event EventHandler TextChanged;
-               public event CancelEventHandler Validating;
                /// --- public delegates ---
                //[Serializable]
                protected delegate void AboutBoxDelegate();
@@ -611,12 +567,6 @@ namespace System.Windows.Forms {
                        }
                }
 
-               AccessibleObject AccessibilityObject {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-
                //protected bool RenderRightToLeft{
                //}
 

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog
index 268cb45dc191023dd84a758ef68b92505a8b0f1f..c86e33b8376a0c7bf557de501bbce59c8d57adb3 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-24  Duncan Mak  <duncan@ximian.com>
+
+       * ListControl.cs: Indentation, coding style fixes.
+       
+2003-08-24  Duncan Mak  <duncan@ximian.com>
+
+       Patches from Brian Takita <brian.takita@runbox.com>
+
+       * GroupBox.cs (OnPaintBackground): Commented out.
+       * ListControl.cs (DataSource): Fixed visibility of property and
+       field. 
+       * MonthCalander.cs: Should match Specs better.
+
 2003-08-24  Alexandre Pigolkine <pigolkine@gmx.de>
        * ControlPaint.cs               DrawRadioButton and DrawCheckBox improved
 

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs
index b37028955ec9a08fa556de85fc2e454eac49fe85..349c55e2cb0237ad8ac1a001fa1f7f69ea887bd6 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs
@@ -141,12 +141,10 @@ namespace System.Windows.Forms {
                
                // --- CheckBox methods ---
 
-               // I do not think this is part of the spec
-               //protected override AccessibleObject CreateAccessibilityInstance() 
-               //{
-               //      throw new NotImplementedException ();
-               //}
-               
+               protected override AccessibleObject CreateAccessibilityInstance() 
+               {
+                       throw new NotImplementedException ();
+               }
                
                // [event methods]
                [MonoTODO]
@@ -237,7 +235,7 @@ namespace System.Windows.Forms {
                        }
                }
                
-               internal override void ButtonPaint (PaintEventArgs e) 
+               protected override void OnPaint (PaintEventArgs e) 
                {
                        Rectangle paintBounds = ClientRectangle;
                        Bitmap bmp = new Bitmap( paintBounds.Width, paintBounds.Height,e.Graphics);
@@ -275,6 +273,18 @@ namespace System.Windows.Forms {
                        bmp.Dispose();
                }
                
+               protected override void WndProc (ref Message m) {
+                       switch (m.Msg) {
+                               case Msg.WM_DRAWITEM: {
+                                       m.Result = (IntPtr)1;
+                               }
+                                       break;
+                               default:
+                                       base.WndProc (ref m);
+                                       break;
+                       }
+               }
+               
                /// --- CheckBox events ---
                public event EventHandler AppearanceChanged;
                public event EventHandler CheckedChanged;

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs
index 9fa973fe5bc3168cff3384483b238f9054ad968e..0c9f479808e21e2d5231098852dbb004cf06d090 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs
@@ -88,10 +88,6 @@ namespace System.Windows.Forms {
                        Invalidate ( );
                }
 
-               protected virtual void OnPaintBackground (PaintEventArgs e)
-               {
-               }
-
                public override string Text {
                        get { return base.Text; }
                        set { 

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs
index 6d1abbef0b3ab9c8122451b28447a7721c32aaaa..af4efcd6b594c253f1b68b167e8cdc8b156231cb 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs
@@ -4,11 +4,13 @@
 // Author:
 //   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)
 //     Dennis Hayes (dennish@raytek.com)
+//  Brian Takita (brian.takita@runbox.com)
 // (C) 2002/3 Ximian, Inc
 //
 using System;
 using System.Drawing;
 using System.Collections;
+using System.ComponentModel;
 using System.Reflection;
 
 namespace System.Windows.Forms {
@@ -17,29 +19,29 @@ namespace System.Windows.Forms {
        //
        // </summary>
 
-    public abstract class ListControl : Control {
+       public abstract class ListControl : Control {
 
-               protected string DisplayMember_ = String.Empty;
+               internal string DisplayMember_ = String.Empty;
 
-               protected object DataSource_;
+               internal object DataSource_;
                //ControlStyles controlStyles;
                //
                //  --- Public Properties
                //
                [MonoTODO]
-               public virtual object DataSource {
+               public object DataSource {
                        get {
                                return DataSource_;
                        }
-
                        set {
                                if (DataSource_ != value) {
-                                       if ((value is IList) || (value is System.ComponentModel.IListSource)) {
+                                       if ((value is IList) || (value is IListSource)) {
                                                DataSource_ = value;
                                                OnDataSourceChanged (new EventArgs ());
 
-                                       } else
+                                       } else {
                                                throw new Exception ("Complex DataBinding accepts as a data source either an IList or an IListSource");
+                                       }
                                }
                        }
                }
@@ -49,27 +51,28 @@ namespace System.Windows.Forms {
                                return DisplayMember_;
                        }
                        set {
-                               if( DisplayMember_ != value) {
+                               if (DisplayMember_ != value) {
                                        DisplayMember_ = value;
                                        OnDisplayMemberChanged(new EventArgs());
                                }
                        }
                }
                
-               internal string getDisplayMemberOfObj( object obj) {
+               internal string getDisplayMemberOfObj (object obj)
+               {
                        string objectString = String.Empty;
                        Type t = obj.GetType();
-                       if( DisplayMember != String.Empty) {
-                               if( t != null) {
-                                       PropertyInfo prop = t.GetProperty(DisplayMember);
-                                       if( prop != null) {
-                                               objectString = prop.GetValue(obj, null).ToString();
-                                       }
+
+                       if (DisplayMember != String.Empty) {
+                               if (t != null) {
+                                       PropertyInfo prop = t.GetProperty (DisplayMember);
+                                       if (prop != null) 
+                                               objectString = prop.GetValue (obj, null).ToString ();
                                }
                        }
-                       if( objectString == String.Empty) {
+                       if (objectString == String.Empty)
                                objectString = obj.ToString();
-                       }
+
                        return objectString;
                }
                
@@ -79,8 +82,9 @@ namespace System.Windows.Forms {
                                owner_ = owner;
                        }
 
+
                        public int Compare(object x, object y) {
-                               return owner_.getDisplayMemberOfObj(x).CompareTo(owner_.getDisplayMemberOfObj(y));
+                               return owner_.getDisplayMemberOfObj(x).CompareTo (owner_.getDisplayMemberOfObj (y));
                        }
                }
                
@@ -112,8 +116,8 @@ namespace System.Windows.Forms {
                //
 
                [MonoTODO]
-               public string GetItemText(object item)
-               {
+               public string GetItemText (object item)
+                {
                        throw new NotImplementedException ();
                }
 
@@ -129,8 +133,7 @@ namespace System.Windows.Forms {
                // --- Protected Constructor
                //
                [MonoTODO]
-               protected ListControl()
-               {
+               protected ListControl () {
                        
                }
 
@@ -148,27 +151,31 @@ namespace System.Windows.Forms {
                //  --- Protected Methods
                //
                [MonoTODO]
-               protected override bool IsInputKey(Keys keyData)
-               {
+               protected override bool IsInputKey (Keys keyData)
+                {
                        //FIXME:
                        return base.IsInputKey(keyData);
                }
                [MonoTODO]
-               protected virtual void OnDataSourceChanged(EventArgs e) {
+               protected virtual void OnDataSourceChanged (EventArgs e)
+                {
                        //FIXME:
                }
                [MonoTODO]
-               protected virtual void OnDisplayMemberChanged(EventArgs e) {
+               protected virtual void OnDisplayMemberChanged (EventArgs e)
+                {
                        //FIXME:
                }
 
                [MonoTODO]
-               protected virtual void OnSelectedIndexChanged(EventArgs e) {
+               protected virtual void OnSelectedIndexChanged (EventArgs e)
+                {
                        //FIXME:
                }               
                
                [MonoTODO]
-               protected virtual void OnSelectedValueChanged(EventArgs e){
+               protected virtual void OnSelectedValueChanged (EventArgs e)
+                {
                        //FIXME:
                }
 
@@ -176,14 +183,14 @@ namespace System.Windows.Forms {
                public event EventHandler ValueMemberChanged;
                
                [MonoTODO]
-               protected override void OnBindingContextChanged(EventArgs e)
-               {
+               protected override void OnBindingContextChanged (EventArgs e)
+                {
                        //FIXME:
                        base.OnBindingContextChanged(e);
                }
 
                [MonoTODO]
-               protected abstract void RefreshItem(int index);
+               protected abstract void RefreshItem (int index);
 
-        }
+       }
 }

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
index ddc8b0b5f2e5154be0ef933af0a3f44e770e37fc..e2caa72a799e1562dd912f7635a9a7ff5917a7b8 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
@@ -44,50 +44,6 @@ namespace System.Windows.Forms {
                public void RemoveAllAnnuallyBoldedDates() {
                        //FIXME:
                }
-               //[MonoTODO]
-               //public void BringToFront() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void CreateControl() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Hide() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate(bool b) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate(Rectangle r) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate(Region rg) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate(Rectangle r, bool b) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Invalidate(Region rg, bool b) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void PerformLayout() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void PerformLayout(Control ctl, string s) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public void RemoveAllBoldedDates() {
                        //FIXME:
@@ -108,42 +64,6 @@ namespace System.Windows.Forms {
                public void RemoveMonthlyBoldedDate(DateTime date) {
                        //FIXME:
                }
-               //[MonoTODO]
-               //public void ResetBindings() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void ResetImeMode() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void ResumeLayout() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void ResumeLayout(bool b) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Scale(float ft) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Scale(float ft, float ft1) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Select() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void SendToBack() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void SetBounds(int i, int i1, int i2, int i3) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public void SetCalendarDimensions(int x, int y) {
                        //FIXME:
@@ -156,86 +76,18 @@ namespace System.Windows.Forms {
                public void SetSelectionRange(DateTime date1, DateTime date2) {
                        //FIXME:
                }
-               //[MonoTODO]
-               //public void Show() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void SuspendLayout() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public void Update() {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public void UpdateBoldedDates() {
                        //FIXME:
                }
-               //[MonoTODO]
-               //public IAsyncResult BeginInvoke(Delegate dels) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public IAsyncResult BeginInvoke(Delegate dels, object[] objs) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public bool Contains(Control ctl) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Graphics CreateGraphics() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public DragDropEffects DoDragDrop(object o, DragDropEffects dde) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public object EndEnvoke(IAsyncResult asyncResult) {
                        throw new NotImplementedException ();
                }
-               //[MonoTODO]
-               //public static bool Equals(object o, object o1) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Form FindForm() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public bool Focus() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Control GetChildAtPoint(Point pt) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public IContainerControl GetContainerControl() {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public SelectionRange GetDisplayRange(bool visible) {
                        throw new NotImplementedException ();
                }
-               //[MonoTODO]
-               //public virtual int GetHashCode() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public object GetLifetimeService() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Control GetNextControl(Control ctl, bool b) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Type GetType() {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public HitTestInfo HitTest(Point point) {
                        throw new NotImplementedException ();
@@ -244,133 +96,16 @@ namespace System.Windows.Forms {
                public HitTestInfo HitTest(int x, int y) {
                        throw new NotImplementedException ();
                }
-               //[MonoTODO]
-               //public virtual object InitializeLifetimeService() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public object Invoke(Delegate d) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public object Invoke(Delegate d, object[] obj) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Point PointToClient(Point pt) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Point PointToScreen(Point pt) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Rectangle RectangleToClient(Rectangle r) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public Rectangle RectangleToScreen(Rectangle r) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public bool SelectNextControl(Control ctl, bool b, bool b1, bool b2, bool b3) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                public override string ToString() {
                        //FIXME:
                        return base.ToString();
                }
-               //[MonoTODO]
-               //public virtual ObjRef CreateObjRef(Type reqType) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual bool Equals(object o) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual bool PreProcessMessage(ref Message msg) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void Refresh() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetBackColor() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetCursor() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetFont() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetForeColor() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetRightToLeft() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void ResetText() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //public virtual void Select(bool b, bool b1) {
-               //      throw new NotImplementedException ();
-               //}
 
                //
                //  --- Public Properties
                //
                [MonoTODO]
-               public AccessibleObject AccessibilityObject  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public string AccessibleDefaultActionDescription  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                       }
-               }
-               [MonoTODO]
-               public string AccessibleDescription  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               //[MonoTODO]
-               //public string AccessibleName  {
-               //      get {
-               //              throw new NotImplementedException ();
-               //      }
-               //      set {
-               //              //FIXME:
-               //      }
-               //}
-               [MonoTODO]
-               public AccessibleRole AccessibleRole  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public override bool AllowDrop  {
                        get {
                                throw new NotImplementedException ();
@@ -434,21 +169,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public int Bottom  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public Rectangle Bounds  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public Size CalendarDimensions  {
                        get {
                                throw new NotImplementedException ();
@@ -457,127 +177,6 @@ namespace System.Windows.Forms {
                                //FIXME:
                        }
                }
-               [MonoTODO]
-               public bool CanFocus  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool CanSelect  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool Capture  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public bool CausesValidation  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Rectangle ClientRectangle  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public Size ClientSize  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public string CompanyName  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public IContainer Container  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool ContainsFocus  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override ContextMenu ContextMenu  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Control.ControlCollection Controls  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool Created  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override Cursor Cursor  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public ControlBindingsCollection DataBindings  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override Rectangle DisplayRectangle  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool Disposing  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override DockStyle Dock  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-
                [MonoTODO]
                public Day FirstDayOfWeek  {
                        get {
@@ -588,21 +187,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public override bool Focused  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override Font Font  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public override Color ForeColor  {
                        get {
                                throw new NotImplementedException ();
@@ -612,60 +196,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public bool HasChildren  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public int Height  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public bool IsAccessible  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public bool IsDisposed  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool IsHandleCreated  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public int Left  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Point Location  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public DateTime MaxDate  {
                        get {
                                throw new NotImplementedException ();
@@ -702,66 +232,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public string Name  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Control Parent  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public string ProductName  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public string ProductVersion  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public bool RecreatingHandle  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public Region Region  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public int Right  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               public override RightToLeft RightToLeft  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public int ScrollChange  {
                        get {
                                throw new NotImplementedException ();
@@ -831,51 +301,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public override ISite Site  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Size Size  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public int TabIndex  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public bool TabStop  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public object Tag  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
                public override string Text  {
                        get {
                                //FIXME:
@@ -920,21 +345,6 @@ namespace System.Windows.Forms {
                        }
                }
                [MonoTODO]
-               public int Top  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public Control TopLevelControl  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
                public Color TrailingForeColor  {
                        get {
                                throw new NotImplementedException ();
@@ -943,24 +353,6 @@ namespace System.Windows.Forms {
                                //FIXME:
                        }
                }
-               [MonoTODO]
-               public bool Visible  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               public int Width  {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
 
                //
                //  --- Protected Methods
@@ -970,22 +362,10 @@ namespace System.Windows.Forms {
                        //FIXME:
                        base.CreateHandle();
                }
-               //[MonoTODO]
-               //protected bool GetStyle(ControlStyles flag) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected bool GetTopLevel() {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                protected override bool IsInputKey(Keys keyData) {
                        throw new NotImplementedException ();
                }
-               //[MonoTODO]
-               //protected object MemberwiseClone() {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                protected override void OnBackColorChanged(EventArgs e) {
                        //FIXME:
@@ -995,34 +375,6 @@ namespace System.Windows.Forms {
                        //FIXME:
                }
                [MonoTODO]
-               protected internal virtual bool ProcessKeyMessage(ref Message m) {
-                       throw new NotImplementedException ();
-               }
-               //[MonoTODO]
-               //protected ContentAlignment RtlTranslateAlignment(ContentAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected ContentAlignment RtlTranslateContent(ContentAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected HorizontalAlignment RtlTranslateHorizontal(HorizontalAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected LeftRightAlignment RtlTranslateLeftRight(LeftRightAlignment align) {
-               //      throw new NotImplementedException ();
-               //}
-               [MonoTODO]
                protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) {
                        //FIXME:
                }
@@ -1034,50 +386,6 @@ namespace System.Windows.Forms {
                {
                        //FIXME:
                }
-               //[MonoTODO]
-               //protected virtual void InitLayout() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnBackgroundImageChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnBindingContextChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnCausesValidationChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnChangeUICues(UICuesEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnClick(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnContextMenuChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnControlAdded(ControlEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnControlRemoved(ControlEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnCreateControl() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnCursorChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                protected virtual void OnDateChanged(DateRangeEventArgs drevent) {
                        //FIXME:
@@ -1086,38 +394,6 @@ namespace System.Windows.Forms {
                protected virtual void OnDateSelected(DateRangeEventArgs drevent) {
                        //FIXME:
                }
-               //[MonoTODO]
-               //protected virtual void OnDockChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnDoubleClick(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnDragDrop(DragEventArgs drgevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnDragEnter(DragEventArgs drgevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnDragLeave(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnDragOver(DragEventArgs drgevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnEnabledChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnEnter(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
                [MonoTODO]
                protected override void OnFontChanged(EventArgs e) {
                        //FIXME:
@@ -1126,309 +402,6 @@ namespace System.Windows.Forms {
                protected override void OnForeColorChanged(EventArgs e) {
                        //FIXME:
                }
-               //[MonoTODO]
-               //protected virtual void OnGiveFeedback(GiveFeedbackEventArgs gfbevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnGotFocus(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnHandleDestroyed(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnHelpRequested(HelpEventArgs hevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnImeModeChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnInvalidated(InvalidateEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnKeyDown(KeyEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnKeyPress(KeyPressEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnKeyUp(KeyEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnLayout(LayoutEventArgs levent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnLeave(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnLocationChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnLostFocus(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseDown(MouseEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseEnter(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseHover(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseLeave(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseMove(MouseEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseUp(MouseEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMouseWheel(MouseEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnMove(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnNotifyMessage(Message m) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnPaint(PaintEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnPaintBackground(PaintEventArgs pevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentBackColorChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentBackgroundImageChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentBindingContextChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentEnabledChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentFontChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentForeColorChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentRightToLeftChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnParentVisibleChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnQueryContinueDrag(QueryContinueDragEventArgs qcdevent) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnResize(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnRightToLeftChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnSizeChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnStyleChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnSystemColorsChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnTabIndexChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnTabStopChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnTextChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnValidated(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnValidating(CancelEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void OnVisibleChanged(EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void ScaleCore(float dx,float dy) {
-               //      throw new NotImplementedException ();
-               //}
-               //              [MonoTODO]
-               //              protected virtual void Select(bool b, bool b1)
-               //              {
-               //                      throw new NotImplementedException ();
-               //              }
-               //[MonoTODO]
-               //protected virtual void SetClientSizeCore(int x, int y) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void SetVisibleCore(bool value) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void AccessibilityNotifyClients(AccessibleEvents accEvent, int i) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void InvokeGotFocus(Control toInvoke, EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void InvokeLostFocus(Control toInvoke, EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void InvokeOnClick(Control toInvoke, EventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void InvokePaint(Control c, PaintEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void InvokePaintBackground(Control c, PaintEventArgs e) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void RecreateHandle() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void SetStyle(ControlStyles flag, bool value) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void SetTopLevel(bool value) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void UpdateBounds() {
-               //      throw new NotImplementedException ();
-               //}
-               //              [MonoTODO]
-               //              protected void UpdateBounds(int x, int y, int width, int height);
-               //              {
-               //                      throw new NotImplementedException ();
-               //              }
-               //              [MonoTODO]
-               //              protected void UpdateBounds(int x, int y, int width, int height, int clientWidth, intclientHeigth);
-               //              {
-               //                      throw new NotImplementedException ();
-               //              }
-               //[MonoTODO]
-               //protected void UpdateStyles() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected void UpdateZOrder() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual AccessibleObject CreateAccessibilityInstance() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual ControlCollection CreateControlsInstance() {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void DefWndProc(ref Message m) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual void DestroyHandle() {
-               //      throw new NotImplementedException ();
-               //}
-               [MonoTODO]
-               protected virtual object GetService(Type service) {
-                       throw new NotImplementedException ();
-               }
-               //[MonoTODO]
-               //protected virtual bool IsInputChar(char charCode) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessCmdKey(ref Message msg, Keys keyData) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessDialogChar(char charCode) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessDialogKey(Keys keyData) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessKeyEventArgs(ref Message m) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessKeyPreview(ref Message m) {
-               //      throw new NotImplementedException ();
-               //}
-               //[MonoTODO]
-               //protected virtual bool ProcessMnemonic(char charCode) {
-               //      throw new NotImplementedException ();
-               //}
 
                //
                //  --- Protected Properties
@@ -1452,48 +425,6 @@ namespace System.Windows.Forms {
                                return new Size (100, 100);
                        }
                }
-               [MonoTODO]
-               protected bool DesignMode {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               protected bool ResizeRedraw {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               protected EventHandlerList Events {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               protected bool ShowKeyboardCues {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
-               [MonoTODO]
-               protected int FontHeight {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               //FIXME:
-                       }
-               }
-               [MonoTODO]
-               protected override bool ShowFocusCues {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-               }
 
                public enum HitArea {
                        Nowhere = 0,
@@ -1515,62 +446,8 @@ namespace System.Windows.Forms {
                //
                //  --- Public Events
                //
-               public event EventHandler BackColorChanged;
-               public event EventHandler BackgroundImageChanged;
-               public event EventHandler BindingContextChanged;
-               public event EventHandler CausesValidationChanged;
-               public event UICuesEventHandler ChangeUICues;
-               public event EventHandler ContextMenuChanged;
-               public event ControlEventHandler ControlAdded;
-               public event ControlEventHandler ControlRemoved;
-               public event EventHandler CursorChanged;
                public event DateRangeEventHandler DateChanged;
                public event DateRangeEventHandler DateSelected;
-               public event EventHandler DockChanged;
-               public event DragEventHandler DragDrop;
-               public event DragEventHandler DragEnter;
-               public event EventHandler DragLeave;
-               public event DragEventHandler DragOver;
-               public event EventHandler EnabledChanged;
-               public event EventHandler Enter;
-               public event EventHandler FontChanged;
-               public event EventHandler ForeColorChanged;
-               public event GiveFeedbackEventHandler GiveFeedback;
-               public event EventHandler GotFocus;
-               public event EventHandler HandleCreated;
-               public event EventHandler HandleDestroyed;
-               public event HelpEventHandler HelpRequested;
-               public event EventHandler ImeModeChanged;
-               public event InvalidateEventHandler Invalidated;
-               public event KeyEventHandler KeyDown;
-               public event KeyPressEventHandler KeyPress;
-               public event KeyEventHandler KeyUp;
-               public event LayoutEventHandler Layout;
-               public event EventHandler Leave;
-               public event EventHandler LocationChanged;
-               public event EventHandler LostFocus;
-               public event MouseEventHandler MouseDown;
-               public event EventHandler MouseEnter;
-               public event EventHandler MouseHover;
-               public event EventHandler MouseLeave;
-               public event MouseEventHandler MouseMove;
-               public event MouseEventHandler MouseUp;
-               public event MouseEventHandler MouseWheel;
-               public event EventHandler Move;
-               public event EventHandler ParentChanged;
-               public event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;
-               public event QueryContinueDragEventHandler QueryContinueDrag;
-               public event EventHandler Resize;
-               public event EventHandler RightToLeftChanged;
-               public event EventHandler SizeChanged;
-               public event EventHandler StyleChanged;
-               public event EventHandler SystemColorsChanged;
-               public event EventHandler TabIndexChanged;
-               public event EventHandler TabStopChanged;
-               public event EventHandler TextChanged;
-               public event EventHandler Validated;
-               public event CancelEventHandler Validating;
-               public event EventHandler VisibleChanged;
 
                //
                // System.Windows.Forms.MonthCalendar.HitTestInfo.cs
@@ -1589,12 +466,12 @@ namespace System.Windows.Forms {
                        //
                        //  --- Public Properties
                        //
-                       //              [MonoTODO]
-                       //              public MonthCalendar.HitArea HitArea {
-                       //                      get {
-                       //                              throw new NotImplementedException ();
-                       //                      }
-                       //              }
+                       [MonoTODO]
+                       public MonthCalendar.HitArea HitArea {
+                               get {
+                                       throw new NotImplementedException ();
+                               }
+                       }
                        [MonoTODO]
                        public Point Point {
                                get {