diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index f724d8bc33f..541f34346fc 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -203,7 +203,6 @@ private void InitializeComponent() this.TraceLoggerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DebuggerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CodeDataLoggerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.MacroToolMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.VirtualPadMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.BasicBotMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator11 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); @@ -1358,7 +1357,6 @@ private void InitializeComponent() this.TraceLoggerMenuItem, this.DebuggerMenuItem, this.CodeDataLoggerMenuItem, - this.MacroToolMenuItem, this.VirtualPadMenuItem, this.BasicBotMenuItem, this.toolStripSeparator11, @@ -1417,11 +1415,6 @@ private void InitializeComponent() this.CodeDataLoggerMenuItem.Text = "Code-Data Logger"; this.CodeDataLoggerMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); // - // MacroToolMenuItem - // - this.MacroToolMenuItem.Text = "&Macro Tool"; - this.MacroToolMenuItem.Click += new System.EventHandler(this.MacroToolMenuItem_Click); - // // VirtualPadMenuItem // this.VirtualPadMenuItem.Text = "Virtual Pad"; @@ -2721,7 +2714,6 @@ private void InitializeComponent() private BizHawk.WinForms.Controls.ToolStripMenuItemEx PSXDiscControlsMenuItem; private BizHawk.WinForms.Controls.StatusLabelEx UpdateNotification; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PSXControllerSettingsMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx MacroToolMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AppleSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AppleDisksSubMenu; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator31; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 1de3ec03ded..6b79c84ebff 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1037,7 +1037,6 @@ private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) BasicBotMenuItem.Enabled = Tools.IsAvailable(); GameSharkConverterMenuItem.Enabled = Tools.IsAvailable(); - MacroToolMenuItem.Enabled = MovieSession.Movie.IsActive() && Tools.IsAvailable(); VirtualPadMenuItem.Enabled = Emulator.ControllerDefinition.Any(); } @@ -1119,11 +1118,6 @@ private void CodeDataLoggerMenuItem_Click(object sender, EventArgs e) Tools.Load(); } - private void MacroToolMenuItem_Click(object sender, EventArgs e) - { - Tools.Load(); - } - private void VirtualPadMenuItem_Click(object sender, EventArgs e) { Tools.Load();