2004-06-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* System.Web.Handlers/TraceHandler.cs:
	* System.Web.UI/Control.cs:
	* System.Web.UI/Html32TextWriter.cs:
	* System.Web.UI/HtmlTextWriter.cs:
	* System.Web.UI/SimpleWebHandlerParser.cs:
	* System.Web.UI/TemplateControl.cs:
	* System.Web.UI.WebControls/Calendar.cs:
	* System.Web.UI.WebControls/CompareValidator.cs:
	* System.Web.UI.WebControls/ImageButton.cs:
	* System.Web.UI.WebControls/Style.cs:
	* System.Web.UI.WebControls/WebControl.cs:
	Added protected missing members and attributes.

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

14 files changed, 90 insertions, 3 deletions

diff --git a/mcs/class/System.Web/System.Web.Handlers/ChangeLog b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
index bf068bebde1..ebddbc1e4ba 100644
--- a/mcs/class/System.Web/System.Web.Handlers/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TraceHandler.cs: Added protected missing members and attributes.
+
 2004-01-10  Jackson Harper <jackson@ximian.com>
 
 	* TraceHandler.cs: Obey localOnly attribute.
diff --git a/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs b/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
index 0138efc66a3..37dfcbc999d 100644
--- a/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
@@ -9,6 +9,8 @@
 // (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
+using System.Collections;
+using System.Data;
 using System.Web;
 using System.Web.Util;
 using System.Web.UI;
@@ -128,6 +130,16 @@ namespace System.Web.Handlers
 		{
 			manager.TraceData [item - 1].Render (output);
 		}
+
+		[MonoTODO ("Appears in class status, but...")]
+		protected void ShowDetails (DataSet data)
+		{
+		}
+
+		[MonoTODO ("Appears in class status, but...")]
+		protected void ShowRequests (ArrayList list)
+		{
+		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
index f5e10d2e47d..b9381282a8e 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
@@ -658,6 +658,11 @@ namespace System.Web.UI.WebControls
 			}

 		}

 

+		[MonoTODO]
+		protected override void OnPreRender (EventArgs e)
+		{
+		}
+
 		protected override void Render(HtmlTextWriter writer)

 		{

 			globCal = DateTimeFormatInfo.CurrentInfo.Calendar;

@@ -1234,5 +1239,11 @@ namespace System.Web.UI.WebControls
 				OnSelectionChanged ();

 			}

 		}

+
+		[MonoTODO]
+		protected bool HasWeekSelectors (CalendarSelectionMode selectionMode)
+		{
+			return true;
+		}
 	}

 }

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 460027274b2..dbf6ccc0dd8 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Calendar.cs:
+	* CompareValidator.cs:
+	* ImageButton.cs:
+	* Style.cs:
+	* WebControl.cs: Added protected missing members and attributes.
+
 2004-05-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* TextBox.cs: don't save the Text if in ViewState if it's a password.
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
index 0dddee67284..86e047a8bc5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
@@ -95,5 +95,17 @@ namespace System.Web.UI.WebControls
 
 			return Compare (ctrl, cmp, Operator, Type);
 		}
+
+		[MonoTODO]
+		protected override void AddAttributesToRender (HtmlTextWriter writer)
+		{
+			base.AddAttributesToRender (writer);
+		}
+
+		[MonoTODO]
+		protected override bool ControlPropertiesValid ()
+		{
+			return base.ControlPropertiesValid ();
+		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
index 508d27c7169..a4405bca1bd 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
@@ -81,6 +81,8 @@ namespace System.Web.UI.WebControls
 			}

 		}

 

+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		protected override HtmlTextWriterTag TagKey

 		{

 			get

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
index 133e1d6f900..ad5feeaf8b6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
@@ -68,6 +68,8 @@ namespace System.Web.UI.WebControls
 			selectionBits = 0x00;
 		}
 
+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		protected internal StateBag ViewState {
 			get {
 				if (viewState == null) {
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 1651d8fa516..c859a3027cb 100755
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -351,6 +351,8 @@ namespace System.Web.UI.WebControls
 			writer.RenderEndTag();

 		}

 

+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		protected virtual HtmlTextWriterTag TagKey

 		{

 			get

@@ -359,6 +361,8 @@ namespace System.Web.UI.WebControls
 			}

 		}

 

+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		protected virtual string TagName

 		{

 			get

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index edff25b99ef..8dcb2e2e3de 100644
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,5 +1,13 @@
 2004-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
+	* Control.cs:
+	* Html32TextWriter.cs:
+	* HtmlTextWriter.cs:
+	* SimpleWebHandlerParser.cs:
+	* TemplateControl.cs: Added protected missing members and attributes.
+
+2004-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
 	* ObjectStateFormatter.cs: use ObjectFormatter methods instead of
 	calling a protected method of another object.
 
diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 69040c858df..bff733e0950 100644
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -268,6 +268,9 @@ namespace System.Web.UI
                                 _childControlsCreated = value;

                         }

                 }

+
+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                 protected virtual HttpContext Context //DIT

                 {

                         get

@@ -309,6 +312,10 @@ namespace System.Web.UI
                                 return _trackViewState;

                         }

                 }

+
+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("ViewState")]
                 protected virtual StateBag ViewState

                 {

                         get

@@ -323,6 +330,8 @@ namespace System.Web.UI
                         }

                 }

 

+		[Browsable (false)]
+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                 protected virtual bool ViewStateIgnoresCase

                 {

                         get {

diff --git a/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs b/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs
index 829b73490f8..dc2e26ea02a 100644
--- a/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs
@@ -9,6 +9,7 @@
 // (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
+using System.Collections;
 using System.Globalization;
 using System.IO;
 
@@ -274,6 +275,13 @@ namespace System.Web.UI
 		{
                         return base.RenderBeforeTag ();
 		}
+
+		[MonoTODO]
+		protected Stack FontStack {
+			get {
+				return null;
+			}
+		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
index 6bf3c75cae0..076b3ac5684 100644
--- a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
@@ -365,7 +365,7 @@ protected bool IsAttributeDefined(HtmlTextWriterAttribute key){
 	return false;

 }

 

-protected bool IsAttributeDefined(HtmlTextWriterAttribute key, ref string value){

+protected bool IsAttributeDefined(HtmlTextWriterAttribute key, out string value){

 	value = null;

 	for (int i=0; i < _attrCount; i++) {

 		if (_attrList[i].key == key) {

@@ -384,7 +384,7 @@ protected bool IsStyleAttributeDefined(HtmlTextWriterStyle key){
 	return false;

 }

 

-protected bool IsStyleAttributeDefined(HtmlTextWriterStyle key, ref string value){

+protected bool IsStyleAttributeDefined(HtmlTextWriterStyle key, out string value){

 	value = null;

 	for( int i=0; i < _styleCount; i++) {

 		if (_styleList[i].key == key) {

diff --git a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
index 6c212e1a24b..26fefec3f75 100644
--- a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
@@ -60,6 +60,12 @@ namespace System.Web.UI
 			GetDirectivesAndContent ();
 		}
 
+		[MonoTODO]
+		protected Type GetCompiledTypeFromCache ()
+		{
+			return null;
+		}
+
 		void GetDirectivesAndContent ()
 		{
 			StreamReader reader = new StreamReader (File.OpenRead (physPath));
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
index 02e613448a4..8ff93155514 100755
--- a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
@@ -47,12 +47,13 @@ namespace System.Web.UI {
 		#endregion
 
 		#region Properties
-
+		[EditorBrowsable (EditorBrowsableState.Never)]
 		protected virtual int AutoHandlers {
 			get { return 0; }
 			set { }
 		}
 
+		[EditorBrowsable (EditorBrowsableState.Never)]
 		protected virtual bool SupportAutoEvents {
 			get { return true; }
 		}