* System.Web.dll.sources: Added new enums.

* ButtonType.cs:
* LoginFailureAction.cs:
* LoginTextLayout.cs: Added enumerations.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs
new file mode 100644 (file)
index 0000000..480e29b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs
@@ -0,0 +1,38 @@
+//
+// System.Web.UI.WebControls.ButtonType.cs
+//
+// Author: Duncan Mak (duncan@ximian.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
+namespace System.Web.UI.WebControls
+{
+        public enum ButtonType
+        {
+                Button = 0,
+                Image = 1,
+                Link = 2,
+        }
+}
+#endif

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index b4862d089a5833f231380daa5a22eefcbbab54bc..4cc2724d08c85d3707fe761c92da8378ef96b09f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-02  Duncan Mak  <duncan@ximian.com>
+
+       * ButtonType.cs:
+       * LoginFailureAction.cs:
+       * LoginTextLayout.cs: Added enumerations.
+
 2004-07-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * BaseValidator.cs: in Validate(), when the control is not visible or

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs
new file mode 100644 (file)
index 0000000..5849375
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs
@@ -0,0 +1,38 @@
+//
+// System.Web.UI.WebControls.LoginFailureAction.cs
+//
+// Author: Duncan Mak (duncan@ximian.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
+namespace System.Web.UI.WebControls {
+
+        public enum LoginFailureAction
+        {
+                Refresh = 0,                
+                RedirectToLoginPage = 1,
+        }
+}
+
+#endif

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LoginTextLayout.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LoginTextLayout.cs
new file mode 100644 (file)
index 0000000..41a2caf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LoginTextLayout.cs
@@ -0,0 +1,37 @@
+//
+// System.Web.UI.WebControls.LoginTextLayout.cs
+//
+// Author: Duncan Mak (duncan@ximian.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
+namespace System.Web.UI.WebControls {
+
+        public enum LoginTextLayout
+        {
+                TextOnLeft = 0,
+                TextOnTop = 1
+        }
+}
+#endif

diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index 6b15688f7d555011fcc751a73022866a3576d0fc..5245cbc29b1377d522dbc9900a016b2555924703 100755 (executable)
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -228,6 +228,7 @@ System.Web.UI.WebControls/BulletedListEventHandler.cs
 System.Web.UI.WebControls/Button.cs
 System.Web.UI.WebControls/ButtonColumn.cs
 System.Web.UI.WebControls/ButtonColumnType.cs
+System.Web.UI.WebControls/ButtonType.cs
 System.Web.UI.WebControls/Calendar.cs
 System.Web.UI.WebControls/CalendarDay.cs
 System.Web.UI.WebControls/CalendarSelectionMode.cs
@@ -301,6 +302,8 @@ System.Web.UI.WebControls/ListItemType.cs
 System.Web.UI.WebControls/ListSelectionMode.cs
 System.Web.UI.WebControls/Literal.cs
 System.Web.UI.WebControls/LiteralControlBuilder.cs
+System.Web.UI.WebControls/LoginFailureAction.cs
+System.Web.UI.WebControls/LoginTextLayout.cs
 System.Web.UI.WebControls/MonthChangedEventArgs.cs
 System.Web.UI.WebControls/MonthChangedEventHandler.cs
 System.Web.UI.WebControls/NextPrevFormat.cs