API signature fixes

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

diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.cs
index 127504bb3b543c541bae37969020f01c65f83e1d..1ca8a04a692032f547ed7d17f75152b77afde7a3 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsPathIterator.cs
@@ -62,6 +62,10 @@ namespace System.Drawing.Drawing2D
                 {\r
                 }\r
 \r
+               ~GraphicsPathIterator ()\r
+               {\r
+               }\r
+               \r
                 public int Enumerate (ref PointF [] points, ref byte [] types)\r
                 {\r
                         points = _points;\r

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs
index 3a149c2856c35478aad7d035240c1b9674aa2d21..8289ecfc4d8630439b14f611f09452b80a8f132b 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs
@@ -66,10 +66,5 @@ public sealed class FrameDimension {
                return "FrameDimension :" + guid;
        }
 
-       //destructor
-       ~FrameDimension() 
-       {
-       
-       }
 }
 }

diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
index a945b5546193de33a3818c7eb40802765c1cc218..196d1ba1ecc3a0836435101503b966238746d5ca 100755 (executable)
--- a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
@@ -312,11 +312,5 @@ namespace System.Drawing
                        Status status = GDIPlus.GdipBitmapUnlockBits (nativeObject, bitmap_data);
                        GDIPlus.CheckStatus (status);
                }
-
-               protected override void DisposeResources ()
-               {
-                       base.DisposeResources ();
-                       
-               }
        }
 }

diff --git a/mcs/class/System.Drawing/System.Drawing/Font.cs b/mcs/class/System.Drawing/System.Drawing/Font.cs
index 45b191c7b3010a6385b09fb0d44e283b1b3e4606..4c8a341c37e19430a77c1ae5aa036619e481f522 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Font.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Font.cs
@@ -221,7 +221,7 @@ namespace System.Drawing {
                        setProperties (original.FontFamily, original.Size, style, original.Unit, 
                                original.GdiCharSet, original.GdiVerticalFont);
                        
-                       status = GDIPlus.GdipCreateFont (_fontFamily.NativeObject,      Size,  Style,   Unit,  out fontObject);
+                       status = GDIPlus.GdipCreateFont (_fontFamily.NativeObject, Size, Style, Unit, out fontObject);
                        GDIPlus.CheckStatus (status);
                }
                

diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
index 13a360ce28c4f30f013559380615b7596c7b9556..f63f50667eedee2074cee49623567057cdae03d8 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
+++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
@@ -45,7 +45,6 @@ namespace System.Drawing {
                                                                                
                }
                
-               
                ~FontFamily()
                {       
                        Dispose ();

diff --git a/mcs/class/System.Drawing/System.Drawing/Image.cs b/mcs/class/System.Drawing/System.Drawing/Image.cs
index 23864c0b58dd1883a0624bb95a9da99df4836967..c47930c7a32294acc00be3971cc2e28604f45d36 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Image.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Image.cs
@@ -31,7 +31,7 @@ public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISer
        public delegate bool GetThumbnailImageAbort();
        
        internal IntPtr nativeObject = IntPtr.Zero;     
-       protected ColorPalette colorPalette;
+       ColorPalette colorPalette;
        
        
        // constructor
@@ -553,7 +553,7 @@ public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISer
                Dispose (false);
        }
 
-       protected virtual void DisposeResources ()
+       protected internal virtual void DisposeResources ()
        {
                Status status = GDIPlus.GdipDisposeImage (nativeObject);
                GDIPlus.CheckStatus (status);