* Test/System.Windows.Forms/LabelTest.cs : new Label tests (incomplete)

* System.Windows.Forms_test.dll.sources : add new tests
* System.Windows.Forms/Label.cs : give FlatStyle a default value
  of FlatStyle.Standard.
			  

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

mcs/class/Managed.Windows.Forms/ChangeLog

@@ -1,3 +1,10 @@
+2005-09-09  Hisham Mardam Bey  <[email protected]>
+
+        * Test/System.Windows.Forms/LabelTest.cs : new Label tests (incomplete)
+        * System.Windows.Forms_test.dll.sources : add new tests
+        * System.Windows.Forms/Label.cs : give FlatStyle a default value
+	  of FlatStyle.Standard.
+
 2005-09-08  Ritvik Mayank  <[email protected]>
 	
 	* System.Windows.Forms_test.dll.sources : added MonthCalendarTest.cs

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs

@@ -1,626 +1,627 @@
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// Authors:
-//	Jordi Mas i Hernandez, [email protected]
-//	Peter Bartok, [email protected]
-//
-//
-
-// COMPLETE
-
-using System.ComponentModel;
-using System.ComponentModel.Design;
-using System.Drawing;
-using System.Drawing.Text;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
-
-namespace System.Windows.Forms
-{
-	[DefaultProperty("Text")]
-	[Designer ("System.Windows.Forms.Design.LabelDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-	public class Label : Control
-    	{
-    		private bool autosize;
-    		private Image image;
-    		private bool render_transparent;
-    		private FlatStyle flat_style;
-    		private int preferred_height;
-    		private int preferred_width;
-    		private bool use_mnemonic;
-    		private int image_index = -1;
-    		private ImageList image_list;
-		internal ContentAlignment image_align;
-		internal StringFormat string_format;
-    		internal ContentAlignment text_align;    		
-    		static SizeF req_witdthsize = new SizeF (0,0);
-
-    		#region Events
-    		public event EventHandler AutoSizeChanged;
-
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public new event EventHandler BackgroundImageChanged;
-
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// Authors:
+//	Jordi Mas i Hernandez, [email protected]
+//	Peter Bartok, [email protected]
+//
+//
+
+// COMPLETE
+
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Text;
+using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
+
+namespace System.Windows.Forms
+{
+	[DefaultProperty("Text")]
+	[Designer ("System.Windows.Forms.Design.LabelDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+	public class Label : Control
+    	{
+    		private bool autosize;
+    		private Image image;
+    		private bool render_transparent;
+    		private FlatStyle flat_style;
+    		private int preferred_height;
+    		private int preferred_width;
+    		private bool use_mnemonic;
+    		private int image_index = -1;
+    		private ImageList image_list;
+		internal ContentAlignment image_align;
+		internal StringFormat string_format;
+    		internal ContentAlignment text_align;    		
+    		static SizeF req_witdthsize = new SizeF (0,0);
+
+    		#region Events
+    		public event EventHandler AutoSizeChanged;
+
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public new event EventHandler BackgroundImageChanged;
+
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
 		public new event EventHandler ImeModeChanged;    		
 
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
 		public new event KeyEventHandler KeyDown;		
 
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
 		public new event KeyPressEventHandler KeyPress;		
-
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public new event KeyEventHandler KeyUp;
-
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public new event EventHandler TabStopChanged;
-
-		public event EventHandler TextAlignChanged;
-		#endregion
-
-    		public Label ()
-    		{
-			// Defaults in the Spec
-			autosize = false;
-			border_style = BorderStyle.None;
-			string_format = new StringFormat();
-			TextAlign = ContentAlignment.TopLeft;
-			image = null;
-			UseMnemonic = true;
-			image_list = null;
-			image_align = ContentAlignment.MiddleCenter;
-			SetUseMnemonic (UseMnemonic);
-
-			BackColor = ThemeEngine.Current.ColorButtonFace;
-			ForeColor = ThemeEngine.Current.ColorWindowText;
-
-			CalcPreferredHeight ();
-			CalcPreferredWidth ();
-
-			AutoSizeChanged = null;
-    			TextAlignChanged = null;
-
-			SetStyle (ControlStyles.ResizeRedraw, true);
-			SetStyle (ControlStyles.Selectable, false);
-			SetStyle (ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
-			
-			HandleCreated += new EventHandler (OnHandleCreatedLB);
-		}
-
-		#region Public Properties
-		[DefaultValue(false)]
-		[Localizable(true)]
-		[RefreshProperties(RefreshProperties.All)]
-    		public virtual bool AutoSize {
-    			get { return autosize; }
-    			set {
-    				if (autosize == value)
-    					return;
-
-    				autosize = value;
-    				CalcAutoSize ();
-				Refresh ();
-
-				OnAutoSizeChanged (new EventArgs ());    				
-    			}
-    		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public override Image BackgroundImage {
-    			get {
-    				return base.BackgroundImage;
-    			}
-    			set {
-    				if (base.BackgroundImage == value)
-					return;
-
-				if (BackgroundImageChanged != null)
-					BackgroundImageChanged (this, EventArgs.Empty);
-
-				base.BackgroundImage = value;
-				Refresh ();
-    			}
-    		}
-
-		[DefaultValue(BorderStyle.None)]
-		[DispId(-504)]
-    		public virtual BorderStyle BorderStyle {
-    			get {
-    				return border_style;
-    			}
-    			set {
-				if (!Enum.IsDefined (typeof (BorderStyle), value))
-					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for BorderStyle", value));
-
-				if (border_style == value)
-					return;
-
-    				border_style = value;
-				Refresh ();
-    			}
-    		}
-
-    		protected override CreateParams CreateParams {
-    			get { return base.CreateParams;}
-    		}
-
-    		protected override ImeMode DefaultImeMode {
-    			get { return ImeMode.Disable;}
-    		}
-
-    		protected override Size DefaultSize {
-    			get {return ThemeEngine.Current.LabelDefaultSize;}
-    		}
-
-		[DefaultValue(FlatStyle.Standard)]
-		public FlatStyle FlatStyle {
-    			get {
-    				return flat_style;
-    			}
-    			set {
-				if (!Enum.IsDefined (typeof (FlatStyle), value))
-					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for FlatStyle", value));
-
-    				if (flat_style == value)
-					return;
-
-    				flat_style = value;
-				Refresh ();
-    			}
-    		}
-
-		[Localizable(true)]
-    		public Image Image {
-    			get {
-    				if (image != null) {
-    					return image;
-    				}
-    				
-    				if (image_list != null && ImageIndex >= 0) {
-    					return image_list.Images[ImageIndex];
-    				}
-    				
-    				return null;
-    			}
-    			set {
-    				if (image == value)
-					return;
-
-    				image = value;
-				Refresh ();
-    			}
-    		}
-
-		[DefaultValue(ContentAlignment.MiddleCenter)]
-		[Localizable(true)]
-    		public ContentAlignment ImageAlign {
-    			get {
-    				return image_align;
-    			}
-    			set {
-				if (!Enum.IsDefined (typeof (ContentAlignment), value))
-					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
-
-    				if (image_align == value)
-    					return;
-
-    				image_align = value;
-    				Refresh ();
-    			}
-    		}
-
-		[DefaultValue (-1)]
-		[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
-		[Localizable (true)]
-		[TypeConverter (typeof (ImageIndexConverter))]
-		public int ImageIndex {
-    			get { 
-    				if (ImageList == null) {
-    					return -1;
-    				}
-    				
-    				if (image_index >= image_list.Images.Count) {
-    					return image_list.Images.Count - 1;
-    				}
-    				
-    				return image_index;
-    			}
-    			set {
-
-				if (value < -1)
-					throw new ArgumentException ();
-
-    				if (image_index == value)
-					return;
-
-				image_index = value;
-
-				if (ImageList != null && image_index !=-1)
-					Image = null;
-
-    				Refresh ();
-			}
-    		}
-
-		[DefaultValue(null)]
-    		public ImageList ImageList {
-    			get { return image_list;}
-    			set {
-    				if (image_list == value)
-					return;
-					
-				image_list = value;
-
-				if (image_list != null && image_index !=-1)
-					Image = null;
-
-    				Refresh ();
-			}
-    		}
-
-		[Browsable(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-    		public new ImeMode ImeMode {
-			get { return base.ImeMode; }
-			set {
-				if (value == ImeMode)
-					return;
-				base.ImeMode = value;
-				if (ImeModeChanged != null)
-					ImeModeChanged (this, EventArgs.Empty);
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable(EditorBrowsableState.Advanced)]
-		public virtual int PreferredHeight {
-    			get { return preferred_height; }
-    		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable(EditorBrowsableState.Advanced)]
-		public virtual int PreferredWidth {
-    			get {return preferred_width; }
-    		}
-
-    		protected virtual bool RenderTransparent {
-			get { return render_transparent; }
-			set { render_transparent = value;}
-		}
+
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public new event KeyEventHandler KeyUp;
+
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public new event EventHandler TabStopChanged;
+
+		public event EventHandler TextAlignChanged;
+		#endregion
+
+    		public Label ()
+    		{
+			// Defaults in the Spec
+			autosize = false;
+			border_style = BorderStyle.None;
+			string_format = new StringFormat();
+			TextAlign = ContentAlignment.TopLeft;
+			image = null;
+			UseMnemonic = true;
+			image_list = null;
+			image_align = ContentAlignment.MiddleCenter;
+			SetUseMnemonic (UseMnemonic);
+			flat_style = FlatStyle.Standard;
+
+			BackColor = ThemeEngine.Current.ColorButtonFace;
+			ForeColor = ThemeEngine.Current.ColorWindowText;
+
+			CalcPreferredHeight ();
+			CalcPreferredWidth ();
+
+			AutoSizeChanged = null;
+    			TextAlignChanged = null;
+
+			SetStyle (ControlStyles.ResizeRedraw, true);
+			SetStyle (ControlStyles.Selectable, false);
+			SetStyle (ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
+			
+			HandleCreated += new EventHandler (OnHandleCreatedLB);
+		}
+
+		#region Public Properties
+		[DefaultValue(false)]
+		[Localizable(true)]
+		[RefreshProperties(RefreshProperties.All)]
+    		public virtual bool AutoSize {
+    			get { return autosize; }
+    			set {
+    				if (autosize == value)
+    					return;
+
+    				autosize = value;
+    				CalcAutoSize ();
+				Refresh ();
+
+				OnAutoSizeChanged (new EventArgs ());    				
+    			}
+    		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public override Image BackgroundImage {
+    			get {
+    				return base.BackgroundImage;
+    			}
+    			set {
+    				if (base.BackgroundImage == value)
+					return;
+
+				if (BackgroundImageChanged != null)
+					BackgroundImageChanged (this, EventArgs.Empty);
+
+				base.BackgroundImage = value;
+				Refresh ();
+    			}
+    		}
+
+		[DefaultValue(BorderStyle.None)]
+		[DispId(-504)]
+    		public virtual BorderStyle BorderStyle {
+    			get {
+    				return border_style;
+    			}
+    			set {
+				if (!Enum.IsDefined (typeof (BorderStyle), value))
+					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for BorderStyle", value));
+
+				if (border_style == value)
+					return;
+
+    				border_style = value;
+				Refresh ();
+    			}
+    		}
+
+    		protected override CreateParams CreateParams {
+    			get { return base.CreateParams;}
+    		}
+
+    		protected override ImeMode DefaultImeMode {
+    			get { return ImeMode.Disable;}
+    		}
+
+    		protected override Size DefaultSize {
+    			get {return ThemeEngine.Current.LabelDefaultSize;}
+    		}
+
+		[DefaultValue(FlatStyle.Standard)]
+		public FlatStyle FlatStyle {
+    			get {
+    				return flat_style;
+    			}
+    			set {
+				if (!Enum.IsDefined (typeof (FlatStyle), value))
+					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for FlatStyle", value));
+
+    				if (flat_style == value)
+					return;
+
+    				flat_style = value;
+				Refresh ();
+    			}
+    		}
+
+		[Localizable(true)]
+    		public Image Image {
+    			get {
+    				if (image != null) {
+    					return image;
+    				}
+    				
+    				if (image_list != null && ImageIndex >= 0) {
+    					return image_list.Images[ImageIndex];
+    				}
+    				
+    				return null;
+    			}
+    			set {
+    				if (image == value)
+					return;
+
+    				image = value;
+				Refresh ();
+    			}
+    		}
+
+		[DefaultValue(ContentAlignment.MiddleCenter)]
+		[Localizable(true)]
+    		public ContentAlignment ImageAlign {
+    			get {
+    				return image_align;
+    			}
+    			set {
+				if (!Enum.IsDefined (typeof (ContentAlignment), value))
+					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
+
+    				if (image_align == value)
+    					return;
+
+    				image_align = value;
+    				Refresh ();
+    			}
+    		}
+
+		[DefaultValue (-1)]
+		[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
+		[Localizable (true)]
+		[TypeConverter (typeof (ImageIndexConverter))]
+		public int ImageIndex {
+    			get { 
+    				if (ImageList == null) {
+    					return -1;
+    				}
+    				
+    				if (image_index >= image_list.Images.Count) {
+    					return image_list.Images.Count - 1;
+    				}
+    				
+    				return image_index;
+    			}
+    			set {
+
+				if (value < -1)
+					throw new ArgumentException ();
+
+    				if (image_index == value)
+					return;
+
+				image_index = value;
+
+				if (ImageList != null && image_index !=-1)
+					Image = null;
+
+    				Refresh ();
+			}
+    		}
+
+		[DefaultValue(null)]
+    		public ImageList ImageList {
+    			get { return image_list;}
+    			set {
+    				if (image_list == value)
+					return;
+					
+				image_list = value;
+
+				if (image_list != null && image_index !=-1)
+					Image = null;
+
+    				Refresh ();
+			}
+    		}
+
+		[Browsable(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+    		public new ImeMode ImeMode {
+			get { return base.ImeMode; }
+			set {
+				if (value == ImeMode)
+					return;
+				base.ImeMode = value;
+				if (ImeModeChanged != null)
+					ImeModeChanged (this, EventArgs.Empty);
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		public virtual int PreferredHeight {
+    			get { return preferred_height; }
+    		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		public virtual int PreferredWidth {
+    			get {return preferred_width; }
+    		}
+
+    		protected virtual bool RenderTransparent {
+			get { return render_transparent; }
+			set { render_transparent = value;}
+		}
     		
-		[Browsable(false)]
-		[DefaultValue(false)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public new bool TabStop  {
-    			get { return base.TabStop; }
-    			set {
-				if (value == base.TabStop)
-					return;
-
-				base.TabStop = value;
-				if (TabStopChanged != null)
-					TabStopChanged (this, EventArgs.Empty);
-			}
-    		}
-
-		[DefaultValue(ContentAlignment.TopLeft)]
-		[Localizable(true)]
-		public virtual ContentAlignment TextAlign {
-    			get { return text_align; }
-
-    			set {
-				if (!Enum.IsDefined (typeof (ContentAlignment), value))
-					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
-
-    				if (text_align != value) {
-
-	    				text_align = value;
-
-	    				switch (value) {
-
-	    				case ContentAlignment.BottomLeft:
-	    					string_format.LineAlignment = StringAlignment.Far;
-	    					string_format.Alignment = StringAlignment.Near;
-	    					break;
-	    				case ContentAlignment.BottomCenter:
-	    					string_format.LineAlignment = StringAlignment.Far;
-	    					string_format.Alignment = StringAlignment.Center;
-	    					break;
-	    				case ContentAlignment.BottomRight:
-	    					string_format.LineAlignment = StringAlignment.Far;
-						string_format.Alignment = StringAlignment.Far;
-						break;
-					case ContentAlignment.TopLeft:
-						string_format.LineAlignment = StringAlignment.Near;
-						string_format.Alignment = StringAlignment.Near;
-						break;
-					case ContentAlignment.TopCenter:
-						string_format.LineAlignment = StringAlignment.Near;
-						string_format.Alignment = StringAlignment.Center;
-						break;
-					case ContentAlignment.TopRight:
-						string_format.LineAlignment = StringAlignment.Near;
-						string_format.Alignment = StringAlignment.Far;
-						break;
-					case ContentAlignment.MiddleLeft:
-						string_format.LineAlignment = StringAlignment.Center;
-						string_format.Alignment = StringAlignment.Near;
-						break;
-	    				case ContentAlignment.MiddleRight:
-	    					string_format.LineAlignment = StringAlignment.Center;
-	    					string_format.Alignment = StringAlignment.Far;
-	    					break;
-	    				case ContentAlignment.MiddleCenter:
-	    					string_format.LineAlignment = StringAlignment.Center;
-	    					string_format.Alignment = StringAlignment.Center;
-						break;
-					default:
-						break;
-					}
-
-					OnTextAlignChanged (new EventArgs ());
-    					Refresh();
-				}
-			}
-    		}
-
-		[DefaultValue(true)]
-		public bool UseMnemonic {
-    			get { return use_mnemonic; }
-   			set {
-    				if (use_mnemonic != value) {
-					use_mnemonic = value;
-					SetUseMnemonic (use_mnemonic);
-	    				Refresh ();
-    				}
-    			}
-    		}
-
-    		#endregion
-
-
-		#region Public Methods
-
-    		protected Rectangle CalcImageRenderBounds (Image image, Rectangle area, ContentAlignment img_align)
-    		{
-    			Rectangle rcImageClip = area;
-			rcImageClip.Inflate (-2,-2);
-
-			int X = area.X;
-			int Y = area.Y;
-
-			if (img_align == ContentAlignment.TopCenter ||
-				img_align == ContentAlignment.MiddleCenter ||
-				img_align == ContentAlignment.BottomCenter) {
-				X += (area.Width - image.Width) / 2;
-			}
-			else if (img_align == ContentAlignment.TopRight ||
-				img_align == ContentAlignment.MiddleRight||
-				img_align == ContentAlignment.BottomRight) {
-				X += (area.Width - image.Width);
-			}
-
-			if( img_align == ContentAlignment.BottomCenter ||
-				img_align == ContentAlignment.BottomLeft ||
-				img_align == ContentAlignment.BottomRight) {
-				Y += area.Height - image.Height;
-			}
-			else if(img_align == ContentAlignment.MiddleCenter ||
-					img_align == ContentAlignment.MiddleLeft ||
-					img_align == ContentAlignment.MiddleRight) {
-				Y += (area.Height - image.Height) / 2;
-			}
-
-			rcImageClip.X = X;
-			rcImageClip.Y = Y;
-			rcImageClip.Width = image.Width;
-			rcImageClip.Height = image.Height;
-
-			return rcImageClip;
-    		}
-
+		[Browsable(false)]
+		[DefaultValue(false)]
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public new bool TabStop  {
+    			get { return base.TabStop; }
+    			set {
+				if (value == base.TabStop)
+					return;
+
+				base.TabStop = value;
+				if (TabStopChanged != null)
+					TabStopChanged (this, EventArgs.Empty);
+			}
+    		}
+
+		[DefaultValue(ContentAlignment.TopLeft)]
+		[Localizable(true)]
+		public virtual ContentAlignment TextAlign {
+    			get { return text_align; }
+
+    			set {
+				if (!Enum.IsDefined (typeof (ContentAlignment), value))
+					throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ContentAlignment", value));
+
+    				if (text_align != value) {
+
+	    				text_align = value;
+
+	    				switch (value) {
+
+	    				case ContentAlignment.BottomLeft:
+	    					string_format.LineAlignment = StringAlignment.Far;
+	    					string_format.Alignment = StringAlignment.Near;
+	    					break;
+	    				case ContentAlignment.BottomCenter:
+	    					string_format.LineAlignment = StringAlignment.Far;
+	    					string_format.Alignment = StringAlignment.Center;
+	    					break;
+	    				case ContentAlignment.BottomRight:
+	    					string_format.LineAlignment = StringAlignment.Far;
+						string_format.Alignment = StringAlignment.Far;
+						break;
+					case ContentAlignment.TopLeft:
+						string_format.LineAlignment = StringAlignment.Near;
+						string_format.Alignment = StringAlignment.Near;
+						break;
+					case ContentAlignment.TopCenter:
+						string_format.LineAlignment = StringAlignment.Near;
+						string_format.Alignment = StringAlignment.Center;
+						break;
+					case ContentAlignment.TopRight:
+						string_format.LineAlignment = StringAlignment.Near;
+						string_format.Alignment = StringAlignment.Far;
+						break;
+					case ContentAlignment.MiddleLeft:
+						string_format.LineAlignment = StringAlignment.Center;
+						string_format.Alignment = StringAlignment.Near;
+						break;
+	    				case ContentAlignment.MiddleRight:
+	    					string_format.LineAlignment = StringAlignment.Center;
+	    					string_format.Alignment = StringAlignment.Far;
+	    					break;
+	    				case ContentAlignment.MiddleCenter:
+	    					string_format.LineAlignment = StringAlignment.Center;
+	    					string_format.Alignment = StringAlignment.Center;
+						break;
+					default:
+						break;
+					}
+
+					OnTextAlignChanged (new EventArgs ());
+    					Refresh();
+				}
+			}
+    		}
+
+		[DefaultValue(true)]
+		public bool UseMnemonic {
+    			get { return use_mnemonic; }
+   			set {
+    				if (use_mnemonic != value) {
+					use_mnemonic = value;
+					SetUseMnemonic (use_mnemonic);
+	    				Refresh ();
+    				}
+    			}
+    		}
+
+    		#endregion
+
+
+		#region Public Methods
+
+    		protected Rectangle CalcImageRenderBounds (Image image, Rectangle area, ContentAlignment img_align)
+    		{
+    			Rectangle rcImageClip = area;
+			rcImageClip.Inflate (-2,-2);
+
+			int X = area.X;
+			int Y = area.Y;
+
+			if (img_align == ContentAlignment.TopCenter ||
+				img_align == ContentAlignment.MiddleCenter ||
+				img_align == ContentAlignment.BottomCenter) {
+				X += (area.Width - image.Width) / 2;
+			}
+			else if (img_align == ContentAlignment.TopRight ||
+				img_align == ContentAlignment.MiddleRight||
+				img_align == ContentAlignment.BottomRight) {
+				X += (area.Width - image.Width);
+			}
+
+			if( img_align == ContentAlignment.BottomCenter ||
+				img_align == ContentAlignment.BottomLeft ||
+				img_align == ContentAlignment.BottomRight) {
+				Y += area.Height - image.Height;
+			}
+			else if(img_align == ContentAlignment.MiddleCenter ||
+					img_align == ContentAlignment.MiddleLeft ||
+					img_align == ContentAlignment.MiddleRight) {
+				Y += (area.Height - image.Height) / 2;
+			}
+
+			rcImageClip.X = X;
+			rcImageClip.Y = Y;
+			rcImageClip.Width = image.Width;
+			rcImageClip.Height = image.Height;
+
+			return rcImageClip;
+    		}
+
     		
-		protected override AccessibleObject CreateAccessibilityInstance ()
-		{
-			return base.CreateAccessibilityInstance ();
-		}
-
-    		protected override void Dispose(bool disposing)
-		{
-			base.Dispose (disposing);
-		}
-
-    		protected void DrawImage (Graphics g, Image image, Rectangle area, ContentAlignment img_align)
-    		{
- 			if (image == null || g == null)
-				return;
-
-			Rectangle rcImageClip = CalcImageRenderBounds (image, area, img_align);
-
-			if (Enabled)
-				g.DrawImage (image, rcImageClip.X, rcImageClip.Y, rcImageClip.Width, rcImageClip.Height);
-			else
-				ControlPaint.DrawImageDisabled (g, image, rcImageClip.X, rcImageClip.Y, BackColor);
-		}
-
-    		protected virtual void OnAutoSizeChanged (EventArgs e)
-		{
-    			if (AutoSizeChanged != null)
-    				AutoSizeChanged (this, e);
-    		}
-
-    		protected override void OnEnabledChanged (EventArgs e)
-    		{
-			base.OnEnabledChanged (e);
-    		}
-
-    		protected override void OnFontChanged (EventArgs e)
-    		{
-			base.OnFontChanged (e);
-			if (autosize) {
-				CalcAutoSize();
-			} else {
-				CalcPreferredHeight ();
-			}
-			Refresh ();
-    		}
-
-    		protected override void OnPaint (PaintEventArgs pevent)
-		{
-			ThemeEngine.Current.DrawLabel (pevent.Graphics, ClientRectangle, this);
-			DrawImage (pevent.Graphics, Image, ClientRectangle, image_align);
-			base.OnPaint(pevent);
-		}
-
-    		protected override void OnParentChanged (EventArgs e)
-    		{
-    			base.OnParentChanged (e);
-    		}
-
-    		protected virtual void OnTextAlignChanged (EventArgs e)
-    		{
-    			if (TextAlignChanged != null)
-    				TextAlignChanged (this, e);
-    		}
-
-    		protected override void OnTextChanged (EventArgs e)
-    		{
-			base.OnTextChanged (e);			
-			if (autosize) {
-				CalcAutoSize ();
-			} else {
-				CalcPreferredWidth ();
-			}
-			Refresh ();
-    		}
-
-    		protected override void OnVisibleChanged (EventArgs e)
-    		{
-    			base.OnVisibleChanged (e);
-    		}
-
-    		protected override bool ProcessMnemonic (char charCode)
-    		{
-			if (IsMnemonic(charCode, Text) == true) {
-				// Select item next in line in tab order
-				if (this.parent != null) {
-					parent.SelectNextControl(this, true, false, false, false);
-				}
-				return true;
-			}
-			
-			return base.ProcessMnemonic (charCode);
-    		}
-
-    		protected override void SetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified)
-    		{
-    			base.SetBoundsCore (x, y, width, height, specified);
-    		}
-
-    		public override string ToString()
-    		{
-    			return base.ToString () + "Text: " + Text;
-    		}
-
-    		protected override void WndProc(ref Message m)
-    		{
-			switch ((Msg) m.Msg) {
-				case Msg.WM_DRAWITEM: {
-					m.Result = (IntPtr)1;
-				}
-					break;
-				default:
-					base.WndProc (ref m);
-					break;
-			}
-    		}
-
-    		#endregion Public Methods
-
-    		#region Private Methods
-
-		private void CalcAutoSize ()
-    		{
-    			if (IsHandleCreated == false || AutoSize == false)
-    				return;
-
-    			CalcPreferredWidth ();
-    			CalcPreferredHeight ();
-
-    		 	Width =  PreferredWidth;
-    		 	Height =  PreferredHeight;    		 	
-    		}
-
-    		private void CalcPreferredHeight ()
-		{
-			preferred_height = Font.Height;
-
-			switch (border_style) {
-			case BorderStyle.None:
-				preferred_height += 3;
-				break;
-			case BorderStyle.FixedSingle:
-			case BorderStyle.Fixed3D:
-				preferred_height += 6;
-				break;
-			default:
-				break;
-			}
-
-		}
-
-    		private void CalcPreferredWidth ()
-		{
-			SizeF size;
-    		 	size = DeviceContext.MeasureString (Text, Font, req_witdthsize, string_format);
-    		 	preferred_width = (int) size.Width + 3;
-		}
-
-    		private void OnHandleCreatedLB (Object o, EventArgs e)
-		{
-			if (autosize)
-				CalcAutoSize ();
-		}
-
-		private void SetUseMnemonic (bool use)
-    		{
-			if (use)
-				string_format.HotkeyPrefix = HotkeyPrefix.Show;
-			else
-				string_format.HotkeyPrefix = HotkeyPrefix.None;
-    		}
-
-		#endregion Private Methods
-
-    	}
-    }
+		protected override AccessibleObject CreateAccessibilityInstance ()
+		{
+			return base.CreateAccessibilityInstance ();
+		}
+
+    		protected override void Dispose(bool disposing)
+		{
+			base.Dispose (disposing);
+		}
+
+    		protected void DrawImage (Graphics g, Image image, Rectangle area, ContentAlignment img_align)
+    		{
+ 			if (image == null || g == null)
+				return;
+
+			Rectangle rcImageClip = CalcImageRenderBounds (image, area, img_align);
+
+			if (Enabled)
+				g.DrawImage (image, rcImageClip.X, rcImageClip.Y, rcImageClip.Width, rcImageClip.Height);
+			else
+				ControlPaint.DrawImageDisabled (g, image, rcImageClip.X, rcImageClip.Y, BackColor);
+		}
+
+    		protected virtual void OnAutoSizeChanged (EventArgs e)
+		{
+    			if (AutoSizeChanged != null)
+    				AutoSizeChanged (this, e);
+    		}
+
+    		protected override void OnEnabledChanged (EventArgs e)
+    		{
+			base.OnEnabledChanged (e);
+    		}
+
+    		protected override void OnFontChanged (EventArgs e)
+    		{
+			base.OnFontChanged (e);
+			if (autosize) {
+				CalcAutoSize();
+			} else {
+				CalcPreferredHeight ();
+			}
+			Refresh ();
+    		}
+
+    		protected override void OnPaint (PaintEventArgs pevent)
+		{
+			ThemeEngine.Current.DrawLabel (pevent.Graphics, ClientRectangle, this);
+			DrawImage (pevent.Graphics, Image, ClientRectangle, image_align);
+			base.OnPaint(pevent);
+		}
+
+    		protected override void OnParentChanged (EventArgs e)
+    		{
+    			base.OnParentChanged (e);
+    		}
+
+    		protected virtual void OnTextAlignChanged (EventArgs e)
+    		{
+    			if (TextAlignChanged != null)
+    				TextAlignChanged (this, e);
+    		}
+
+    		protected override void OnTextChanged (EventArgs e)
+    		{
+			base.OnTextChanged (e);			
+			if (autosize) {
+				CalcAutoSize ();
+			} else {
+				CalcPreferredWidth ();
+			}
+			Refresh ();
+    		}
+
+    		protected override void OnVisibleChanged (EventArgs e)
+    		{
+    			base.OnVisibleChanged (e);
+    		}
+
+    		protected override bool ProcessMnemonic (char charCode)
+    		{
+			if (IsMnemonic(charCode, Text) == true) {
+				// Select item next in line in tab order
+				if (this.parent != null) {
+					parent.SelectNextControl(this, true, false, false, false);
+				}
+				return true;
+			}
+			
+			return base.ProcessMnemonic (charCode);
+    		}
+
+    		protected override void SetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified)
+    		{
+    			base.SetBoundsCore (x, y, width, height, specified);
+    		}
+
+    		public override string ToString()
+    		{
+    			return base.ToString () + "Text: " + Text;
+    		}
+
+    		protected override void WndProc(ref Message m)
+    		{
+			switch ((Msg) m.Msg) {
+				case Msg.WM_DRAWITEM: {
+					m.Result = (IntPtr)1;
+				}
+					break;
+				default:
+					base.WndProc (ref m);
+					break;
+			}
+    		}
+
+    		#endregion Public Methods
+
+    		#region Private Methods
+
+		private void CalcAutoSize ()
+    		{
+    			if (IsHandleCreated == false || AutoSize == false)
+    				return;
+
+    			CalcPreferredWidth ();
+    			CalcPreferredHeight ();
+
+    		 	Width =  PreferredWidth;
+    		 	Height =  PreferredHeight;    		 	
+    		}
+
+    		private void CalcPreferredHeight ()
+		{
+			preferred_height = Font.Height;
+
+			switch (border_style) {
+			case BorderStyle.None:
+				preferred_height += 3;
+				break;
+			case BorderStyle.FixedSingle:
+			case BorderStyle.Fixed3D:
+				preferred_height += 6;
+				break;
+			default:
+				break;
+			}
+
+		}
+
+    		private void CalcPreferredWidth ()
+		{
+			SizeF size;
+    		 	size = DeviceContext.MeasureString (Text, Font, req_witdthsize, string_format);
+    		 	preferred_width = (int) size.Width + 3;
+		}
+
+    		private void OnHandleCreatedLB (Object o, EventArgs e)
+		{
+			if (autosize)
+				CalcAutoSize ();
+		}
+
+		private void SetUseMnemonic (bool use)
+    		{
+			if (use)
+				string_format.HotkeyPrefix = HotkeyPrefix.Show;
+			else
+				string_format.HotkeyPrefix = HotkeyPrefix.None;
+    		}
+
+		#endregion Private Methods
+
+    	}
+    }

mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources

@@ -14,6 +14,7 @@ System.Windows.Forms/GridTableStylesCollectionTest.cs
 System.Windows.Forms/GroupBoxTest.cs
 System.Windows.Forms/ImageListTest.cs
 System.Windows.Forms/LabelPropertyTest.cs
+System.Windows.Forms/LabelTest.cs
 System.Windows.Forms/ListBoxEventTest.cs
 System.Windows.Forms/ListBoxTest.cs
 System.Windows.Forms/ListViewEventTest.cs

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs

@@ -0,0 +1,113 @@
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// Authors:
+//      Hisham Mardam Bey ([email protected])
+//
+//
+                                                
+
+using System;
+using NUnit.Framework;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.Remoting;
+
+namespace MonoTests.System.Windows.Forms
+{
+        [TestFixture]
+        public class LabelTest2
+        {
+		
+		[Test]
+		public void PubPropTest ()
+		{
+			Label l = new Label ();
+			
+			// A
+			Assert.AreEqual (false, l.AutoSize, "A1");
+			l.AutoSize = true;
+			Assert.AreEqual (true, l.AutoSize, "A2");
+			l.AutoSize = false;
+			Assert.AreEqual (false, l.AutoSize, "A3");
+			
+			// B
+			Assert.AreEqual (null, l.BackgroundImage, "B1");
+			l.BackgroundImage = Image.FromFile ("a.png");;
+			Assert.IsNotNull (l.BackgroundImage, "B2");
+			Bitmap bmp = (Bitmap)l.BackgroundImage;
+			Assert.IsNotNull (bmp.GetPixel (0, 0), "B3");
+									
+			Assert.AreEqual (BorderStyle.None, l.BorderStyle, "B4");
+			l.BorderStyle = BorderStyle.FixedSingle;
+			Assert.AreEqual (BorderStyle.FixedSingle, l.BorderStyle, "B5");
+			l.BorderStyle = BorderStyle.Fixed3D;
+			Assert.AreEqual (BorderStyle.Fixed3D, l.BorderStyle, "B6");
+			l.BorderStyle = BorderStyle.None;
+			Assert.AreEqual (BorderStyle.None, l.BorderStyle, "B7");
+			
+			// C
+			string name = l.CompanyName;
+			if (!name.Equals("Mono Project, Novell, Inc.") && !name.Equals("Microsoft Corporation")) {
+				Assert.Fail("CompanyName property does not match any accepted value - C1");
+			}
+			
+			
+			// F
+			// Assert.AreEqual (FlatStyle.Standard, l.FlatStyle, "F1");
+			l.FlatStyle = FlatStyle.Flat;
+			Assert.AreEqual (FlatStyle.Flat, l.FlatStyle, "F1");
+			l.FlatStyle = FlatStyle.Popup;
+			Assert.AreEqual (FlatStyle.Popup, l.FlatStyle, "F2");
+			l.FlatStyle = FlatStyle.Standard;
+			Assert.AreEqual (FlatStyle.Standard, l.FlatStyle, "F3");
+			l.FlatStyle = FlatStyle.System;
+			Assert.AreEqual (FlatStyle.System, l.FlatStyle, "F4");
+			
+			// I
+			Assert.AreEqual (ContentAlignment.MiddleCenter, l.ImageAlign, "I1");
+			l.ImageAlign = ContentAlignment.TopLeft;
+			Assert.AreEqual (ContentAlignment.TopLeft, l.ImageAlign, "I2");
+			l.ImageAlign = ContentAlignment.TopCenter;
+			Assert.AreEqual (ContentAlignment.TopCenter, l.ImageAlign, "I3");
+			l.ImageAlign = ContentAlignment.TopRight;
+			Assert.AreEqual (ContentAlignment.TopRight, l.ImageAlign, "I4");
+			l.ImageAlign = ContentAlignment.MiddleLeft;
+			Assert.AreEqual (ContentAlignment.MiddleLeft, l.ImageAlign, "I5");
+			l.ImageAlign = ContentAlignment.MiddleCenter;
+			Assert.AreEqual (ContentAlignment.MiddleCenter, l.ImageAlign, "I6");
+			l.ImageAlign = ContentAlignment.MiddleRight;
+			Assert.AreEqual (ContentAlignment.MiddleRight, l.ImageAlign, "I7");
+			l.ImageAlign = ContentAlignment.BottomLeft;
+			Assert.AreEqual (ContentAlignment.BottomLeft, l.ImageAlign, "I8");
+			l.ImageAlign = ContentAlignment.BottomCenter;
+			Assert.AreEqual (ContentAlignment.BottomCenter, l.ImageAlign, "I9");
+			l.ImageAlign = ContentAlignment.BottomRight;
+			Assert.AreEqual (ContentAlignment.BottomRight, l.ImageAlign, "I10");
+			
+			Assert.AreEqual (-1, l.ImageIndex, "I11");
+			Assert.AreEqual (null, l.ImageList, "I12");
+			
+			Assert.AreEqual (null, l.Image, "I13");
+			l.Image = Image.FromFile ("a.png");
+			Assert.IsNotNull (l.Image, "I14");
+			bmp = (Bitmap)l.Image;
+			Assert.IsNotNull (bmp.GetPixel (0, 0), "I15");
+			
+			// PreferredHeight
+			// PregerredWidth
+			// RenderTransparent
+			
+			// T
+			// Assert.AreEqual (false, l.TabStop, "T1");
+			Assert.AreEqual (ContentAlignment.TopLeft, l.TextAlign, "T2");
+			
+			// U
+			Assert.AreEqual (true, l.UseMnemonic);
+			
+			
+		}
+		
+	}
+}
+