[SWF] Method OnClosed should pass FormClosedEventArgs type, instead o…

…f EventArgs.Empty (mono#13283) Fixes mono#13282
madewokherd · Mar 4, 2019 · 89f264a · 89f264a
1 parent 1da9c0f
commit 89f264a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Form.cs
@@ -157,8 +157,9 @@ internal bool FireClosingEvents (CloseReason reason, bool cancel)
 		// Convenience method for fire BOTH OnClosed and OnFormClosed events
 		private void FireClosedEvents (CloseReason reason)
 		{
-			this.OnClosed (EventArgs.Empty);
-			this.OnFormClosed (new FormClosedEventArgs (reason));
+			FormClosedEventArgs fc = new FormClosedEventArgs(reason);
+			this.OnClosed (fc);
+			this.OnFormClosed (fc);
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Advanced)]

diff --git a/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs b/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs
@@ -260,6 +260,7 @@ void ChildForm_Closing (object sender, CancelEventArgs e)
 
 				void ChildForm_Closed (object sender, EventArgs e)
 				{
+					Assert.IsNotNull ((FormClosedEventArgs)e, "FormClosedEventArgs");
 					Assert.IsNotNull (MdiParent, "ChildForm_Closed");
 				}