Procházet zdrojové kódy

Reactivate System.Drawing build. Bugfixes and stubbing of non-trivial
build breakers.

from System.Drawing/ChangeLog

2002-05-03 Mike Kestner <[email protected]>

* Bitmap.cs : using System.IO
* ColorTranslator.cs : Stubbed off build breakers.
* Image.cs : Stub off IDisposable and ICloneable.

from System.Drawing.Imaging/ChangeLog

2002-05-03 Mike Kestner <[email protected]>

* Metafile.cs : Use System.IO. Fix exception typos.

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

Mike Kestner před 24 roky
rodič
revize
bcaddc00a8

+ 4 - 0
mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-03  Mike Kestner  <[email protected]>
+
+	* Metafile.cs : Use System.IO. Fix exception typos.
+
 2002-04-27  Christian Meyer  <[email protected]>
 
 	* Metafile.cs: Copyright now holds Ximian.

+ 4 - 3
mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs

@@ -6,6 +6,7 @@
 // eMail: [email protected]
 //
 using System;
+using System.IO;
 using System.Reflection;
 
 namespace System.Drawing.Imaging {
@@ -35,7 +36,7 @@ namespace System.Drawing.Imaging {
 
 		[MonoTODO]
 		public Metafile (IntPtr referenceHtc, Rectangle frameRect) {
-			throw new NotImplemtedException ();
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -45,7 +46,7 @@ namespace System.Drawing.Imaging {
 
 		[MonoTODO]
 		public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader) {
-			throw new NotImplemtedException ();
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -60,7 +61,7 @@ namespace System.Drawing.Imaging {
 
 		[MonoTODO]
 		public Metafile (IntPtr referenceHdc, EmfType emfType, string description) {
-			throw new NotImplemtedException ();
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]

+ 1 - 0
mcs/class/System.Drawing/System.Drawing/Bitmap.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.IO;
 
 namespace System.Drawing {
 	struct BITMAPFILEHEADER {        // File info header

+ 6 - 0
mcs/class/System.Drawing/System.Drawing/ChangeLog

@@ -1,3 +1,9 @@
+2002-05-03  Mike Kestner <[email protected]>
+
+	* Bitmap.cs : using System.IO
+	* ColorTranslator.cs : Stubbed off build breakers.
+	* Image.cs : Stub off IDisposable and ICloneable.
+	
 2002-04-27  Christian Meyer  <[email protected]>
 
 	* Bitmap.cs: Ximian is the new copyright holder now.

+ 8 - 4
mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs

@@ -29,7 +29,8 @@ namespace System.Drawing {
 			// .NET colors, XWindows colors, and WWWC web colors 
 			// are (according to Charles Pretziod) base the same
 			//colors, so many shouold work if any do.
-			return Color.FromKnownColor(HtmlFromColor);
+			//return Color.FromKnownColor(HtmlFromColor);
+			return Color.Empty;
 		}
 		
 		/// <summary>
@@ -40,7 +41,8 @@ namespace System.Drawing {
 		public static Color FromOle(int OLEFromColor){
 			int newcolor;
 			//TODO: swap RB bytes i.e. AARRGGBB to AABBGGRR
-			return Color.FromArgb(newcolor);
+			//return Color.FromArgb(newcolor);
+			return Color.Empty;
 		}
 		
 		/// <summary>
@@ -51,7 +53,8 @@ namespace System.Drawing {
 		public static Color FromWin32(int Win32FromColor){
 			int newcolor;
 			//TODO: swap RB bytes i.e. AARRGGBB to AABBGGRR
-			return Color.FromArgb(newcolor);
+			//return Color.FromArgb(newcolor);
+			return Color.Empty;
 		}
 
 		// To converisons
@@ -64,7 +67,8 @@ namespace System.Drawing {
 			}
 			else{
 			}
-			return Color.FromKnownColor(HtmlToColor);
+			//return Color.FromKnownColor(HtmlToColor);
+			return String.Empty;
 		}
 		/// <summary>
 		/// converts from BGR to RGB

+ 1 - 1
mcs/class/System.Drawing/System.Drawing/Image.cs

@@ -18,7 +18,7 @@ using System.Drawing.Imaging;
 //[Serializable]
 //[ComVisible(true)]
 
-public abstract class Image : MarshalByRefObject, ICloneable, IDisposable /*, ISerializable */ {
+public abstract class Image : MarshalByRefObject /*, ICloneable, IDisposable, ISerializable */ {
 
 	// constructor
 	public Image () {}

+ 2 - 1
mcs/class/library.build

@@ -10,7 +10,7 @@
 	<target name="build">
 		<nant basedir="corlib" target="build"/>
 		<nant basedir="System" target="build"/>
-		<!--nant basedir="System.Drawing" target="build"/-->
+		<nant basedir="System.Drawing" target="build"/>
 		<nant basedir="System.XML" target="build"/>
 		<nant basedir="System.Data" target="build"/>
 		<nant basedir="System.Web" target="build"/>
@@ -30,6 +30,7 @@
 		</delete>
 		<nant basedir="corlib" target="clean"/>
 		<nant basedir="System" target="clean"/>
+		<nant basedir="System.Drawing" target="clean"/>
 		<nant basedir="System.XML" target="clean"/>
 		<nant basedir="System.Data" target="clean"/>
 	</target>