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

@ -494,9 +494,9 @@ namespace System.Windows.Forms.Design
// component - The IComponent to ensure has a context menu service.
// XXX: Not sure exactly what this should do...
//
protected virtual void EnsureMenuEditorService (IComponent component)
protected virtual void EnsureMenuEditorService (IComponent c)
{
if (this.menuEditorService == null && component is ContextMenu)
if (this.menuEditorService == null && c is ContextMenu)
menuEditorService = (IMenuEditorService) GetService (typeof (IMenuEditorService));
}
#endregion