X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI.WebControls%2FView.cs;h=c8c84c3cb3322d4322f7b50fe630f2d9eda09e15;hb=6f5a0b555436eba699f9dd2659471044097b951b;hp=e9f835b0c6fb02366b25f3c4ffadad8961ee1651;hpb=234225d112c4b018b8d1796f4c06a15812137500;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/View.cs b/mcs/class/System.Web/System.Web.UI.WebControls/View.cs
index e9f835b0c6f..c8c84c3cb33 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/View.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/View.cs
@@ -1,83 +1,103 @@
-//
-// System.Web.UI.WebControls.View.cs
-//
-// Authors:
-//	Lluis Sanchez Gual (lluis@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
-
-#if NET_2_0
-
-using System;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.ComponentModel;
-
-namespace System.Web.UI.WebControls
-{
-	[ParseChildrenAttribute (false)]
-	[DesignerAttribute ("System.Web.UI.Design.WebControls.ViewDesigner, System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.IDesigner")]
-	[ToolboxDataAttribute ("<{0}:View runat=\"server\"></{0}:View>")]
-	public class View: Control
-	{
-		private static readonly object ActivateEvent = new object();
-		private static readonly object DeactivateEvent = new object();
-		
-		internal void NotifyActivation (bool activated)
-		{
-			if (activated) OnActivate (EventArgs.Empty);
-			else OnDeactivate (EventArgs.Empty);
-		}
-	
-		public event EventHandler Activate {
-			add { Events.AddHandler (ActivateEvent, value); }
-			remove { Events.RemoveHandler (ActivateEvent, value); }
-		}
-		
-		public event EventHandler Deactivate {
-			add { Events.AddHandler (DeactivateEvent, value); }
-			remove { Events.RemoveHandler (DeactivateEvent, value); }
-		}
-		
-		protected virtual void OnActivate (EventArgs e)
-		{
-			if (Events != null) {
-				EventHandler eh = (EventHandler) Events [ActivateEvent];
-				if (eh != null) eh (this, e);
-			}
-		}
-		
-		protected virtual void OnDeactivate (EventArgs e)
-		{
-			if (Events != null) {
-				EventHandler eh = (EventHandler) Events [DeactivateEvent];
-				if (eh != null) eh (this, e);
-			}
-		}
-	}
-}
-
-#endif
+// System.Web.UI.WebControls.View.cs
+//
+// Authors:
+//	Lluis Sanchez Gual (lluis@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+#if NET_2_0
+
+using System;
+using System.Globalization;
+using System.Web;
+using System.Web.UI;
+using System.ComponentModel;
+
+namespace System.Web.UI.WebControls
+{
+	[ParseChildrenAttribute (false)]
+	[DesignerAttribute ("System.Web.UI.Design.WebControls.ViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+	[ToolboxDataAttribute ("<{0}:View runat=\"server\"></{0}:View>")]
+	public class View: Control
+	{
+		static readonly object ActivateEvent = new object();
+		static readonly object DeactivateEvent = new object();
+
+		public View ()
+		{
+			base.Visible = false;
+		}
+		
+		internal void NotifyActivation (bool activated)
+		{
+			if (activated) OnActivate (EventArgs.Empty);
+			else OnDeactivate (EventArgs.Empty);
+		}
+	
+		public event EventHandler Activate {
+			add { Events.AddHandler (ActivateEvent, value); }
+			remove { Events.RemoveHandler (ActivateEvent, value); }
+		}
+		
+		public event EventHandler Deactivate {
+			add { Events.AddHandler (DeactivateEvent, value); }
+			remove { Events.RemoveHandler (DeactivateEvent, value); }
+		}
+		
+		protected virtual void OnActivate (EventArgs e)
+		{
+			if (Events != null) {
+				EventHandler eh = (EventHandler) Events [ActivateEvent];
+				if (eh != null) eh (this, e);
+			}
+		}
+		
+		protected virtual void OnDeactivate (EventArgs e)
+		{
+			if (Events != null) {
+				EventHandler eh = (EventHandler) Events [DeactivateEvent];
+				if (eh != null) eh (this, e);
+			}
+		}
+
+		internal bool VisibleInternal
+		{
+			get { return base.Visible; }
+			set { base.Visible = value; }
+		}
+
+		public override bool Visible
+		{
+			get { return base.Visible; }
+			set
+			{
+				throw new InvalidOperationException ("The Visible property of a View control can only be set by setting the active View of a MultiView.");
+			}
+		}
+	}
+}
+
+#endif