merge -r 54656:54658

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

mcs/class/System.Drawing/System.Drawing.Drawing2D/Blend.cs

@@ -38,6 +38,9 @@ namespace System.Drawing.Drawing2D
 	/// <summary>
 	/// Summary description for Blend.
 	/// </summary>
+#if TARGET_JVM
+	[MonoTODO]
+#endif
 	public sealed class Blend
 	{
 		private float [] positions;

mcs/class/System.Drawing/System.Drawing.Drawing2D/ColorBlend.cs

@@ -46,12 +46,14 @@ namespace System.Drawing.Drawing2D
 			colors = new Color [1];
 		}
 
+		[MonoTODO]
 		public ColorBlend (int count)
 		{
 			positions = new float [count];
 			colors = new Color [count];
 		}
 
+		[MonoTODO]
 		public Color [] Colors {
 			get {
 				return colors;
@@ -62,6 +64,7 @@ namespace System.Drawing.Drawing2D
 			}
 		}
 
+		[MonoTODO]
 		public float [] Positions {
 			get {
 				return positions;

mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsState.jvm.cs

@@ -37,7 +37,6 @@ namespace System.Drawing.Drawing2D
 	/// <summary>
 	/// Summary description for GraphicsState.
 	/// </summary>
-	[MonoTODO]
 	public sealed class GraphicsState : MarshalByRefObject
 	{
 		readonly CompositingMode _compositingMode;

mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs

@@ -38,6 +38,9 @@ using System.IO;
 namespace System.Drawing.Imaging
 {
 	// MUST BE KEPT IN SYNC WITH gdip.h in libgdiplus!
+#if TARGET_JVM
+	[MonoTODO]
+#endif
 	[StructLayout(LayoutKind.Sequential)]
 	public sealed class BitmapData {
 		internal int width;

mcs/class/System.Drawing/System.Drawing.Imaging/ColorMap.cs

@@ -37,7 +37,9 @@ using System.IO;
 using System.Reflection;
 
 namespace System.Drawing.Imaging {
-
+#if TARGET_JVM
+	[MonoTODO]
+#endif
 	public sealed class ColorMap {
 
 		private Color newColor;

mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrix.cs

@@ -38,6 +38,9 @@ using System.Runtime.InteropServices;
 
 namespace System.Drawing.Imaging
 {
+#if TARGET_JVM
+	[MonoTODO]
+#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public sealed class ColorMatrix
 	{

mcs/class/System.Drawing/System.Drawing.Imaging/ImageAttributes.jvm.cs

@@ -9,9 +9,10 @@ namespace System.Drawing.Imaging
 	/// Summary description for ImageAttributes.
 	/// </summary>
 	/// 
+	[MonoTODO]
 	public sealed class ImageAttributes : ICloneable, IDisposable
 	{
-
+		[MonoTODO]
 		public ImageAttributes()
 		{
 		}
@@ -20,12 +21,6 @@ namespace System.Drawing.Imaging
 		{
 		}
 
-
-		public void Finalize()
-		{
-			Dispose();
-		}
-
 		public Object Clone()
 		{
 			ImageAttributes imgAttr = new ImageAttributes();

mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodec.jvm.cs

@@ -17,7 +17,6 @@ namespace Mainsoft.Drawing.Imaging {
 	/// <summary>
 	/// Summary description for ImageCodec.
 	/// </summary>
-	[MonoTODO]
 	public class ImageCodec : IDisposable {
 
 		#region Members
@@ -378,9 +377,8 @@ namespace Mainsoft.Drawing.Imaging {
 		#endregion
 		
 		#region Image read/write methods
-
-		[MonoTODO]
-		public PlainImage ReadPlainImage() {
+
+		internal PlainImage ReadPlainImage() {
 			awt.Image img = ReadImage( _currentFrame );
 			if (img == null)
 				return null;
@@ -409,7 +407,7 @@ namespace Mainsoft.Drawing.Imaging {
 			return pi;
 		}
 
-		public PlainImage ReadNextPlainImage() {
+		internal PlainImage ReadNextPlainImage() {
 			_currentFrame++;
 			return ReadPlainImage();
 		}
@@ -452,7 +450,7 @@ namespace Mainsoft.Drawing.Imaging {
 			}
 		}
 #endif
-		public void WritePlainImage(PlainImageCollection pic) {
+		internal void WritePlainImage(PlainImageCollection pic) {
 			if ((pic == null) || (pic.Count == 0))
 				return;
 
@@ -478,7 +476,7 @@ namespace Mainsoft.Drawing.Imaging {
 			}
 		}
 
-		public void WritePlainImage(PlainImage pi) {
+		internal void WritePlainImage(PlainImage pi) {
 			try {
 				imageio.IIOImage iio = GetIIOImageContainer( pi );
 				WriteImage( iio );

mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs

@@ -75,9 +75,11 @@ namespace System.Drawing
 		public Bitmap (string filename) 
 			:this (filename, false) {}
 
+		[MonoTODO]
 		public Bitmap (Stream stream, bool useIcm)
 			:this (stream, useIcm, null) {}
 
+		[MonoTODO]
 		public Bitmap (string filename, bool useIcm)
 			:this (filename, useIcm, null) {}
 

mcs/class/System.Drawing/System.Drawing/ChangeLog

@@ -1,3 +1,7 @@
+2005-12-20  Konstantin Triger <[email protected]>
+
+        * Font.jvm.cs: charset support.
+
 2005-12-19  Peter Dennis Bartok  <[email protected]>
 
 	* Graphics.cs (Flush): Make sure nativeObject is not null
@@ -39,32 +43,32 @@
 2005-12-05 Jordi Mas i Hernandez <[email protected]>
 
 	* gdipFunctions.cs: DllExports need it to implement 
-	  new Graphics.CopyFromScreen .Net 2.0 methods
-	* IDeviceContext.cs: New .Net 2.0 interface
-	* Color.cs: Fixes for new .Net 2.0 KnowColors
-	* PointF.cs: New .Net 2.0 Add/Subtract methods
-	* gdipStructs.cs: Structs need it for Graphics.CopyFromScreen
-	* SystemBrushes.cs: New standard SystemBrushes for .Net 2.0
-	* SizeF.cs: New .Net 2.0 Add/Subtract methods
-	* FontConverter.cs: New .Net 2.0 fixes
-	* SystemColors.cs: New standard SystemColors for .Net 2.0
-	* SizeFConverter.cs: New .Net 2.0 class (based on SizeConverter)
-	* CharacterRange.cs: : New .Net 2.0 methods
-	* Size.cs: New .Net 2.0 Add/Subtract methods
-	* SystemPens.cs: New standard SystemPens for .Net 2.0
-	* Bitmap.cs: New .Net 2.0 methods
-	* Region.cs: New .Net 2.0 methods
-	* Brush.cs: New .Net 2.0 constructor
-	* Icon.cs: New .Net 2.0 Constructors and methods
-	* Point.cs: New .Net 2.0 Add/Subtract methods
-	* BufferedGraphicsManager.cs: New .Net 2.0 class
-	* Graphics.cs: New methods for .Net 2.0 and fixes
-	* BufferedGraphics.cs: New .Net 2.0 class
-	* Font.cs:  New .Net 2.0 properties
-	* Image.cs: New .Net 2.0 tag property
-	* KnownColor.cs: New .Net 2.0 know colors
-	* CopyPixelOperation.cs: New .Net 2.0 enum
-	* SystemFonts.cs: New .Net 2.0 class
+	  new Graphics.CopyFromScreen .Net 2.0 methods
+	* IDeviceContext.cs: New .Net 2.0 interface
+	* Color.cs: Fixes for new .Net 2.0 KnowColors
+	* PointF.cs: New .Net 2.0 Add/Subtract methods
+	* gdipStructs.cs: Structs need it for Graphics.CopyFromScreen
+	* SystemBrushes.cs: New standard SystemBrushes for .Net 2.0
+	* SizeF.cs: New .Net 2.0 Add/Subtract methods
+	* FontConverter.cs: New .Net 2.0 fixes
+	* SystemColors.cs: New standard SystemColors for .Net 2.0
+	* SizeFConverter.cs: New .Net 2.0 class (based on SizeConverter)
+	* CharacterRange.cs: : New .Net 2.0 methods
+	* Size.cs: New .Net 2.0 Add/Subtract methods
+	* SystemPens.cs: New standard SystemPens for .Net 2.0
+	* Bitmap.cs: New .Net 2.0 methods
+	* Region.cs: New .Net 2.0 methods
+	* Brush.cs: New .Net 2.0 constructor
+	* Icon.cs: New .Net 2.0 Constructors and methods
+	* Point.cs: New .Net 2.0 Add/Subtract methods
+	* BufferedGraphicsManager.cs: New .Net 2.0 class
+	* Graphics.cs: New methods for .Net 2.0 and fixes
+	* BufferedGraphics.cs: New .Net 2.0 class
+	* Font.cs:  New .Net 2.0 properties
+	* Image.cs: New .Net 2.0 tag property
+	* KnownColor.cs: New .Net 2.0 know colors
+	* CopyPixelOperation.cs: New .Net 2.0 enum
+	* SystemFonts.cs: New .Net 2.0 class
 	* BufferedGraphicsContext.cs: New .Net 2.0 class
 
 2005-11-28 Konstantin Triger <[email protected]>

mcs/class/System.Drawing/System.Drawing/Font.jvm.cs

@@ -11,9 +11,12 @@ namespace System.Drawing {
 
 		#region variables
 
+		const byte DEFAULT_CHARSET = 1;
+
 		private readonly GraphicsUnit _gUnit = GraphicsUnit.Point;
 		private readonly FontFamily _fontFamily;
 		private readonly awt.Font _jFont;
+		private readonly byte _charset;
 
 		#endregion
 
@@ -51,32 +54,31 @@ namespace System.Drawing {
 		}
 
 		public Font(FontFamily family, float emSize)
-			: this(family, emSize, FontStyle.Regular, GraphicsUnit.Point, (byte)0, false) {
+			: this(family, emSize, FontStyle.Regular, GraphicsUnit.Point, DEFAULT_CHARSET, false) {
 		}
 
 		public Font(FontFamily family, float emSize, FontStyle style)
-			: this(family, emSize, style, GraphicsUnit.Point, (byte)0, false) {
+			: this(family, emSize, style, GraphicsUnit.Point, DEFAULT_CHARSET, false) {
 		}
 		public Font(FontFamily family, float emSize, GraphicsUnit unit)
-			: this(family, emSize, FontStyle.Regular, unit, (byte)0, false) {
+			: this(family, emSize, FontStyle.Regular, unit, DEFAULT_CHARSET, false) {
 		}
 
 		public Font(FontFamily family, float emSize, FontStyle style, GraphicsUnit unit)
-			: this(family, emSize, style, unit, (byte)0, false) {
+			: this(family, emSize, style, unit, DEFAULT_CHARSET, false) {
 		}
 
 		public Font(FontFamily family, float emSize, FontStyle style, GraphicsUnit unit, byte charSet)
 			: this(family, emSize, style, unit, charSet, false) {
 		}
 		
-		[MonoTODO]
 		public Font(FontFamily family, float emSize, FontStyle style, GraphicsUnit unit, byte charSet, bool isVertical) {
 			if (family == null)
 				throw new ArgumentNullException("family");
 
-			//TODO: charset management
 			_gUnit = unit;
 			_fontFamily = family;
+			_charset = charSet;
 
 			java.util.Hashtable attribs = new java.util.Hashtable();
 			attribs.put(TextAttribute.FAMILY, family.Name/*TODO: family doungrade possibility*/);
@@ -156,7 +158,7 @@ namespace System.Drawing {
 		
 		public byte GdiCharSet {
 			get {
-				return 1; //DEFAULT_CHARSET
+				return _charset;
 			}
 		}
 		

mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs

@@ -217,9 +217,7 @@ namespace System.Drawing {
 
 		#region IDisposable Members
 
-		[MonoTODO]
 		public void Dispose() {
-			// TODO:  Add FontFamily.Dispose implementation
 		}
 
 		#endregion

mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs

@@ -15,7 +15,6 @@ namespace System.Drawing {
 		sealed class DummyStroke : awt.Stroke {
 			#region Stroke Members
 
-			[MonoTODO]
 			awt.Shape awt.Stroke.createStrokedShape(awt.Shape arg_0) {
 				throw new NotImplementedException("DummyStroke");
 			}

mcs/class/System.Drawing/System.Drawing/Region.jvm.cs

@@ -356,6 +356,11 @@ namespace System.Drawing
 		{
 			throw new NotImplementedException();
 		}
+
+		[MonoTODO]
+		public IntPtr GetHrgn(Graphics g) {
+			throw new NotImplementedException();
+		}
 		
 		
 		#region GetRegionScans [TODO]

mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs

@@ -113,6 +113,7 @@ namespace System.Drawing {
 			}
 		}
 
+		[MonoTODO]
 		public StringFormatFlags FormatFlags {
 			get {				
 				return _flags;
@@ -123,6 +124,7 @@ namespace System.Drawing {
 			}
 		}
 
+		[MonoTODO]
 		public HotkeyPrefix HotkeyPrefix {
 			get {				
 				return _hotkeyPrefix;
@@ -133,6 +135,7 @@ namespace System.Drawing {
 			}
 		}
 
+		[MonoTODO]
 		public StringTrimming Trimming {
 			get {
 				return _trimming;

mcs/class/System.Drawing/System.Drawing/TextureBrush.jvm.cs

@@ -162,6 +162,7 @@ namespace System.Drawing {
 			}
 		}
 
+		[MonoTODO]
 		public WrapMode WrapMode {
 			get {
 				return _wrapMode;