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

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Drawing/System.Drawing/BitmapSuffixInSameAssemblyAttribute.cs
View File

@@ -38,11 +38,5 @@ namespace System.Drawing
: base ()
{
}
public virtual object TypeId {
get {
throw new NotImplementedException ();
}
}
}
}

6
mcs/class/System.Drawing/System.Drawing/BitmapSuffixInSatelliteAssemblyAttribute.cs
View File

@@ -38,11 +38,5 @@ namespace System.Drawing
: base ()
{
}
public virtual object TypeId {
get {
throw new NotImplementedException ();
}
}
}
}

2
mcs/class/System.Drawing/System.Drawing/Color.cs
View File

@@ -38,7 +38,7 @@ using System.Runtime.InteropServices;
namespace System.Drawing
{
#if !MONOTOUCH && !MONOMAC
#if !MONOTOUCH && !MONOMAC && FEATURE_TYPECONVERTER
[TypeConverter(typeof(ColorConverter))]
[Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
#endif

2
mcs/class/System.Drawing/System.Drawing/KnownColors.cs
View File

@@ -210,7 +210,7 @@ namespace System.Drawing {
0xFF316AC5, /* 174 - MenuHighlight */
};
#if !MONOTOUCH && !MONOMAC
#if !MONOTOUCH && !MONOMAC && SUPPORTS_WINDOWS_COLORS
static KnownColors ()
{
if (GDIPlus.RunningOnWindows ()) {