Prechádzať zdrojové kódy

rename MemberwiseClone to clone - accroding to public interface

svn path=/trunk/mcs/; revision=75563
Konstantin Triger 19 rokov pred
rodič
commit
4909667ef8

+ 2 - 2
mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.jvm.cs

@@ -118,8 +118,8 @@ namespace System.Drawing.Drawing2D
 		#region methods
 
 		public Matrix Clone()
-		{
-			return new Matrix ((geom.AffineTransform) NativeObject.MemberwiseClone ());
+		{
+			return new Matrix ((geom.AffineTransform) NativeObject.clone ());
 		}
                 
         

+ 2 - 2
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.MemberwiseClone ();
+			geom.AffineTransform t = (geom.AffineTransform) _lineIter.Transform.clone();
 
 			if (_lineIter.Format.IsVertical)
 				t.translate(y + NativeY, -(x + NativeX));
@@ -184,4 +184,4 @@ namespace System.Drawing.Text {
 		#endregion
 	}
 
-}
+}

+ 5 - 5
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.MemberwiseClone();
+						t = (geom.AffineTransform)t.clone();
 						t.preConcatenate(oldT);
 					}
 					
@@ -352,7 +352,7 @@ namespace System.Drawing {
 				oldT = NativeObject.getTransform();
 				geom.AffineTransform t = GetFinalTransform();
 				if (!oldT.isIdentity()) {
-					t = (geom.AffineTransform) t.MemberwiseClone ();
+					t = (geom.AffineTransform) t.clone ();
 					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.MemberwiseClone ();
+				area = (geom.Area) area.clone ();
 				area.transform(t);
 			}
 
@@ -1667,7 +1667,7 @@ namespace System.Drawing {
 			
 			geom.AffineTransform t = GetFinalTransform();
 			if (!t.isIdentity()) {
-				area = (geom.Area) area.MemberwiseClone ();
+				area = (geom.Area) area.clone ();
 				area.transform(t);
 			}
 
@@ -2011,7 +2011,7 @@ namespace System.Drawing {
 			if(region == null)
 				throw new ArgumentNullException("region");
 
-			CombineClipArea ((geom.Area) region.NativeObject.MemberwiseClone (), combineMode);
+			CombineClipArea ((geom.Area) region.NativeObject.clone (), combineMode);
 		}
 		
 		public void SetClip (GraphicsPath path, CombineMode combineMode) {

+ 1 - 1
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.MemberwiseClone ();
+				penT = (geom.AffineTransform) penT.clone();
 				penT.concatenate(penTransform);
 			}
 

+ 13 - 13
mcs/class/System.Drawing/System.Drawing/Region.jvm.cs

@@ -25,11 +25,11 @@ namespace System.Drawing
 		}
 		#endregion
 		
-		#region Ctors. and Dtor
-
-
-		public Region ()
-			: this ((geom.Area) InfiniteRegion.NativeObject.MemberwiseClone ())
+		#region Ctors. and Dtor
+
+
+		public Region ()
+			: this ((geom.Area) InfiniteRegion.NativeObject.clone ())
 		{                  
 		}
 
@@ -139,8 +139,8 @@ namespace System.Drawing
 		public void Complement (Region region)
 		{
 			if (region == null)
-				throw new ArgumentNullException("region");
-			geom.Area a = (geom.Area) region.NativeObject.MemberwiseClone ();
+				throw new ArgumentNullException("region");
+			geom.Area a = (geom.Area) region.NativeObject.clone ();
 			a.subtract(NativeObject);
 			Shape = a;
 		}
@@ -337,8 +337,8 @@ namespace System.Drawing
 
 		#region MakeInfinite
 		public void MakeInfinite()
-		{
-			Shape = (geom.Area) InfiniteRegion.NativeObject.MemberwiseClone ();
+		{
+			Shape = (geom.Area) InfiniteRegion.NativeObject.clone ();
 		}
 		#endregion 
 
@@ -356,8 +356,8 @@ namespace System.Drawing
 		{
 			throw new NotImplementedException();
 		}
-
-		[MonoTODO]
+
+		[MonoTODO]
 		public IntPtr GetHrgn(Graphics g) {
 			throw new NotImplementedException();
 		}
@@ -381,8 +381,8 @@ namespace System.Drawing
 
 		#region Clone
 		public Region Clone()
-		{
-			return new Region ((geom.Area) NativeObject.MemberwiseClone ());
+		{
+			return new Region ((geom.Area) NativeObject.clone ());
 		}
 		#endregion
 	}