2007-05-19 Marek Safar <marek.safar@gmail.com>

	* Theme.cs (GetHatchBrush): A key uses internal value instead of formated
	enum value.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 2681daac8b48661d09da01bea666ca5d9efdc5f6..2f86281ff0f074fdb3c87549f977d25d0d89ed99 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-19  Marek Safar  <marek.safar@gmail.com>
+
+       * Theme.cs (GetHatchBrush): A key uses internal value instead of formated
+       enum value.
+
 2007-05-19  Andreia Gaita  <avidigal@novell.com>
 
        * NumericUpDown.cs: Added 2.0 methods (spin acceleration)

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
index c6c221e647ab9453cd4d752cda5e365d0801e3fc..b2ffb02578c1ec2bbd76648f36c0305907308a07 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
@@ -131,14 +131,14 @@ namespace System.Windows.Forms
                
                public HatchBrush GetHatchBrush (HatchStyle hatchStyle, Color foreColor, Color backColor)
                {
-                       string hash = hatchStyle.ToString () + foreColor.ToString () + backColor.ToString ();
+                       string hash = ((int)hatchStyle).ToString () + foreColor.ToString () + backColor.ToString ();
 
                        lock (hatchbrushes) {
-                               if (hatchbrushes.Contains (hash))
-                                       return (HatchBrush) hatchbrushes[hash];
-
-                               HatchBrush brush = new HatchBrush (hatchStyle, foreColor, backColor);
-                               hatchbrushes.Add (hash, brush);
+                               HatchBrush brush = (HatchBrush) hatchbrushes[hash];
+                               if (brush == null) {
+                                       brush = new HatchBrush (hatchStyle, foreColor, backColor);
+                                       hatchbrushes.Add (hash, brush);
+                               }
                                return brush;
                        }
                }