2007-11-16 Jonathan Pobst <monkey@jpobst.com>

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / Control.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index e7e22c68e7468a5bcb01a6a49d2a19fed4f7638f..1d0c4fec6c5533033809451cafc92e1d4ab93048 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -3182,7 +3182,8 @@ namespace System.Windows.Forms
                                        OnTextChanged (EventArgs.Empty);
 
 #if NET_2_0
-                                       if (AutoSize && Parent != null)
+                                       // Label has its own AutoSize implementation
+                                       if (AutoSize && Parent != null && (!(this is Label)))
                                                Parent.PerformLayout (this, "Text");
 #endif
                                }