Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -rd9aa9bb832f858854e0b94b1eb86bc91358d8ea0 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision d9aa9bb832f858854e0b94b1eb86bc91358d8ea0)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -194,7 +194,6 @@
     <Compile Include="FindAndReplaceControl.Designer.cs">
       <DependentUpon>FindAndReplaceControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="MessageBox.cs" />
     <Compile Include="Table\Editors\ComboBoxTypeEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
Fisheye: Tag e1eca7dab59f9465ca9d0bd6d705490528a5e5a8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/MessageBox.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs
===================================================================
diff -u -rd1e069321cba9d3b92f873fdd18e393a20659542 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs	(.../SelectItemDialog.cs)	(revision d1e069321cba9d3b92f873fdd18e393a20659542)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs	(.../SelectItemDialog.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -4,10 +4,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Swf;
 using Core.Common.Gui.Properties;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
-//using System.Windows.Forms;
-
 namespace Core.Common.Gui.Forms
 {
     public partial class SelectItemDialog : Form
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -20,7 +20,6 @@
 using log4net;
 using log4net.Appender;
 using MainWindow = Core.Common.Gui.Forms.MainWindow.MainWindow;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/GuiExportHandler.cs
===================================================================
diff -u -r5d3ef5d4a5042e908c036a1565793c1141b60a09 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 5d3ef5d4a5042e908c036a1565793c1141b60a09)
+++ Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -8,7 +8,6 @@
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Properties;
 using log4net;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj
===================================================================
diff -u -r482a3c997bd68b3b524639518cb488335caf02e8 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj	(.../Core.Common.Controls.Swf.Test.csproj)	(revision 482a3c997bd68b3b524639518cb488335caf02e8)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Core.Common.Controls.Swf.Test.csproj	(.../Core.Common.Controls.Swf.Test.csproj)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -83,7 +83,6 @@
     <Compile Include="Charting\Series\TeeChartSeriesDecoratorTest.cs" />
     <Compile Include="FileSystemTreeViewTest.cs" />
     <Compile Include="FindAndReplaceControlTest.cs" />
-    <Compile Include="MessageBoxTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Table\TableViewCopyPasteTest.cs" />
     <Compile Include="Table\TableViewPasteControllerTest.cs" />
Fisheye: Tag e1eca7dab59f9465ca9d0bd6d705490528a5e5a8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Swf.Test/MessageBoxTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r482a3c997bd68b3b524639518cb488335caf02e8 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 482a3c997bd68b3b524639518cb488335caf02e8)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -354,7 +354,6 @@
                     treeView.ExpandAll();
 
                     treeView.SelectedNode = treeView.GetNodeByTag(grandchild);
-                    MessageBox.CustomMessageBox = new MessageBoxAlwaysYes();
                     treeView.TryDeleteSelectedNodeData();
 
                     treeView.ExpandAll();
@@ -434,14 +433,6 @@
             TestHelper.AssertIsFasterThan(10, () => Thread.Sleep((int) elapsedMillisecondsWithTreeView));
         }
 
-        private class MessageBoxAlwaysYes : IMessageBox
-        {
-            public DialogResult Show(string text, string caption, MessageBoxButtons buttons)
-            {
-                return DialogResult.OK;
-            }
-        }
-
         private class DynamicParentNodePresenter : TreeViewNodePresenterBase<Parent>
         {
             public override void UpdateNode(ITreeNode parentNode, ITreeNode node, Parent nodeData)
Index: Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -4,9 +4,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Windows.Threading;
-using Core.Common.Controls.Swf;
 using log4net;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Common.TestUtils
 {
@@ -31,8 +29,6 @@
 
         static GuiTestHelper()
         {
-            MessageBox.CustomMessageBox = new LoggingMessageBox();
-
             Control.CheckForIllegalCrossThreadCalls = true;
             Application.EnableVisualStyles();
 
@@ -95,7 +91,6 @@
             exception = null;
             unhandledThreadExceptionOccured = false;
             appDomainExceptionOccured = false;
-            MessageBox.CustomMessageBox = new LoggingMessageBox();
         }
 
         private static void CurrentDispatcher_UnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -142,21 +137,6 @@
             log.Error("Windows.Forms exception occured: " + e.Exception.Message, e.Exception);
         }
 
-        public class LoggingMessageBox : IMessageBox
-        {
-            public DialogResult Show(string text, string caption, MessageBoxButtons buttons)
-            {
-                Console.WriteLine(@"MessageBox: {0}. {1}",caption,text);
-
-                if (buttons == MessageBoxButtons.YesNoCancel || buttons == MessageBoxButtons.YesNo)
-                {
-                    return DialogResult.No;
-                }
-
-                return DialogResult.None;
-            }
-        }
-
         /// <summary>
         /// Defines unhandled exception which provides stack trace of inner exception as its stack trace.
         /// </summary>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -7,7 +7,6 @@
 using Core.GIS.SharpMap.Map;
 using Core.Plugins.SharpMapGis.Gui.Properties;
 using log4net;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
 {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs	(.../MapProperties.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs	(.../MapProperties.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -9,7 +9,6 @@
 using Core.GIS.SharpMap.UI.Forms;
 using Core.Plugins.SharpMapGis.Gui.Properties;
 using log4net;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms.GridProperties
 {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs	(.../VectorLayerPolygonProperties.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs	(.../VectorLayerPolygonProperties.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -10,7 +10,6 @@
 using Core.GIS.SharpMap.Styles;
 using Core.GIS.SharpMap.UI.Forms;
 using Core.Plugins.SharpMapGis.Gui.Properties;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms.GridProperties
 {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
@@ -17,7 +17,6 @@
 using Core.Plugins.SharpMapGis.Gui.Commands;
 using Core.Plugins.SharpMapGis.Gui.Properties;
 using log4net;
-using MessageBox = Core.Common.Controls.Swf.MessageBox;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView
 {