Author: jpobst
Date: 2008-02-05 09:48:01 -0500 (Tue, 05 Feb 2008)
New Revision: 94886

Modified:
   
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
Log:
2008-02-01  Jonathan Pobst  <[EMAIL PROTECTED]>
        [Backport to 1.9]
        * Label.cs: Apply patch from James Purcell that corrects the 
        signature of the AutoSize property.
        [Fixes bug #357605]

Modified: 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
    2008-02-05 14:47:46 UTC (rev 94885)
+++ 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
    2008-02-05 14:48:01 UTC (rev 94886)
@@ -1,3 +1,9 @@
+2008-02-01  Jonathan Pobst  <[EMAIL PROTECTED]>
+       [Backport to 1.9]
+       * Label.cs: Apply patch from James Purcell that corrects the 
+       signature of the AutoSize property.
+       [Fixes bug #357605]
+
 2008-02-04  Carlos Alberto Cortez <[EMAIL PROTECTED]>
 
        [Backport to 1.9]

Modified: 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
===================================================================
--- 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs 
    2008-02-05 14:47:46 UTC (rev 94885)
+++ 
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs 
    2008-02-05 14:48:01 UTC (rev 94886)
@@ -191,15 +191,21 @@
                        }
                }
 
-               [DefaultValue(false)]
-               [Localizable(true)]
-               [RefreshProperties(RefreshProperties.All)]
 #if NET_2_0
                [Browsable (true)]
                [DesignerSerializationVisibility 
(DesignerSerializationVisibility.Visible)]
                [EditorBrowsable (EditorBrowsableState.Always)]
 #endif
-               public new virtual bool AutoSize {
+               [DefaultValue(false)]
+               [Localizable(true)]
+               [RefreshProperties(RefreshProperties.All)]
+               public
+#if NET_2_0
+               override
+#else
+               virtual
+#endif
+               bool AutoSize {
                        get { return autosize; }
                        set {
                                if (autosize == value)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to