From 7ddd6de390bdb6ba7c73d25924ac629a65a64da0 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@gnome.org>
Date: Sat, 27 Oct 2001 19:27:55 +0000
Subject: [PATCH] Incorporate System.Web.UI.WebControls to the build + some
 fixes

svn path=/trunk/mcs/; revision=1214
---
 .../System.Web.UI.WebControls/BaseDataList.cs |  2 +-
 .../BaseValidator.cs                          |  1 +
 .../System.Web.UI.WebControls/DataList.cs     | 29 ++++++++++++++++++-
 .../System.Web.UI.WebControls/WebControl.cs   | 14 ++++++++-
 mcs/class/System.Web/System.Web.build         |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
index d742fc6507b..7196d3d8521 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
@@ -74,7 +74,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		public DataKeysCollection DataKeys
+		public DataKeyCollection DataKeys
 		{
 			get
 			{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
index 7e102baa868..00d8eaa8b06 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
@@ -10,6 +10,7 @@
  */
 
 using System;
+using System.ComponentModel;
 using System.Web;
 using System.Web.UI;
 using System.Drawing;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
index 7091569ffb1..936a9c26526 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -35,6 +35,10 @@ namespace System.Web.UI.WebControls
 
 		private int editItemIndex;
 		private bool extractTemplateRows;
+		private bool hasFooter;
+		private bool hasHeader;
+		private bool hasSeparators;
+		private int  repeatedItemCount;
 		
 		public DataList()
 		{
@@ -98,7 +102,7 @@ namespace System.Web.UI.WebControls
 		 * CreateControlHeirarchy(bool)
 		 */
 		 
-		public virtual ITemplate editItemTemplate
+		public virtual ITemplate EditItemTemplate
 		{
 			get
 			{
@@ -141,5 +145,28 @@ namespace System.Web.UI.WebControls
 				footerTemplate = value;
 			}
 		}
+
+		public bool HasFooter {
+			get {
+				return hasFooter;
+			}
+		}
+
+		public bool HasHeader {
+			get {
+				return hasHeader;
+			}
+		}
+		public bool HasSeparators {
+			get {
+				return hasSeparators;
+			}
+		}
+
+		public int  RepeatedItemCount {
+			get {
+				return repeatedItemCount;
+			}
+		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
index 288f8ba2c6f..9ea4b83e136 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -173,6 +173,19 @@ namespace System.Web.UI.WebControls
 			
 		}
 
+		public virtual Color ForeColor {
+			get {
+				return Color.Empty;
+			}
+
+			set {
+				//
+				// FIXME: Set the Style color here
+				//
+				
+			}
+		}
+		
 /*
 		// Properties
 		public ControlCollection Controls { virtual get; }
@@ -180,7 +193,6 @@ namespace System.Web.UI.WebControls
 		public bool ControlStyleCreated { get; }
 		public bool EnableViewState { virtual get; virtual set; }
 		public FontInfo Font { virtual get; }
-		public Color ForeColor { virtual get; virtual set; }
 		public Unit Height { virtual get; virtual set; }
 		public string ID { virtual get; virtual set; }
 		public Control NamingContainer { virtual get; }
diff --git a/mcs/class/System.Web/System.Web.build b/mcs/class/System.Web/System.Web.build
index 145981c9e20..83cfdb69f41 100644
--- a/mcs/class/System.Web/System.Web.build
+++ b/mcs/class/System.Web/System.Web.build
@@ -10,6 +10,7 @@
 		<csc target="library" output="../lib/System.Web.dll" debug="${debug}">
 			<arg value="/nowarn:1595"/>
 			<arg value="/unsafe"/>
+			<arg value="/r:System.dll"/>
 			<sources>
 				<includes name="**/*.cs"/> 
 				<excludes name="Test/**"/>
@@ -17,7 +18,6 @@
 				<excludes name="System.Web.Hosting/**"/>
 				<excludes name="System.Web.UI/**"/>
 				<excludes name="System.Web.UI.HtmlControls/**"/>
-				<excludes name="System.Web.UI.WebControls/**"/>
 				<excludes name="System.Web/IHttpModule.cs"/>
 				<excludes name="System.Web/IHttpHandlerFactory.cs"/>
 				<excludes name="System.Web/HttpCacheValidateHandler.cs"/>
-- 
2.25.1