Merge pull request #461 from knocte/xbuild_improvements

[mono.git] / mcs / class / System.Drawing / System.Drawing / ColorTranslator.cs

diff --git a/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
index ebbb0d8383207861787ed0b4ce74e4206029ca9b..27e5959c353e359dce985ef0d204f47252b4278b 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
@@ -45,20 +45,32 @@ namespace System.Drawing {
                        if ((htmlColor == null) || (htmlColor.Length == 0))
                                return Color.Empty;
 
-                       switch (htmlColor.ToLower ()) {
+                       switch (htmlColor.ToLowerInvariant ()) {
                        case "buttonface":
+                       case "threedface":              
                                return SystemColors.Control;
+                       case "buttonhighlight":
+                       case "threedlightshadow":
+                               return SystemColors.ControlLightLight;
+                       case "buttonshadow":
+                               return SystemColors.ControlDark;
                        case "captiontext":
                                return SystemColors.ActiveCaptionText;
                        case "threeddarkshadow":
                                return SystemColors.ControlDarkDark;
+                       case "threedhighlight":
+                               return SystemColors.ControlLight;
                        case "background":
                                return SystemColors.Desktop;
                        case "buttontext":
                                return SystemColors.ControlText;
                        case "infobackground":
                                return SystemColors.Info;
+                       // special case for Color.LightGray versus html's LightGrey (#340917)
+                       case "lightgrey":
+                               return Color.LightGray;
                        }
+                       
                        TypeConverter converter = TypeDescriptor.GetConverter (typeof (Color));
                        return (Color) converter.ConvertFromString (htmlColor);
                }