Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2011-04-20 15:41:29 +0400
committerMarek Safar <marek.safar@gmail.com>2011-04-20 15:41:29 +0400
commit0781122a85740dc9a0ecf8183b15c4785843aac3 (patch)
tree3edff6eef764cd3b9f32d9e458eb92b1dcaf1982 /mcs
parent57bcdb9d97df8f9201284e06ad1007889b649b03 (diff)
Add missing 4.0 api
Diffstat (limited to 'mcs')
-rw-r--r--mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs15
-rw-r--r--mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs1
-rw-r--r--mcs/class/corlib/System.Security/SecurityContext.cs12
-rw-r--r--mcs/class/corlib/System.Threading/ExecutionContext.cs14
4 files changed, 40 insertions, 2 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs
index d0b1730695b..38dda5712a8 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SplitContainer.cs
@@ -42,6 +42,9 @@ namespace System.Windows.Forms
[Docking (DockingBehavior.AutoDock)]
[Designer ("System.Windows.Forms.Design.SplitContainerDesigner, " + Consts.AssemblySystem_Design)]
public class SplitContainer : ContainerControl
+#if NET_4_0
+ , ISupportInitialize
+#endif
{
#region Local Variables
private FixedPanel fixed_panel;
@@ -471,6 +474,18 @@ namespace System.Windows.Forms
#endregion
#region Public Methods
+#if NET_4_0
+ [MonoTODO]
+ public void BeginInit ()
+ {
+ }
+
+ [MonoTODO]
+ public void EndInit ()
+ {
+ }
+#endif
+
public void OnSplitterMoved (SplitterEventArgs e)
{
SplitterEventHandler eh = (SplitterEventHandler)(Events [SplitterMovedEvent]);
diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
index 7ff4ea40f40..68d85e81064 100644
--- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
@@ -73,6 +73,7 @@ namespace System.Security.Permissions {
}
}
+ [Obsolete]
public bool ReflectionEmit
{
get { return reflectionEmit; }
diff --git a/mcs/class/corlib/System.Security/SecurityContext.cs b/mcs/class/corlib/System.Security/SecurityContext.cs
index bfa36d7715e..cd84c88a2af 100644
--- a/mcs/class/corlib/System.Security/SecurityContext.cs
+++ b/mcs/class/corlib/System.Security/SecurityContext.cs
@@ -33,7 +33,11 @@ using System.Threading;
namespace System.Security {
- public sealed class SecurityContext {
+ public sealed class SecurityContext
+#if NET_4_0
+ : IDisposable
+#endif
+ {
private bool _capture;
private IntPtr _winid;
private CompressedStack _stack;
@@ -75,6 +79,12 @@ namespace System.Security {
capture._stack = CompressedStack.Capture ();
return capture;
}
+
+#if NET_4_0
+ public void Dispose ()
+ {
+ }
+#endif
// internal stuff
diff --git a/mcs/class/corlib/System.Threading/ExecutionContext.cs b/mcs/class/corlib/System.Threading/ExecutionContext.cs
index 684caf0a2e4..32e729c1de1 100644
--- a/mcs/class/corlib/System.Threading/ExecutionContext.cs
+++ b/mcs/class/corlib/System.Threading/ExecutionContext.cs
@@ -35,7 +35,11 @@ using System.Security.Permissions;
namespace System.Threading {
[Serializable]
- public sealed class ExecutionContext : ISerializable {
+ public sealed class ExecutionContext : ISerializable
+#if NET_4_0
+ , IDisposable
+#endif
+ {
#if !MOONLIGHT
private SecurityContext _sc;
#endif
@@ -83,6 +87,14 @@ namespace System.Threading {
return new ExecutionContext (this);
}
+
+#if NET_4_0
+ public void Dispose ()
+ {
+ if (_sc != null)
+ _sc.Dispose ();
+ }
+#endif
[MonoTODO]
[ReflectionPermission (SecurityAction.Demand, MemberAccess = true)]