From 9c7dac0aa3fb7aff570624813cc725ee97932d6f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 20 Dec 2013 22:55:50 +0000
Subject: [PATCH] rip out VS menu items, we don't support that stuff anymore

---
 BizHawk.Client.EmuHawk/MainForm.Designer.cs | 34 ++-------------------
 BizHawk.Client.EmuHawk/MainForm.Events.cs   | 29 ------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 731d89fc0a..782d9f2cfc 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -225,9 +225,6 @@
 			this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.VSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.VSCoin1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.VSCoin2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
@@ -1965,8 +1962,7 @@
             this.toolStripSeparator17,
             this.NESGraphicSettingsMenuItem,
             this.NESSoundChannelsMenuItem,
-            this.FDSControlsMenuItem,
-            this.VSControlsMenuItem});
+            this.FDSControlsMenuItem});
 			this.NESSubMenu.Name = "NESSubMenu";
 			this.NESSubMenu.Size = new System.Drawing.Size(40, 19);
 			this.NESSubMenu.Text = "&NES";
@@ -2032,33 +2028,10 @@
 			// FdsEjectDiskMenuItem
 			// 
 			this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem";
-			this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(124, 22);
 			this.FdsEjectDiskMenuItem.Text = "&Eject Disk";
 			this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click);
 			// 
-			// VSControlsMenuItem
-			// 
-			this.VSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.VSCoin1MenuItem,
-            this.VSCoin2MenuItem});
-			this.VSControlsMenuItem.Name = "VSControlsMenuItem";
-			this.VSControlsMenuItem.Size = new System.Drawing.Size(233, 22);
-			this.VSControlsMenuItem.Text = "VS Controls";
-			// 
-			// VSCoin1MenuItem
-			// 
-			this.VSCoin1MenuItem.Name = "VSCoin1MenuItem";
-			this.VSCoin1MenuItem.Size = new System.Drawing.Size(152, 22);
-			this.VSCoin1MenuItem.Text = "VS Coin &1";
-			this.VSCoin1MenuItem.Click += new System.EventHandler(this.VSCoin1MenuItem_Click);
-			// 
-			// VSCoin2MenuItem
-			// 
-			this.VSCoin2MenuItem.Name = "VSCoin2MenuItem";
-			this.VSCoin2MenuItem.Size = new System.Drawing.Size(152, 22);
-			this.VSCoin2MenuItem.Text = "VS Coin &2";
-			this.VSCoin2MenuItem.Click += new System.EventHandler(this.VSCoin2MenuItem_Click);
-			// 
 			// PCESubMenu
 			// 
 			this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -3462,9 +3435,6 @@
         private System.Windows.Forms.ToolStripMenuItem Scanlines75MenuItem;
         private System.Windows.Forms.ToolStripMenuItem ScanlinesCustomMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem FdsEjectDiskMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem VSControlsMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem VSCoin1MenuItem;
-		private System.Windows.Forms.ToolStripMenuItem VSCoin2MenuItem;
 	}
 }
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index cd37cfc8bb..d882af9442 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1162,17 +1162,12 @@ namespace BizHawk.Client.EmuHawk
 		private void NESSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
-			VSControlsMenuItem.Enabled = Global.Emulator.BoardName == "VS";
 		}
 
 		private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)
 		{
 			FdsEjectDiskMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
 
-			VSCoin1MenuItem.Enabled =
-				VSCoin2MenuItem.Enabled =
-				Global.Emulator.BoardName == "VS";
-
 			for (int i = 1; i < FDSControlsMenuItem.DropDownItems.Count; i++)
 			{
 				FDSControlsMenuItem.DropDownItems.Remove(FDSControlsMenuItem.DropDownItems[i]);
@@ -1228,30 +1223,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void VSCoin1MenuItem_Click(object sender, EventArgs e)
-		{
-			//if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("FDS Eject"))
-			//{
-			//	if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
-			//	{
-			//		Global.ClickyVirtualPadController.Click(button);
-			//		GlobalWin.OSD.AddMessage(msg);
-			//	}
-			//}
-		}
-
-		private void VSCoin2MenuItem_Click(object sender, EventArgs e)
-		{
-			//if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("FDS Eject"))
-			//{
-			//	if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
-			//	{
-			//		Global.ClickyVirtualPadController.Click(button);
-			//		GlobalWin.OSD.AddMessage(msg);
-			//	}
-			//}
-		}
-
 		#endregion
 
 		#region PCE