Index: src/Common/DelftTools.Controls.Swf/ExportImageHelper.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/Common/DelftTools.Controls.Swf/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -74,7 +74,8 @@
             {
                 BaseImage = image
             };
-            if (imageResolutionDialog.ShowModal() != DelftDialogResult.OK)
+
+            if (imageResolutionDialog.ShowModal() != DialogResult.OK)
             {
                 return;
             }
Index: src/Common/DelftTools.Controls.Swf/ImageResolutionDialog.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/Common/DelftTools.Controls.Swf/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Controls.Swf/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -6,7 +6,7 @@
 {
     public partial class ImageResolutionDialog : Form, IDialog
     {
-        private DelftDialogResult result;
+        private DialogResult result;
         private bool updatingControls;
 
         private Image baseImage;
@@ -43,14 +43,14 @@
 
         public string Title { get; set; }
 
-        public DelftDialogResult ShowModal()
+        public DialogResult ShowModal()
         {
             if (BaseImage == null)
             {
-                return DelftDialogResult.Cancel;
+                return DialogResult.Cancel;
             }
 
-            result = DelftDialogResult.Cancel;
+            result = DialogResult.Cancel;
 
             UpdateControls();
 
@@ -64,14 +64,9 @@
             return result;
         }
 
-        public DelftDialogResult ShowModal(object owner)
-        {
-            return ShowModal();
-        }
-
         private void OkButtonClicked(object sender, EventArgs e)
         {
-            result = DelftDialogResult.OK;
+            result = DialogResult.OK;
             CloseDialog();
         }
 
Index: src/Common/DelftTools.Controls.Swf/WizardDialog.cs
===================================================================
diff -u -rbc776af502b5d4b5841307ccef86260ebae475c2 -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/Common/DelftTools.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision bc776af502b5d4b5841307ccef86260ebae475c2)
+++ src/Common/DelftTools.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -160,24 +160,15 @@
             Pages.Remove(page);
         }
 
-        public DelftDialogResult ShowModal()
+        public DialogResult ShowModal()
         {
             if (ShowDialog() == DialogResult.OK)
             {
-                return DelftDialogResult.OK;
+                return DialogResult.OK;
             }
-            return DelftDialogResult.Cancel;
+            return DialogResult.Cancel;
         }
 
-        public DelftDialogResult ShowModal(object owner)
-        {
-            if (ShowDialog((IWin32Window) owner) == DialogResult.OK)
-            {
-                return DelftDialogResult.OK;
-            }
-            return DelftDialogResult.Cancel;
-        }
-
         protected bool WelcomePageVisible
         {
             set
Fisheye: Tag dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b refers to a dead (removed) revision in file `src/Common/DelftTools.Controls/DelftDialogResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Controls/DelftTools.Controls.csproj
===================================================================
diff -u -r893e87bb682400420fd124ca200c511c44f363e5 -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/Common/DelftTools.Controls/DelftTools.Controls.csproj	(.../DelftTools.Controls.csproj)	(revision 893e87bb682400420fd124ca200c511c44f363e5)
+++ src/Common/DelftTools.Controls/DelftTools.Controls.csproj	(.../DelftTools.Controls.csproj)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -75,7 +75,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Command.cs" />
-    <Compile Include="DelftDialogResult.cs" />
     <Compile Include="DragOperations.cs" />
     <Compile Include="ICanvasEditor.cs" />
     <Compile Include="ICommand.cs" />
Index: src/Common/DelftTools.Controls/IDialog.cs
===================================================================
diff -u -r341078d82fcf9051b233068ad0172940aa71cff5 -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/Common/DelftTools.Controls/IDialog.cs	(.../IDialog.cs)	(revision 341078d82fcf9051b233068ad0172940aa71cff5)
+++ src/Common/DelftTools.Controls/IDialog.cs	(.../IDialog.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -1,8 +1,9 @@
-namespace DelftTools.Controls
+using System.Windows.Forms;
+
+namespace DelftTools.Controls
 {
-    //using own dialog result because don't want to reference windows.forms
     public interface IDialog
     {
-        DelftDialogResult ShowModal();
+        DialogResult ShowModal();
     }
 }
\ No newline at end of file
Index: src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs
===================================================================
diff -u -rfe0228504fc61d6af56be4c0f6a8fc28690f9064 -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
+++ src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -51,7 +51,7 @@
 
             if (view != null)
             {
-                if (view.ShowModal() == DelftDialogResult.OK)
+                if (view.ShowModal() == DialogResult.OK)
                 {
                     if (view is IConfigureDialog)
                     {
Index: src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs
===================================================================
diff -u -r6b36acf96bf8747d721d8592dcfcf95f0a0308e5 -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b
--- src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 6b36acf96bf8747d721d8592dcfcf95f0a0308e5)
+++ src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b)
@@ -186,7 +186,7 @@
                     return;
                 }
 
-                if (importerDialog.ShowModal() != DelftDialogResult.OK)
+                if (importerDialog.ShowModal() != DialogResult.OK)
                 {
                     return;
                 }