2006-05-02 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / System.Drawing / System.Drawing.Drawing2D / CustomLineCap.cs

diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs
index a0e5c4804aeb225842b18d1a43ffe8bdcb36c881..4f98318e65d5342704651b10db0c11e464ad5f53 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs
@@ -7,16 +7,30 @@
 //     Ravindra (rkumar@novell.com)
 //
 // Copyright (C) 2002/3 Ximian, Inc. http://www.ximian.com
-// Copyright (C) 2004 Novell, Inc. http://www.novell.com
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// 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.
 //
 
-using System;
+namespace System.Drawing.Drawing2D {
 
-namespace System.Drawing.Drawing2D
-{
-       /// <summary>
-       /// Summary description for CustomLineCap.
-       /// </summary>
        public class CustomLineCap : MarshalByRefObject, ICloneable, IDisposable
        {
                private bool disposed;
@@ -24,7 +38,9 @@ namespace System.Drawing.Drawing2D
 
                // Constructors
 
-               internal CustomLineCap () { }
+               internal CustomLineCap ()
+               {
+               }
 
                internal CustomLineCap (IntPtr ptr)
                {
@@ -41,7 +57,15 @@ namespace System.Drawing.Drawing2D
 
                public CustomLineCap(GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap, float baseInset)
                {
-                       Status status = GDIPlus.GdipCreateCustomLineCap (fillPath.nativePath, strokePath.nativePath, baseCap, baseInset, out nativeObject);
+                       IntPtr fill = IntPtr.Zero;
+                       IntPtr stroke = IntPtr.Zero;
+
+                       if (fillPath != null)
+                               fill = fillPath.nativePath;
+                       if (strokePath != null)
+                               stroke = strokePath.nativePath;
+
+                       Status status = GDIPlus.GdipCreateCustomLineCap (fill, stroke, baseCap, baseInset, out nativeObject);
                        GDIPlus.CheckStatus (status);
                }
 
@@ -107,7 +131,7 @@ namespace System.Drawing.Drawing2D
 
                // Public Methods
 
-               public virtual object Clone ()
+               public object Clone ()
                {
                        IntPtr clonePtr;
                        Status status = GDIPlus.GdipCloneCustomLineCap (nativeObject, out clonePtr);
@@ -116,9 +140,10 @@ namespace System.Drawing.Drawing2D
                        return new CustomLineCap (clonePtr);
                }
                
-               public virtual void Dispose ()
+               public void Dispose ()
                {
                        Dispose (true);
+                       System.GC.SuppressFinalize (this);
                }
 
                protected virtual void Dispose (bool disposing)