From 2858c67b2c9e760f254e0b1635114e06620be3e7 Mon Sep 17 00:00:00 2001 From: Noam Lampert Date: Tue, 10 Apr 2007 09:28:32 +0000 Subject: [PATCH] Revert - switch back to using MemberwiseClone svn path=/trunk/mcs/; revision=75567 --- .../System.Drawing.Drawing2D/Matrix.jvm.cs | 2 +- .../System.Drawing.Text/LineLayout.jvm.cs | 2 +- .../System.Drawing/System.Drawing/Graphics.jvm.cs | 10 +++++----- mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs | 2 +- mcs/class/System.Drawing/System.Drawing/Region.jvm.cs | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs index 7a3dff8b728..1f72099ae82 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs @@ -119,7 +119,7 @@ namespace System.Drawing.Drawing2D public Matrix Clone() { - return new Matrix ((geom.AffineTransform) NativeObject.clone ()); + return new Matrix ((geom.AffineTransform) NativeObject.MemberwiseClone ()); } diff --git a/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs index 90853c689fb..494ecdc18d9 100644 --- a/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing.Text/LineLayout.jvm.cs @@ -171,7 +171,7 @@ namespace System.Drawing.Text { } internal awt.Shape GetOutline(float x, float y) { - geom.AffineTransform t = (geom.AffineTransform) _lineIter.Transform.clone(); + geom.AffineTransform t = (geom.AffineTransform) _lineIter.Transform.MemberwiseClone(); if (_lineIter.Format.IsVertical) t.translate(y + NativeY, -(x + NativeX)); diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs index 9a5868bed5a..7110939e810 100644 --- a/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs @@ -283,7 +283,7 @@ namespace System.Drawing { try { geom.AffineTransform t = GetFinalTransform(); if (!oldT.isIdentity()) { - t = (geom.AffineTransform)t.clone(); + t = (geom.AffineTransform)t.MemberwiseClone(); t.preConcatenate(oldT); } @@ -352,7 +352,7 @@ namespace System.Drawing { oldT = NativeObject.getTransform(); geom.AffineTransform t = GetFinalTransform(); if (!oldT.isIdentity()) { - t = (geom.AffineTransform) t.clone (); + t = (geom.AffineTransform) t.MemberwiseClone (); t.preConcatenate(oldT); } shape = GetNormalizedShape(shape, t); @@ -1421,7 +1421,7 @@ namespace System.Drawing { geom.AffineTransform t = GetFinalTransform(); if (!t.isIdentity()) { - area = (geom.Area) area.clone (); + area = (geom.Area) area.MemberwiseClone (); area.transform(t); } @@ -1667,7 +1667,7 @@ namespace System.Drawing { geom.AffineTransform t = GetFinalTransform(); if (!t.isIdentity()) { - area = (geom.Area) area.clone (); + area = (geom.Area) area.MemberwiseClone (); area.transform(t); } @@ -2011,7 +2011,7 @@ namespace System.Drawing { if(region == null) throw new ArgumentNullException("region"); - CombineClipArea ((geom.Area) region.NativeObject.clone (), combineMode); + CombineClipArea ((geom.Area) region.NativeObject.MemberwiseClone (), combineMode); } public void SetClip (GraphicsPath path, CombineMode combineMode) { diff --git a/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs index e305f482fc3..01b66931cd4 100644 --- a/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Pen.jvm.cs @@ -557,7 +557,7 @@ namespace System.Drawing geom.AffineTransform penT = _transform.NativeObject; if (penTransform != null && !penTransform.isIdentity()) { - penT = (geom.AffineTransform) penT.clone(); + penT = (geom.AffineTransform) penT.MemberwiseClone(); penT.concatenate(penTransform); } diff --git a/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs index c5018fe9505..4eb7052a7a0 100644 --- a/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/Region.jvm.cs @@ -29,7 +29,7 @@ namespace System.Drawing public Region () - : this ((geom.Area) InfiniteRegion.NativeObject.clone ()) + : this ((geom.Area) InfiniteRegion.NativeObject.MemberwiseClone ()) { } @@ -140,7 +140,7 @@ namespace System.Drawing { if (region == null) throw new ArgumentNullException("region"); - geom.Area a = (geom.Area) region.NativeObject.clone (); + geom.Area a = (geom.Area) region.NativeObject.MemberwiseClone (); a.subtract(NativeObject); Shape = a; } @@ -338,7 +338,7 @@ namespace System.Drawing #region MakeInfinite public void MakeInfinite() { - Shape = (geom.Area) InfiniteRegion.NativeObject.clone (); + Shape = (geom.Area) InfiniteRegion.NativeObject.MemberwiseClone (); } #endregion @@ -382,7 +382,7 @@ namespace System.Drawing #region Clone public Region Clone() { - return new Region ((geom.Area) NativeObject.clone ()); + return new Region ((geom.Area) NativeObject.MemberwiseClone ()); } #endregion } -- 2.25.1