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

@ -554,19 +554,19 @@ namespace System.Windows.Forms.Design
#region Parenting
protected void HookChildControls (Control firstControl)
protected void HookChildControls (Control firstChild)
{
if (firstControl != null) {
foreach (Control control in firstControl.Controls) {
if (firstChild != null) {
foreach (Control control in firstChild.Controls) {
control.WindowTarget = (IWindowTarget) new WndProcRouter (control, (IMessageReceiver) this);
}
}
}
protected void UnhookChildControls (Control firstControl)
protected void UnhookChildControls (Control firstChild)
{
if (firstControl != null) {
foreach (Control control in firstControl.Controls) {
if (firstChild != null) {
foreach (Control control in firstChild.Controls) {
if (control.WindowTarget is WndProcRouter)
((WndProcRouter) control.WindowTarget).Dispose ();
}
@ -662,11 +662,11 @@ namespace System.Windows.Forms.Design
e.UseDefaultCursors = false;
}
protected virtual void OnDragDrop (DragEventArgs e)
protected virtual void OnDragDrop (DragEventArgs de)
{
}
protected virtual void OnDragEnter (DragEventArgs e)
protected virtual void OnDragEnter (DragEventArgs de)
{
}
@ -674,7 +674,7 @@ namespace System.Windows.Forms.Design
{
}
protected virtual void OnDragOver (DragEventArgs e)
protected virtual void OnDragOver (DragEventArgs de)
{
}
#endregion