2004-04-24 Todd Berman <tberman@sevenl.net>

        * System.Windows.Forms/ContextMenu.cs:
        * System.Windows.Forms/Menu.cs: Whitespace fixes.
        * System.Windows.Forms/MenuItem.cs: fix the check for a null parent.

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

diff --git a/mcs/class/System.Windows.Forms/ChangeLog b/mcs/class/System.Windows.Forms/ChangeLog
index 15f3e98f48f80a7b20227ca9806a1170f56cc2e9..5ce5ec0f9fe843515c516d5ec3db588b356cd773 100644 (file)
--- a/mcs/class/System.Windows.Forms/ChangeLog
+++ b/mcs/class/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-24  Todd Berman  <tberman@sevenl.net>
+
+       * System.Windows.Forms/ContextMenu.cs:
+       * System.Windows.Forms/Menu.cs: Whitespace fixes.
+       * System.Windows.Forms/MenuItem.cs: fix the check for a null parent.
+
 2004-03-15  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
 
        * System.Windows.Forms.dll.sources: Added files

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs
index 1721969351648d627f053995a7124009fc674ed4..ebe569756578e2b8a70054894ff0d7ce18ee8367 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs
@@ -59,7 +59,7 @@ namespace System.Windows.Forms {
                {
                        if ( Handle == IntPtr.Zero )
                                return;
-
+                       
                        sourceControl = control;
 
                        POINT pt = new POINT ();

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs
index 02f43d65e41c33a180623d081f31c2ba2661441b..b84cc5663327b100a592e0e5e0b6053f92fc8b20 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs
@@ -133,7 +133,7 @@ namespace System.Windows.Forms  {
                        }
                }
                
-        internal Menu parent_ = null;
+               internal Menu parent_ = null;
         
                internal IntPtr menuHandle_ = IntPtr.Zero;
                internal bool   isPopupMenu = false;

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs
index 31d9bbb5a7324e0dcc95dbeeff3c19651e0d4867..39739264764964c951f6a318ab2f54bd908577e3 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs
@@ -339,12 +339,11 @@ namespace System.Windows.Forms {
                        }
                }
 
-        internal void SetParent( Menu parent) {
-               // FIXME: set exception parameters
-               if( parent != null && parent_ != null)
-                       throw new System.Exception();
-               parent_ = parent;
-        }
+               internal void SetParent( Menu parent) {
+                       if( parent == null)
+                               throw new System.ArgumentNullException ("parent");
+                       parent_ = parent;
+               }
         
                public Menu Parent {