X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Drawing%2FSystem.Drawing%2FStringFormat.cs;h=7e9a218f990f33eb2f2679bbd78d771566b8bf0d;hb=455b2f894a2cc899fa469ac6fbe66dca163761b1;hp=01e75c52ea510c77c82f4929dab48551f2aa0c41;hpb=9975a45f43793e34318e593ddacd3f332f8d91c0;p=mono.git

diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormat.cs b/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
index 01e75c52ea5..7e9a218f990 100644
--- a/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
+++ b/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
@@ -36,7 +36,7 @@ namespace System.Drawing {
 
 	public sealed class StringFormat : MarshalByRefObject, IDisposable, ICloneable
 	{
-		private static StringFormat genericDefault;
+//		private static StringFormat genericDefault;
 		private IntPtr nativeStrFmt = IntPtr.Zero;
                 private int language = GDIPlus.LANG_NEUTRAL;
 				
@@ -44,9 +44,9 @@ namespace System.Drawing {
 		{					   
 		}		
 		
-		public StringFormat(StringFormatFlags options, int lang)
+		public StringFormat(StringFormatFlags options, int language)
 		{
-			Status status = GDIPlus.GdipCreateStringFormat (options, lang, out nativeStrFmt);        			
+			Status status = GDIPlus.GdipCreateStringFormat (options, language, out nativeStrFmt);        			
 			GDIPlus.CheckStatus (status);
 		}
 		
@@ -75,18 +75,18 @@ namespace System.Drawing {
 			}
 		}
 
-		public StringFormat (StringFormat source)
+		public StringFormat (StringFormat format)
 		{
-			if (source == null)
-				throw new ArgumentNullException ("source");
+			if (format == null)
+				throw new ArgumentNullException ("format");
 
-			Status status = GDIPlus.GdipCloneStringFormat (source.NativeObject, out nativeStrFmt);
+			Status status = GDIPlus.GdipCloneStringFormat (format.NativeObject, out nativeStrFmt);
 			GDIPlus.CheckStatus (status);
 		}
 
-		public StringFormat (StringFormatFlags flags)
+		public StringFormat (StringFormatFlags options)
 		{
-			Status status = GDIPlus.GdipCreateStringFormat (flags, GDIPlus.LANG_NEUTRAL, out nativeStrFmt);
+			Status status = GDIPlus.GdipCreateStringFormat (options, GDIPlus.LANG_NEUTRAL, out nativeStrFmt);
 			GDIPlus.CheckStatus (status);			
 		}
 		
@@ -219,10 +219,10 @@ namespace System.Drawing {
 		}
 
 
-      		public void SetMeasurableCharacterRanges (CharacterRange [] range)
+      		public void SetMeasurableCharacterRanges (CharacterRange [] ranges)
 		{					
 			Status status = GDIPlus.GdipSetStringFormatMeasurableCharacterRanges (nativeStrFmt, 
-				range.Length,	range);
+				ranges.Length,	ranges);
 				
 			GDIPlus.CheckStatus (status);
 		}