Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -272,12 +272,7 @@ namespace System.Windows.Forms
{
public int Compare (DataGridViewColumn o1, DataGridViewColumn o2)
{
if (o1.DisplayIndex == o2.DisplayIndex)
// Here we avoid the equal value swapping that both Array.Sort and ArrayList.Sort
// do occasionally and preserve the user column insertation order.
return 1;
else
return o1.DisplayIndex - o2.DisplayIndex;
return o1.DisplayIndex.CompareTo (o2.DisplayIndex);
}
}
}

View File

@@ -203,7 +203,7 @@ namespace System.Windows.Forms
set;
}
[Bindable(BindableSupport.Yes)]
[Bindable(true)]
[Browsable(false)]
[DefaultValue(null)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]

View File

@@ -397,13 +397,13 @@ namespace System.Windows.Forms
internal class GnomeUtil
{
const string libgdk = "libgdk-x11-2.0.so.0";
const string libgdk_pixbuf = "libgdk_pixbuf-2.0.so.0";
const string libgtk = "libgtk-x11-2.0.so.0";
const string libglib = "libglib-2.0.so.0";
const string libgobject = "libgobject-2.0.so.0";
const string libgnomeui = "libgnomeui-2.so.0";
const string librsvg = "librsvg-2.so.2";
const string libgdk = "libgdk-x11-2.0";
const string libgdk_pixbuf = "libgdk_pixbuf-2.0";
const string libgtk = "libgtk-x11-2.0";
const string libglib = "libglib-2.0";
const string libgobject = "libgobject-2.0";
const string libgnomeui = "libgnomeui-2";
const string librsvg = "librsvg-2";
[DllImport(librsvg)]
static extern IntPtr rsvg_pixbuf_from_file_at_size (string file_name, int width, int height, out IntPtr error);

View File

@@ -267,8 +267,8 @@ namespace System.Windows.Forms {
#endregion // Methods
#region DllImports
const string libgdk = "libgdk-x11-2.0.so.0";
const string libgtk = "libgtk-x11-2.0.so.0";
const string libgdk = "libgdk-x11-2.0";
const string libgtk = "libgtk-x11-2.0";
[DllImport(libgtk)]
static extern bool gtk_init_check (IntPtr argc, IntPtr argv);

View File

@@ -1 +1 @@
90fe714b33d6e36c80b597f874c38c872448622d
8f9f1ed0e75a17d71ec08c03c058744f3bc0830c