Merge branch 'close-window-fixes'

Conflicts:
	Testing/GtkTestRunner.csproj
	Testing/WpfTestRunner.csproj

2 files changed, 30 insertions, 11 deletions

diff --git a/Xwt.Gtk/Xwt.GtkBackend/DialogBackend.cs b/Xwt.Gtk/Xwt.GtkBackend/DialogBackend.cs
index 6f744817..c6a0af1e 100644
--- a/Xwt.Gtk/Xwt.GtkBackend/DialogBackend.cs
+++ b/Xwt.Gtk/Xwt.GtkBackend/DialogBackend.cs
@@ -121,8 +121,6 @@ namespace Xwt.GtkBackend
 			UpdateButton (btn, buttons[i]);
 		}
 
-		bool endLoopRequested;
-
 		public void RunLoop (IWindowFrameBackend parent)
 		{
 			// GTK adds a border to the root widget, for some unknown reason
@@ -133,21 +131,26 @@ namespace Xwt.GtkBackend
 			do {
 				var res = MessageService.RunCustomDialog (Window, p != null ? p.Window : null);
 				keepRunning = false;
-				endLoopRequested = false;
 				if (res == (int) Gtk.ResponseType.DeleteEvent) {
-					ApplicationContext.InvokeUserCode(delegate {
-						keepRunning = !EventSink.OnCloseRequested ();
-					});
+					keepRunning = !PerformClose (false);
 				}
-			} while (keepRunning && !endLoopRequested);
+			} while (keepRunning);
 		}
 
 		public void EndLoop ()
 		{
-			endLoopRequested = true;
 			Window.Respond (Gtk.ResponseType.Ok);
 		}
 
+		public override bool Close ()
+		{
+			if (PerformClose (false)) {
+				Window.Respond (Gtk.ResponseType.Ok);
+				return true;
+			} else
+				return false;
+		}
+
 		public override void GetMetrics (out Size minSize, out Size decorationSize)
 		{
 			base.GetMetrics (out minSize, out decorationSize);
diff --git a/Xwt.Gtk/Xwt.GtkBackend/WindowFrameBackend.cs b/Xwt.Gtk/Xwt.GtkBackend/WindowFrameBackend.cs
index 1d5a6b65..91bbd77e 100644
--- a/Xwt.Gtk/Xwt.GtkBackend/WindowFrameBackend.cs
+++ b/Xwt.Gtk/Xwt.GtkBackend/WindowFrameBackend.cs
@@ -246,6 +246,7 @@ namespace Xwt.GtkBackend
 				case WindowFrameEvent.BoundsChanged:
 					Window.AddEvents ((int)Gdk.EventMask.StructureMask);
 					Window.ConfigureEvent += HandleConfigureEvent; break;
+				case WindowFrameEvent.Closed:
 				case WindowFrameEvent.CloseRequested:
 					Window.DeleteEvent += HandleCloseRequested; break;
 				case WindowFrameEvent.Shown:
@@ -262,8 +263,6 @@ namespace Xwt.GtkBackend
 				switch ((WindowFrameEvent)ev) {
 				case WindowFrameEvent.BoundsChanged:
 					Window.ConfigureEvent -= HandleConfigureEvent; break;
-				case WindowFrameEvent.CloseRequested:
-					Window.DeleteEvent -= HandleCloseRequested; break;
 				case WindowFrameEvent.Shown:
 					Window.Shown -= HandleShown; break;
 				case WindowFrameEvent.Hidden:
@@ -296,9 +295,21 @@ namespace Xwt.GtkBackend
 
 		void HandleCloseRequested (object o, Gtk.DeleteEventArgs args)
 		{
+			args.RetVal = !PerformClose (true);
+		}
+
+		internal bool PerformClose (bool userClose)
+		{
+			bool close = false;
 			ApplicationContext.InvokeUserCode(delegate {
-				args.RetVal = !EventSink.OnCloseRequested ();
+				close = EventSink.OnCloseRequested ();
 			});
+			if (close) {
+				if (!userClose)
+					Window.Hide ();
+				ApplicationContext.InvokeUserCode(EventSink.OnClosed);
+			}
+			return close;
 		}
 
 		public void Present ()
@@ -308,6 +319,11 @@ namespace Xwt.GtkBackend
 			Window.Present ();
 		}
 
+		public virtual bool Close ()
+		{
+			return PerformClose (false);
+		}
+
 		public virtual void GetMetrics (out Size minSize, out Size decorationSize)
 		{
 			minSize = decorationSize = Size.Zero;