mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mcs/class/System/System.ComponentModel/Component.cs
View File

@ -100,18 +100,11 @@ namespace System.ComponentModel {
Dispose (false);
}
#if TARGET_JVM
public virtual void Dispose ()
{
Dispose (true);
}
#else
public void Dispose ()
{
Dispose (true);
GC.SuppressFinalize (this);
}
#endif
// <summary>
// Controls disposal of resources used by this.

2
mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs
View File

@ -70,12 +70,10 @@ namespace System.ComponentModel
// Set fields to null
}
#if !TARGET_JVM
~MarshalByValueComponent ()
{
Dispose (false);
}
#endif
public virtual object GetService (Type service)
{

24
mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
View File

@ -92,7 +92,6 @@ namespace System.ComponentModel
properties.Clear ();
}
#if !TARGET_JVM // DUAL_IFACE_CONFLICT
void IList.Clear ()
{
Clear ();
@ -102,19 +101,12 @@ namespace System.ComponentModel
{
Clear ();
}
#endif
public bool Contains (PropertyDescriptor value)
{
return properties.Contains (value);
}
#if TARGET_JVM // DUAL_IFACE_CONFLICT
public bool Contains (object value)
{
return Contains ((PropertyDescriptor) value);
}
#else
bool IList.Contains (object value)
{
@ -125,7 +117,6 @@ namespace System.ComponentModel
{
return Contains ((PropertyDescriptor) value);
}
#endif
public void CopyTo (Array array, int index)
{
@ -198,12 +189,6 @@ namespace System.ComponentModel
properties.Remove (value);
}
#if TARGET_JVM// DUAL_IFACE_CONFLICT
public void Remove (object value)
{
Remove ((PropertyDescriptor) value);
}
#else
void IDictionary.Remove (object value)
{
Remove ((PropertyDescriptor) value);
@ -213,7 +198,6 @@ namespace System.ComponentModel
{
Remove ((PropertyDescriptor) value);
}
#endif
public void RemoveAt (int index)
{
if (readOnly) {
@ -322,30 +306,22 @@ namespace System.ComponentModel
return new PropertyDescriptorCollection (descriptors, true);
}
#if TARGET_JVM //DUAL_IFACE_CONFLICT
public bool IsFixedSize
#else
bool IDictionary.IsFixedSize
{
get {return ((IList)this).IsFixedSize;}
}
bool IList.IsFixedSize
#endif
{
get
{
return readOnly;
}
}
#if TARGET_JVM //DUAL_IFACE_CONFLICT
public bool IsReadOnly
#else
bool IDictionary.IsReadOnly
{
get {return ((IList)this).IsReadOnly;}
}
bool IList.IsReadOnly
#endif
{
get
{

2
mcs/class/System/System.ComponentModel/TypeDescriptor.cs
View File

@ -600,12 +600,10 @@ public sealed class TypeDescriptor
editor = CreateEditor (editorType, componentType);
if (editorType == null || editor == null) {
#if !TARGET_JVM
// Make sure the editorBaseType's static constructor has been called,
// since that's where we're putting the initialization of its editor table.
System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (editorBaseType.TypeHandle);
#endif
if (editors != null)
editor = FindEditorInTable (componentType, editorBaseType, editors [editorBaseType] as Hashtable);
}

9
mcs/class/System/System.ComponentModel/Win32Exception.cs
View File

@ -43,9 +43,6 @@ namespace System.ComponentModel
private int native_error_code;
// [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
#if TARGET_JVM
[MonoNotSupported("")]
#endif
public Win32Exception ()
: base (W32ErrorMessage (Marshal.GetLastWin32Error ()))
{
@ -66,18 +63,12 @@ namespace System.ComponentModel
native_error_code = error;
}
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
#if TARGET_JVM
[MonoNotSupported ("")]
#endif
public Win32Exception (string message)
: base (message)
{
native_error_code = Marshal.GetLastWin32Error ();
}
#if TARGET_JVM
[MonoNotSupported ("")]
#endif
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
public Win32Exception (string message, Exception innerException)
: base (message, innerException)