svn path=/branches/mono-1-1-9/mcs/; revision=51216

[mono.git] / mcs / class / corlib / System.Security.Permissions / UIPermissionAttribute.cs

diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs
index 94e742327af60f56269834b049b2e4fb5addc2cc..84ffb92412d6ef167854f44d9934c77b6451a8c7 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs
@@ -4,15 +4,38 @@
 // Duncan Mak <duncan@ximian.com>
 //
 // (C) 2002 Ximian, Inc.                       http://www.ximian.com
+// Copyright (C) 2004-2005 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.
 //
 
-using System;
+using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
                         AttributeTargets.Struct | AttributeTargets.Constructor |
-                        AttributeTargets.Method)]
+                        AttributeTargets.Method, AllowMultiple=true, Inherited=false)]
        [Serializable]
        public sealed class UIPermissionAttribute : CodeAccessSecurityAttribute {
 
@@ -21,17 +44,17 @@ namespace System.Security.Permissions {
                private UIPermissionWindow window;
                
                // Constructor
-               public UIPermissionAttribute (SecurityAction action) : base (action) {}
+               public UIPermissionAttribute (SecurityAction action) : base (action)
+               {
+               }
                
                // Properties
-               public UIPermissionClipboard Clipboard
-               {
+               public UIPermissionClipboard Clipboard {
                        get { return clipboard; }
                        set { clipboard = value; }
                }
 
-               public UIPermissionWindow Window
-               {
+               public UIPermissionWindow Window {
                        get { return window; }
                        set { window = value; }
                }
@@ -39,7 +62,12 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
-                       return new UIPermission (window, clipboard);
+                       UIPermission perm = null;
+                       if (this.Unrestricted)
+                               perm = new UIPermission (PermissionState.Unrestricted);
+                       else
+                               perm = new UIPermission (window, clipboard);
+                       return perm;
                }
        }
 }