From da8420bb5e7a29f4fc2aa9cfdb884915fe003362 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 5 Dec 2022 10:46:49 -0800 Subject: [PATCH] improving closing logic --- MatterControlLib/RootSystemWindow.cs | 2 +- MatterControlLib/SetupWizard/StagedSetupWindow.cs | 4 ++-- Submodules/agg-sharp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/RootSystemWindow.cs b/MatterControlLib/RootSystemWindow.cs index ec7718707..f0f4005dd 100644 --- a/MatterControlLib/RootSystemWindow.cs +++ b/MatterControlLib/RootSystemWindow.cs @@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl // msGraph.Draw(MatterHackers.Agg.Transform.Affine.NewIdentity(), graphics2D); } - public override void OnClosing(ClosingEventArgs eventArgs) + public override void OnShouldClose(ShouldCloseEventArgs eventArgs) { if (this.HasBeenClosed) { diff --git a/MatterControlLib/SetupWizard/StagedSetupWindow.cs b/MatterControlLib/SetupWizard/StagedSetupWindow.cs index 2d675fd5d..dd524128b 100644 --- a/MatterControlLib/SetupWizard/StagedSetupWindow.cs +++ b/MatterControlLib/SetupWizard/StagedSetupWindow.cs @@ -159,7 +159,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosing(ClosingEventArgs eventArgs) + public override void OnShouldClose(ShouldCloseEventArgs eventArgs) { if (this.ActiveStage != null && !closeConfirmed) @@ -174,7 +174,7 @@ namespace MatterHackers.MatterControl }); } - base.OnClosing(eventArgs); + base.OnShouldClose(eventArgs); } private void ConditionalAbort(string message, Action exitConfirmedAction) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index bd8fded90..5ea0c5dcc 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit bd8fded90fb758b6b80817cf2e966ee2f058e5ac +Subproject commit 5ea0c5dcc6ec4d87de9474f70bca3a7afe275f96