X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2FSystem.Windows.Forms.Layout%2FDefaultLayout.cs;h=35bb2be338ecade98e65e742028a8c575c10cf6d;hb=0d732b13a081cab85efa3695f158c1164524a48e;hp=405c46488798ffa293b876a427c4074619268e26;hpb=4e5e61cf501ef587ec36aaf80d04d734ca0efaca;p=mono.git

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/DefaultLayout.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/DefaultLayout.cs
index 405c4648879..35bb2be338e 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/DefaultLayout.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/DefaultLayout.cs
@@ -44,10 +44,8 @@ namespace System.Windows.Forms.Layout
 				Control child = controls[i];
 				Size child_size = child.Size;
 
-#if NET_2_0
 				if (child.AutoSize)
 					child_size = GetPreferredControlSize (child);
-#endif
 
 				if (!child.VisibleInternal
 				    || child.ControlLayoutType == Control.LayoutType.Anchor)
@@ -158,7 +156,6 @@ namespace System.Windows.Forms.Layout
 			}
 		}
 		
-#if NET_2_0
 		void LayoutAutoSizedChildren (Control parent, Control[] controls)
 		{
 			for (int i = 0; i < controls.Length; i++) {
@@ -228,7 +225,6 @@ namespace System.Windows.Forms.Layout
 
 			container.SetBoundsInternal (left, top, width, height, BoundsSpecified.None);
 		}
-#endif
 
 		public override bool Layout (object container, LayoutEventArgs args)
 		{
@@ -238,15 +234,12 @@ namespace System.Windows.Forms.Layout
 
 			LayoutDockedChildren (parent, controls);
 			LayoutAnchoredChildren (parent, controls);
-#if NET_2_0
 			LayoutAutoSizedChildren (parent, controls);
 			if (parent is Form) LayoutAutoSizeContainer (parent);
-#endif
 
 			return false;
 		}
 
-#if NET_2_0
 		private Size GetPreferredControlSize (Control child)
 		{
 			int width;
@@ -280,6 +273,5 @@ namespace System.Windows.Forms.Layout
 				
 			return new Size (width, height);
 		}
-#endif
 	}
 }