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 43224f3a703a69358808cc0750f09fdb6c447098..f356be3d26a523bcc3fa7a693628c6a3da393f13 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
@@ -7,15 +7,35 @@
 //   Ravindra (rkumar@novell.com)
 //
 // (C) 2002 Ximian, Inc.
-// (C) 2004 Novell, 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;
+               // 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)
@@ -30,10 +50,8 @@ namespace System.Drawing
                public SolidBrush (Color color)
                 {
                        this.color = color;
-                       int brush;
-                       Status status = GDIPlus.GdipCreateSolidFill (color.ToArgb (), out brush);
+                       Status status = GDIPlus.GdipCreateSolidFill (color.ToArgb (), out nativeObject);
                        GDIPlus.CheckStatus (status);
-                       nativeObject = (IntPtr) brush;
                }
 
                public Color Color {
@@ -47,35 +65,25 @@ namespace System.Drawing
                                        GDIPlus.CheckStatus (status);
                                }
                                else
-                                       throw new ArgumentException ("This SolidBrush object can't be modified.");
+                                       throw new ArgumentException (Locale.GetText ("This SolidBrush object can't be modified."));
                        }
                }
                
-               public override object Clone()
+               public override object Clone ()
                {
                        IntPtr clonePtr;
                        Status status = GDIPlus.GdipCloneBrush (nativeObject, out clonePtr);
                        GDIPlus.CheckStatus (status);
-
-                       SolidBrush clone = new SolidBrush (clonePtr);
-                       return clone;
+                       // we loose the named color in this case (but so does MS SD)
+                       return new SolidBrush (clonePtr);
                }
                
                protected override void Dispose (bool disposing)
                {
-                       // SolidBrush is disposed if and only if it is not disposed
-                       // and it is modifiable OR it is not disposed and it is being
-                       // collected by GC.
-                       if (! disposed) {
-                               if (isModifiable || disposing == false) {
-                                       Status status = GDIPlus.GdipDeleteBrush (nativeObject);
-                                       GDIPlus.CheckStatus (status);
-                                       disposed = true;
-                               }
-                               else
-                                       throw new ArgumentException ("This SolidBrush object can't be modified.");
-                       }
+                       if (disposing && !isModifiable)
+                               throw new ArgumentException (Locale.GetText ("This SolidBrush object can't be modified."));
+
+                       base.Dispose (disposing); 
                }
        }
 }
-