* Brush.cs: Fixed line endings.

* BufferedGraphicsContext.cs: Fixed line endings.
* CharacterRange.cs: Fixed line endings.
* Graphics.cs: Fixed line endings.
* IDeviceContext.cs: Fixed line endings.
* SizeFConverter.cs: Fixed line endings.
* SystemBrushes.cs: Fixed line endings.
* SystemFonts.cs: Fixed line endings.
* SystemPens.cs: Fixed line endings.

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

diff --git a/mcs/class/System.Drawing/System.Drawing/Brush.cs b/mcs/class/System.Drawing/System.Drawing/Brush.cs
index 6b3c48ff57043f1361c7a63b706b83ce853eef43..fb395f578267f33f45f565105c078cb4f0641e80 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Brush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Brush.cs
@@ -50,7 +50,7 @@ namespace System.Drawing
                }
 
 #if NET_2_0
-               protected Brush ()\r
+               protected Brush ()
                {
 
                }               

diff --git a/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs b/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs
index faa4f65d0216178beb950ec89e0fb09037061219..ac9541b86780401376a6bae63836aed5ce3cccac 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs
+++ b/mcs/class/System.Drawing/System.Drawing/BufferedGraphicsContext.cs
@@ -35,10 +35,10 @@ using System.Security.Permissions;
 
 namespace System.Drawing
 {
-       public sealed class BufferedGraphicsContext : IDisposable\r
+       public sealed class BufferedGraphicsContext : IDisposable
        {
                private Size max_buffer;
-\r
+
                public BufferedGraphicsContext ()
                {
                        max_buffer = Size.Empty;
@@ -47,29 +47,29 @@ namespace System.Drawing
                ~BufferedGraphicsContext ()
                {
                }
-\r
+
                public BufferedGraphics Allocate (Graphics targetGraphics, Rectangle targetRectangle)
                {
                        BufferedGraphics graphics = new BufferedGraphics (targetGraphics, targetRectangle);
                        return graphics;                        
-               }\r
+               }
 
                [MonoTODO ("The targetDC parameter has no equivalent in libgdiplus.")]
                [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
                public BufferedGraphics Allocate (IntPtr targetDC, Rectangle targetRectangle)
                {
                        throw new NotImplementedException ();
-               }\r
+               }
 
                public void Dispose ()
                {                       
                        System.GC.SuppressFinalize (this);
                }
-\r
+
                public void Invalidate ()
                {
-               }\r
-\r
+               }
+
                public Size MaximumBuffer {
                        get {return max_buffer; }
                        set {
@@ -79,8 +79,8 @@ namespace System.Drawing
 
                                max_buffer = value;
                        }
-               }\r
-\r
+               }
+
        }
 }
 

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 6470d139a5663bebe4d1226744d13f4483d3e5b0..9505d0575a44442fe892a094ba58f434a483fe07 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,15 @@
+2006-12-29  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * Brush.cs: Fixed line endings.
+       * BufferedGraphicsContext.cs: Fixed line endings.
+       * CharacterRange.cs: Fixed line endings.
+       * Graphics.cs: Fixed line endings.
+       * IDeviceContext.cs: Fixed line endings.
+       * SizeFConverter.cs: Fixed line endings.
+       * SystemBrushes.cs: Fixed line endings.
+       * SystemFonts.cs: Fixed line endings.
+       * SystemPens.cs: Fixed line endings.
+
 2006-12-22  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Graphics.cs: Splitted CopyFromScreen into platform specific methods

diff --git a/mcs/class/System.Drawing/System.Drawing/CharacterRange.cs b/mcs/class/System.Drawing/System.Drawing/CharacterRange.cs
index 58b6447a56b132c4b2f7e246178408558cd21c5c..59befa87119893b05cbf6204cd5d6d13e22ba1fc 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/CharacterRange.cs
+++ b/mcs/class/System.Drawing/System.Drawing/CharacterRange.cs
@@ -70,18 +70,18 @@ namespace System.Drawing
 
                        return false;
                }
-\r
+
                public override int GetHashCode ()
                {
                        return (first * length);
-               }\r
+               }
                
-               public static bool operator == (CharacterRange cr1, CharacterRange cr2)\r
+               public static bool operator == (CharacterRange cr1, CharacterRange cr2)
                {
                        return cr1.Equals (cr2);
                }
 
-               public static bool operator != (CharacterRange cr1, CharacterRange cr2)\r
+               public static bool operator != (CharacterRange cr1, CharacterRange cr2)
                {
                        return !cr1.Equals (cr2);
                }

diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
index 29518ad942850cc6eab73e3bda1a102d3ee06701..1a654927ed40f76be9cf74295e9a1c865088feaa 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Graphics.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
@@ -172,7 +172,7 @@ namespace System.Drawing
                {
                        CopyFromScreen (upperLeftSource.X, upperLeftSource.Y, upperLeftDestination.X, upperLeftDestination.Y,
                                blockRegionSize, copyPixelOperation);
-               }\r
+               }
                
                [MonoLimitation ("Works on Win32 and on X11 (but not on Cocoa and Quartz)")]
                public void CopyFromScreen (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize)
@@ -182,7 +182,7 @@ namespace System.Drawing
                }
 
                [MonoLimitation ("Works on Win32 and (for CopyPixelOperation.SourceCopy only) on X11 but not on Cocoa and Quartz")]
-               public void CopyFromScreen (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation)\r
+               public void CopyFromScreen (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation)
                {
                        if (!Enum.IsDefined (typeof (CopyPixelOperation), copyPixelOperation))
                                throw new InvalidEnumArgumentException (Locale.GetText ("Enum argument value '{0}' is not valid for CopyPixelOperation", copyPixelOperation));
@@ -206,14 +206,14 @@ namespace System.Drawing
 
                        GDIPlus.ReleaseDC (srcDC);
                        ReleaseHdc (dstDC);                     
-               }\r
+               }
                
                private void CopyFromScreenMac (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation)
                {
                        throw new NotImplementedException ();
                }
 
-               private void CopyFromScreenX11 (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation)\r
+               private void CopyFromScreenX11 (int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation)
                {
                        IntPtr window, image, defvisual, vPtr;
                        int AllPlanes = ~0, nitems = 0, pixel;
@@ -268,7 +268,7 @@ namespace System.Drawing
                        bmp.Dispose ();
                        GDIPlus.XDestroyImage (image);
                        GDIPlus.XFree (vPtr);
-               }\r
+               }
 #endif
 
                public void Dispose ()
@@ -980,7 +980,7 @@ namespace System.Drawing
                        height = (image.Height > rect.Height) ? rect.Height : image.Height;
 
                        DrawImageUnscaled (image, rect.X, rect.Y, width, height);                       
-               }\r
+               }
 #endif
 
                public void DrawLine (Pen pen, PointF pt1, PointF pt2)
@@ -2064,8 +2064,8 @@ namespace System.Drawing
                }
 
 #if NET_2_0
-               public void ReleaseHdc ()\r
-               {\r
+               public void ReleaseHdc ()
+               {
                        if (deviceContextHdc == IntPtr.Zero)
                                throw new ArgumentException ("Invalid Handle");
 

diff --git a/mcs/class/System.Drawing/System.Drawing/IDeviceContext.cs b/mcs/class/System.Drawing/System.Drawing/IDeviceContext.cs
index ae63640479aecca01ce6e2d40d61536b20f8f2d6..8c6b8d263ba0ccac0014def2bd3d70e36cc1def4 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/IDeviceContext.cs
+++ b/mcs/class/System.Drawing/System.Drawing/IDeviceContext.cs
@@ -34,7 +34,7 @@ namespace System.Drawing
 {
        public interface IDeviceContext : IDisposable
        {
-               IntPtr GetHdc ();\r
+               IntPtr GetHdc ();
                void ReleaseHdc ();             
        }
 }

diff --git a/mcs/class/System.Drawing/System.Drawing/KnownColor.cs b/mcs/class/System.Drawing/System.Drawing/KnownColor.cs
index 4b4e8213e86548d8dbc5e534dd2188e8a8feda11..c9076ba1a99ec7b0f2dd3f770dbaac2ba5057a2e 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/KnownColor.cs
+++ b/mcs/class/System.Drawing/System.Drawing/KnownColor.cs
@@ -202,12 +202,12 @@ namespace System.Drawing {
                Yellow = 166,
                YellowGreen = 167,
 #if NET_2_0
-               ButtonFace = 168,\r
-               ButtonHighlight = 169,\r
-               ButtonShadow = 170,\r
-               GradientActiveCaption = 171,\r
-               GradientInactiveCaption = 172,\r
-               MenuBar = 173,\r
+               ButtonFace = 168,
+               ButtonHighlight = 169,
+               ButtonShadow = 170,
+               GradientActiveCaption = 171,
+               GradientInactiveCaption = 172,
+               MenuBar = 173,
                MenuHighlight = 174
 #endif
        }

diff --git a/mcs/class/System.Drawing/System.Drawing/Region.cs b/mcs/class/System.Drawing/System.Drawing/Region.cs
index 7d60caf41a94a65e19cb94ff14e10b9a7b03ed92..7fddc4b6e477d27348c71a0d4f663b91f149d3a8 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Region.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Region.cs
@@ -643,11 +643,11 @@ namespace System.Drawing
                }
 #if NET_2_0
                [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
-               public void ReleaseHrgn (IntPtr regionHandle)           \r
+               public void ReleaseHrgn (IntPtr regionHandle)           
                {
                        if (regionHandle == IntPtr.Zero) 
                                throw new ArgumentNullException ("regionHandle");
-\r
+
                        Status status = GDIPlus.GdipDeleteRegion (regionHandle);
                        GDIPlus.CheckStatus (status);
                }

diff --git a/mcs/class/System.Drawing/System.Drawing/SizeFConverter.cs b/mcs/class/System.Drawing/System.Drawing/SizeFConverter.cs
index 510ba82ea8fae6a4eb1e2423f7cbf5bd7809fef3..e92fb38523f43d3890f51f6107f2da9400419538 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SizeFConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SizeFConverter.cs
@@ -40,13 +40,13 @@ using System.Reflection;
 
 namespace System.Drawing
 {
-       public class SizeFConverter : TypeConverter\r
-       {\r
+       public class SizeFConverter : TypeConverter
+       {
                public SizeFConverter ()
                {
 
                }
-\r
+
                public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
                {
                        if (sourceType == typeof (string))
@@ -54,7 +54,7 @@ namespace System.Drawing
 
                        return base.CanConvertFrom (context, sourceType);
                }
-\r
+
                public override bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
                {
                        if (destinationType == typeof (string))
@@ -65,7 +65,7 @@ namespace System.Drawing
 
                        return base.CanConvertTo (context, destinationType);
                }
-\r
+
                public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
                {
                        string s = value as string;
@@ -86,7 +86,7 @@ namespace System.Drawing
                        return new SizeF (numSubs[0], numSubs[1]);
 
                }
-\r
+
                public override object ConvertTo (ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
                {
                        if ((destinationType == typeof (string)) && (value is SizeF))
@@ -101,19 +101,19 @@ namespace System.Drawing
 
                        return base.ConvertTo (context, culture, value, destinationType);
                }
-\r
+
                public override object CreateInstance (ITypeDescriptorContext context, IDictionary propertyValues)
                {
                        float w = (float) propertyValues ["Width"];
                        float h = (float) propertyValues ["Height"];
                        return new SizeF (w, h);
                }
-\r
+
                public override bool GetCreateInstanceSupported (ITypeDescriptorContext context)
                {
                        return true;
                }
-\r
+
                public override PropertyDescriptorCollection GetProperties (ITypeDescriptorContext context, object value, Attribute[] attributes)
                {
                        if (value is SizeF)
@@ -121,11 +121,11 @@ namespace System.Drawing
 
                        return base.GetProperties (context, value, attributes);
                }
-\r
+
                public override bool GetPropertiesSupported (ITypeDescriptorContext context)
                {
                        return true;
-               }\r
+               }
        }
 }
 

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs b/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
index 95587f533fb66a5297e2b6853ac63dc53aa8002a..a5462cbd6137fc7064469ff547305c93a6158b0a 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
@@ -63,16 +63,16 @@ namespace System.Drawing
                static SolidBrush scroll_bar;
                static SolidBrush window;
                static SolidBrush window_text;
-               static SolidBrush button_face;\r
-               static SolidBrush button_highlight;\r
-               static SolidBrush button_shadow;\r
-               static SolidBrush gradient_activecaption;\r
-               static SolidBrush gradient_inactivecaption;\r
-               static SolidBrush graytext;\r
-               static SolidBrush inactive_captiontext;\r
-               static SolidBrush infotext;\r
-               static SolidBrush menubar;\r
-               static SolidBrush menu_highlight;\r
+               static SolidBrush button_face;
+               static SolidBrush button_highlight;
+               static SolidBrush button_shadow;
+               static SolidBrush gradient_activecaption;
+               static SolidBrush gradient_inactivecaption;
+               static SolidBrush graytext;
+               static SolidBrush inactive_captiontext;
+               static SolidBrush infotext;
+               static SolidBrush menubar;
+               static SolidBrush menu_highlight;
                static SolidBrush menu_text;            
                static SolidBrush window_fame;
  

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemColors.cs b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
index 0c6d933108d5279e7ef1100704395de5717f5058..40eb532d85a155e2068318a2e8c53335496df619 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
@@ -30,38 +30,38 @@
 
 
 // The following method can be (and was) used to generate the defaults for the properties
-//private static void GenerateColorTable (Type type) {\r
-//     PropertyInfo [] props = type.GetProperties ();\r
-//     foreach (PropertyInfo prop in props){\r
-//             if (prop.PropertyType != typeof (Color))\r
-//                     continue;\r
-//\r
-//             MethodInfo getget = prop.GetGetMethod ();\r
-//             if (getget == null || getget.IsStatic == false)\r
-//                     continue;\r
-//\r
-//             object o = prop.GetValue (null, null);\r
-//\r
-//             Color c = (Color) o;\r
-//\r
-//             StringBuilder name = new StringBuilder(prop.Name);\r
-//             name[0] = Char.ToLower(name[0]);\r
-//             for (int i = 1; i < name.Length; i++) {\r
-//                     if (Char.IsUpper(name[i])) {\r
-//                             name[i] = Char.ToLower(name[i]);\r
-//                             name.Insert(i, '_');\r
-//                     }\r
-//             }\r
-//\r
-//             Console.WriteLine("static private Color " + name.ToString() + " = Color.FromArgbSystem (" + \r
-//                     c.A.ToString() + ", " +\r
-//                     c.R.ToString() + ", " +\r
-//                     c.G.ToString() + ", " +\r
-//                     c.B.ToString() + ", " +\r
-//                     "\"" + prop.Name + "\", " +\r
-//                     "KnownColor." + prop.Name + ");");\r
-//     }\r
-//}\r
+//private static void GenerateColorTable (Type type) {
+//     PropertyInfo [] props = type.GetProperties ();
+//     foreach (PropertyInfo prop in props){
+//             if (prop.PropertyType != typeof (Color))
+//                     continue;
+//
+//             MethodInfo getget = prop.GetGetMethod ();
+//             if (getget == null || getget.IsStatic == false)
+//                     continue;
+//
+//             object o = prop.GetValue (null, null);
+//
+//             Color c = (Color) o;
+//
+//             StringBuilder name = new StringBuilder(prop.Name);
+//             name[0] = Char.ToLower(name[0]);
+//             for (int i = 1; i < name.Length; i++) {
+//                     if (Char.IsUpper(name[i])) {
+//                             name[i] = Char.ToLower(name[i]);
+//                             name.Insert(i, '_');
+//                     }
+//             }
+//
+//             Console.WriteLine("static private Color " + name.ToString() + " = Color.FromArgbSystem (" + 
+//                     c.A.ToString() + ", " +
+//                     c.R.ToString() + ", " +
+//                     c.G.ToString() + ", " +
+//                     c.B.ToString() + ", " +
+//                     "\"" + prop.Name + "\", " +
+//                     "KnownColor." + prop.Name + ");");
+//     }
+//}
 
 
 using System;
@@ -72,33 +72,33 @@ namespace System.Drawing {
        public sealed class SystemColors
        {
                // Default Windows XP color table
-               static private Color active_border = Color.FromArgbSystem (255, 212, 208, 200, "ActiveBorder", KnownColor.ActiveBorder);\r
-               static private Color active_caption = Color.FromArgbSystem (255, 0, 164, 164, "ActiveCaption", KnownColor.ActiveCaption);\r
-               static private Color active_caption_text = Color.FromArgbSystem (255, 255, 255, 255, "ActiveCaptionText", KnownColor.ActiveCaptionText);\r
-               static private Color app_workspace = Color.FromArgbSystem (255, 128, 128, 128, "AppWorkspace", KnownColor.AppWorkspace);\r
-               static private Color control = Color.FromArgbSystem (255, 212, 208, 200, "Control", KnownColor.Control);\r
-               static private Color control_dark = Color.FromArgbSystem (255, 128, 128, 128, "ControlDark", KnownColor.ControlDark);\r
-               static private Color control_dark_dark = Color.FromArgbSystem (255, 64, 64, 64, "ControlDarkDark", KnownColor.ControlDarkDark);\r
-               static private Color control_light = Color.FromArgbSystem (255, 212, 208, 200, "ControlLight", KnownColor.ControlLight);\r
-               static private Color control_light_light = Color.FromArgbSystem (255, 255, 255, 255, "ControlLightLight", KnownColor.ControlLightLight);\r
-               static private Color control_text = Color.FromArgbSystem (255, 0, 0, 0, "ControlText", KnownColor.ControlText);\r
-               static private Color desktop = Color.FromArgbSystem (255, 0, 0, 0, "Desktop", KnownColor.Desktop);\r
-               static private Color gray_text = Color.FromArgbSystem (255, 128, 128, 128, "GrayText", KnownColor.GrayText);\r
-               static private Color highlight = Color.FromArgbSystem (255, 10, 36, 106, "Highlight", KnownColor.Highlight);\r
-               static private Color highlight_text = Color.FromArgbSystem (255, 255, 255, 255, "HighlightText", KnownColor.HighlightText);\r
-               static private Color hot_track = Color.FromArgbSystem (255, 0, 0, 128, "HotTrack", KnownColor.HotTrack);\r
-               static private Color inactive_border = Color.FromArgbSystem (255, 212, 208, 200, "InactiveBorder", KnownColor.InactiveBorder);\r
-               static private Color inactive_caption = Color.FromArgbSystem (255, 128, 128, 128, "InactiveCaption", KnownColor.InactiveCaption);\r
-               static private Color inactive_caption_text = Color.FromArgbSystem (255, 212, 208, 200, "InactiveCaptionText", KnownColor.InactiveCaptionText);\r
-               static private Color info = Color.FromArgbSystem (255, 255, 255, 225, "Info", KnownColor.Info);\r
-               static private Color info_text = Color.FromArgbSystem (255, 0, 0, 0, "InfoText", KnownColor.InfoText);\r
-               static private Color menu = Color.FromArgbSystem (255, 212, 208, 200, "Menu", KnownColor.Menu);\r
-               static private Color menu_text = Color.FromArgbSystem (255, 0, 0, 0, "MenuText", KnownColor.MenuText);\r
-               static private Color scroll_bar = Color.FromArgbSystem (255, 212, 208, 200, "ScrollBar", KnownColor.ScrollBar);\r
-               // This would give a better looking gray background instead of the high-contrast white background\r
-               //static private Color window = Color.FromArgbSystem (255, 212, 208, 200, "Window", KnownColor.Window);\r
-               static private Color window = Color.FromArgbSystem (255, 255, 255, 255, "Window", KnownColor.Window);\r
-               static private Color window_frame = Color.FromArgbSystem (255, 0, 0, 0, "WindowFrame", KnownColor.WindowFrame);\r
+               static private Color active_border = Color.FromArgbSystem (255, 212, 208, 200, "ActiveBorder", KnownColor.ActiveBorder);
+               static private Color active_caption = Color.FromArgbSystem (255, 0, 164, 164, "ActiveCaption", KnownColor.ActiveCaption);
+               static private Color active_caption_text = Color.FromArgbSystem (255, 255, 255, 255, "ActiveCaptionText", KnownColor.ActiveCaptionText);
+               static private Color app_workspace = Color.FromArgbSystem (255, 128, 128, 128, "AppWorkspace", KnownColor.AppWorkspace);
+               static private Color control = Color.FromArgbSystem (255, 212, 208, 200, "Control", KnownColor.Control);
+               static private Color control_dark = Color.FromArgbSystem (255, 128, 128, 128, "ControlDark", KnownColor.ControlDark);
+               static private Color control_dark_dark = Color.FromArgbSystem (255, 64, 64, 64, "ControlDarkDark", KnownColor.ControlDarkDark);
+               static private Color control_light = Color.FromArgbSystem (255, 212, 208, 200, "ControlLight", KnownColor.ControlLight);
+               static private Color control_light_light = Color.FromArgbSystem (255, 255, 255, 255, "ControlLightLight", KnownColor.ControlLightLight);
+               static private Color control_text = Color.FromArgbSystem (255, 0, 0, 0, "ControlText", KnownColor.ControlText);
+               static private Color desktop = Color.FromArgbSystem (255, 0, 0, 0, "Desktop", KnownColor.Desktop);
+               static private Color gray_text = Color.FromArgbSystem (255, 128, 128, 128, "GrayText", KnownColor.GrayText);
+               static private Color highlight = Color.FromArgbSystem (255, 10, 36, 106, "Highlight", KnownColor.Highlight);
+               static private Color highlight_text = Color.FromArgbSystem (255, 255, 255, 255, "HighlightText", KnownColor.HighlightText);
+               static private Color hot_track = Color.FromArgbSystem (255, 0, 0, 128, "HotTrack", KnownColor.HotTrack);
+               static private Color inactive_border = Color.FromArgbSystem (255, 212, 208, 200, "InactiveBorder", KnownColor.InactiveBorder);
+               static private Color inactive_caption = Color.FromArgbSystem (255, 128, 128, 128, "InactiveCaption", KnownColor.InactiveCaption);
+               static private Color inactive_caption_text = Color.FromArgbSystem (255, 212, 208, 200, "InactiveCaptionText", KnownColor.InactiveCaptionText);
+               static private Color info = Color.FromArgbSystem (255, 255, 255, 225, "Info", KnownColor.Info);
+               static private Color info_text = Color.FromArgbSystem (255, 0, 0, 0, "InfoText", KnownColor.InfoText);
+               static private Color menu = Color.FromArgbSystem (255, 212, 208, 200, "Menu", KnownColor.Menu);
+               static private Color menu_text = Color.FromArgbSystem (255, 0, 0, 0, "MenuText", KnownColor.MenuText);
+               static private Color scroll_bar = Color.FromArgbSystem (255, 212, 208, 200, "ScrollBar", KnownColor.ScrollBar);
+               // This would give a better looking gray background instead of the high-contrast white background
+               //static private Color window = Color.FromArgbSystem (255, 212, 208, 200, "Window", KnownColor.Window);
+               static private Color window = Color.FromArgbSystem (255, 255, 255, 255, "Window", KnownColor.Window);
+               static private Color window_frame = Color.FromArgbSystem (255, 0, 0, 0, "WindowFrame", KnownColor.WindowFrame);
                static private Color window_text = Color.FromArgbSystem (255, 0, 0, 0, "WindowText", KnownColor.WindowText);
 
 #if NET_2_0

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemFonts.cs b/mcs/class/System.Drawing/System.Drawing/SystemFonts.cs
index 1b1a9ed337e4852cbcac155364707775bcaa5187..4e8b4e6740bf90a2d32f477f4af4e696f2965f14 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemFonts.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemFonts.cs
@@ -35,27 +35,27 @@ using System.ComponentModel;
 
 namespace System.Drawing
 {
-       public sealed class SystemFonts\r
+       public sealed class SystemFonts
        {
                private static Font caption = null;
-               private static Font defaultfnt = null;\r
-               private static Font dialog = null;\r
-               private static Font icon = null;\r
-               private static Font menu = null;\r
-               private static Font message = null;\r
-               private static Font smallcaption = null;\r
+               private static Font defaultfnt = null;
+               private static Font dialog = null;
+               private static Font icon = null;
+               private static Font menu = null;
+               private static Font message = null;
+               private static Font smallcaption = null;
                private static Font status = null;
-               \r
+               
                static SystemFonts ()
                {
 
                }
-\r
+
                private SystemFonts()
                {
 
-               }\r
-\r
+               }
+
                public static Font GetFontByName (string name)
                {
                        if (name == "CaptionFont")
@@ -84,7 +84,7 @@ namespace System.Drawing
                        
                        return null;
                }
-\r
+
                public static Font CaptionFont { 
                        get {
                                if (caption == null) {
@@ -94,7 +94,7 @@ namespace System.Drawing
                                return caption;
                        }                       
                }
-\r
+
                public static Font DefaultFont  { 
                        get {
                                if (defaultfnt == null) {
@@ -104,7 +104,7 @@ namespace System.Drawing
                                return defaultfnt;
                        }                       
                }
-\r
+
                public static Font DialogFont  { 
                        get {
                                if (dialog == null) {
@@ -114,7 +114,7 @@ namespace System.Drawing
                                return dialog;
                        }                       
                }
-\r
+
                public static Font IconTitleFont  { 
                        get {
                                if (icon == null) {
@@ -124,7 +124,7 @@ namespace System.Drawing
                                return icon;
                        }                       
                }
-\r
+
                public static Font MenuFont  { 
                        get {
                                if (menu == null) {
@@ -134,7 +134,7 @@ namespace System.Drawing
                                return menu;
                        }                       
                }
-\r
+
                public static Font MessageBoxFont  { 
                        get {
                                if (message == null) {
@@ -144,7 +144,7 @@ namespace System.Drawing
                                return message;
                        }                       
                }
-\r
+
                public static Font SmallCaptionFont  { 
                        get {
                                if (smallcaption == null) {
@@ -163,7 +163,7 @@ namespace System.Drawing
                                }
                                return status;
                        }                       
-               }             \r
+               }             
        }
 }
 

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemPens.cs b/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
index e10091a46fda6798a0f92bdbf50f0cb9ddc14fb5..a8c2c0c80dde34c0f087ebc449ef5223e72d36fb 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
@@ -451,6 +451,6 @@ namespace System.Drawing
                }
 #endif
                
-       }\r
-}               \r
-                \r
+       }
+}               
+