In mono_thread_info_suspend_lock in non-coop, don't assert MonoThreadInfo* is non...

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

diff --git a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
index c2d9a978793152457ebe53700770a7ca9057ae7f..f356be3d26a523bcc3fa7a693628c6a3da393f13 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
@@ -4,32 +4,54 @@
 // Author:
 //   Dennis Hayes (dennish@Raytek.com)
 //   Alexandre Pigolkine(pigolkine@gmx.de)
+//   Ravindra (rkumar@novell.com)
 //
-// (C) 2002 Ximian, Inc
+// (C) 2002 Ximian, Inc.
+// Copyright (C) 2004, 2007 Novell, Inc (http://www.novell.com)
 //
-using System;
+// 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.
+//
+
+namespace System.Drawing {
 
-namespace System.Drawing
-{
        public sealed class SolidBrush : Brush {
                
                internal bool isModifiable = true;
-               Color color;
+               // we keep this cached because calling GdipGetSolidFillColor 
+               // wouldn't return a "named" color like SD is expected to do
+               private Color color;
 
                 internal SolidBrush (IntPtr ptr)
                         : base (ptr)
                 {
                        int val;
-                       GDIPlus.GdipGetSolidFillColor (ptr, out val);
+                       Status status = GDIPlus.GdipGetSolidFillColor (ptr, out val);
+                       GDIPlus.CheckStatus (status);
                        color = Color.FromArgb (val);
                 }
 
                public SolidBrush (Color color)
                 {
-                       this.Color = color;
-                       int brush;
-                       GDIPlus.GdipCreateSolidFill (color.ToArgb (), out brush);
-                       nativeObject = (IntPtr) brush;
+                       this.color = color;
+                       Status status = GDIPlus.GdipCreateSolidFill (color.ToArgb (), out nativeObject);
+                       GDIPlus.CheckStatus (status);
                }
 
                public Color Color {
@@ -37,25 +59,31 @@ namespace System.Drawing
                                return color;
                        }
                        set {
-                               if (isModifiable)
+                               if (isModifiable) {
                                        color = value;
+                                       Status status = GDIPlus.GdipSetSolidFillColor (nativeObject, value.ToArgb ());
+                                       GDIPlus.CheckStatus (status);
+                               }
                                else
-                                       throw new ArgumentException ("You may not change this Brush because it does not belong to you.");
+                                       throw new ArgumentException (Locale.GetText ("This SolidBrush object can't be modified."));
                        }
                }
                
-               public override object Clone()
+               public override object Clone ()
                {
-                       return new SolidBrush( color );
+                       IntPtr clonePtr;
+                       Status status = GDIPlus.GdipCloneBrush (nativeObject, out clonePtr);
+                       GDIPlus.CheckStatus (status);
+                       // we loose the named color in this case (but so does MS SD)
+                       return new SolidBrush (clonePtr);
                }
                
                protected override void Dispose (bool disposing)
                {
-                       if (isModifiable)
-                               GDIPlus.GdipDeleteBrush (nativeObject);
-                       else
-                               throw new ArgumentException ("You may not change this Brush because it does not belong to you.");
+                       if (disposing && !isModifiable)
+                               throw new ArgumentException (Locale.GetText ("This SolidBrush object can't be modified."));
+
+                       base.Dispose (disposing); 
                }
        }
 }
-