diff options
| author | Jeremie Laval <jeremie.laval@gmail.com> | 2013-11-08 05:07:11 +0400 |
|---|---|---|
| committer | Jeremie Laval <jeremie.laval@gmail.com> | 2013-11-08 05:07:11 +0400 |
| commit | d410f30c53b46aac9c2dc6b5eca57af1a2c828c9 (patch) | |
| tree | 56ecff21aae53e99e028ea4f59523696301552ff /Xwt.WPF | |
| parent | 4894929736f80101fd56c31b2b076fa7765d2057 (diff) | |
[Xwt.Wpf] Don't call CloseRequested machinery when a dialog loop is being ended.
Diffstat (limited to 'Xwt.WPF')
| -rw-r--r-- | Xwt.WPF/Xwt.WPFBackend/DialogBackend.cs | 2 | ||||
| -rw-r--r-- | Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Xwt.WPF/Xwt.WPFBackend/DialogBackend.cs b/Xwt.WPF/Xwt.WPFBackend/DialogBackend.cs index 27ffbaed..0068caec 100644 --- a/Xwt.WPF/Xwt.WPFBackend/DialogBackend.cs +++ b/Xwt.WPF/Xwt.WPFBackend/DialogBackend.cs @@ -126,7 +126,9 @@ namespace Xwt.WPFBackend public void EndLoop () { + InhibitCloseRequested = true; Window.Close(); + InhibitCloseRequested = false; } private readonly ItemsControl buttonContainer = new ItemsControl(); diff --git a/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs b/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs index f8a32875..e3c4a8d6 100644 --- a/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs +++ b/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs @@ -302,8 +302,12 @@ namespace Xwt.WPFBackend }
}
+ protected bool InhibitCloseRequested { get; set; }
+
private void ClosingHandler (object sender, System.ComponentModel.CancelEventArgs e)
{
+ if (InhibitCloseRequested)
+ return;
Context.InvokeUserCode (delegate ()
{
e.Cancel = !eventSink.OnCloseRequested ();
|