Merge pull request picoe#863 from SlowLogicBoy/develop

Make Wpf DialogHandler more extendable
mcneel · Aug 30, 2017 · bfc601a · bfc601a
2 parents 11fcc61 + 158a3cb
commit bfc601a
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Source/Eto.Wpf/Forms/DialogHandler.cs b/Source/Eto.Wpf/Forms/DialogHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Eto.Forms;
 using sw = System.Windows;
 using swc = System.Windows.Controls;
@@ -15,22 +15,24 @@ public class DialogHandler : WpfWindow<sw.Window, Dialog, Dialog.ICallback>, Dia
         swc.DockPanel dockMain;
         swc.Grid gridButtons;
 
-		public DialogHandler()
+		public DialogHandler() : this(new sw.Window()) { }
+
+		public DialogHandler(sw.Window window)
 		{
-			Control = new sw.Window();
+			Control = window;
 			Control.ShowInTaskbar = false;
 			Resizable = false;
 			Minimizable = false;
 			Maximizable = false;
 			Control.PreviewKeyDown += Control_PreviewKeyDown;
 
-            dockMain = new swc.DockPanel();
+			dockMain = new swc.DockPanel();
 
-            gridButtons = new swc.Grid();
-            gridButtons.RowDefinitions.Add(new swc.RowDefinition());
-            gridButtons.Visibility = System.Windows.Visibility.Hidden;
-            gridButtons.Margin = new sw.Thickness();
-        }
+			gridButtons = new swc.Grid();
+			gridButtons.RowDefinitions.Add(new swc.RowDefinition());
+			gridButtons.Visibility = System.Windows.Visibility.Hidden;
+			gridButtons.Margin = new sw.Thickness();
+		}
 
         public override void SetContainerContent(sw.FrameworkElement content)
         {