From 626efe8cafe1fbe7f5f1fade9c60ae06a11fc048 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 3 Feb 2020 12:54:32 -0600 Subject: [PATCH] put control extension methods into the EmuHawk names space isntead of a custom one. We want these to be found and used, and most dialogs use them --- BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs | 2 -- BizHawk.Client.EmuHawk/AVOut/JMDForm.cs | 1 - .../CustomControls/InputRoll/InputRoll.Drawing.cs | 1 - BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs | 2 +- BizHawk.Client.EmuHawk/LogWindow.cs | 1 - BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 -- BizHawk.Client.EmuHawk/MainForm.cs | 1 - BizHawk.Client.EmuHawk/config/ControllerConfig.cs | 1 - BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs | 1 - BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs | 2 -- BizHawk.Client.EmuHawk/config/GB/BmpView.cs | 1 - BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs | 1 - BizHawk.Client.EmuHawk/config/MessageConfig.cs | 1 - .../config/N64/N64VideoPluginconfig.cs | 1 - BizHawk.Client.EmuHawk/config/PathConfig.cs | 1 - .../config/SNES/SNESControllerConfig.cs | 1 - BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 1 - BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 2 -- BizHawk.Client.EmuHawk/tools/BatchRun.cs | 2 -- BizHawk.Client.EmuHawk/tools/CDL.cs | 1 - BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 1 - .../tools/Debugger/BreakpointControl.cs | 1 - BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs | 1 - BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs | 9 +++------ BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 1 - BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 1 - BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs | 1 - .../tools/MultiDiskBundler/MultiDiskBundler.cs | 1 - .../tools/MultiDiskBundler/MultiDiskFileSelector.cs | 1 - BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs | 1 - BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs | 1 - BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs | 1 - BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs | 1 - .../tools/SNES/SNESGraphicsDebugger.cs | 1 - .../tools/TAStudio/BookmarksBranchesBox.cs | 1 - BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs | 1 - .../tools/TAStudio/TAStudio.MenuItems.cs | 1 - BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 2 -- BizHawk.Client.EmuHawk/tools/ToolFormBase.cs | 1 - BizHawk.Client.EmuHawk/tools/TraceLogger.cs | 1 - BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 1 - BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 1 - 42 files changed, 4 insertions(+), 53 deletions(-) diff --git a/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs b/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs index 9bbd551f35..d37735dc3c 100644 --- a/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs +++ b/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs @@ -1,8 +1,6 @@ using System; using System.Windows.Forms; - using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs b/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs index 7183e98a91..1a0d961044 100644 --- a/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs +++ b/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs @@ -1,6 +1,5 @@ using System; using System.Windows.Forms; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs index 1abbe28674..183280d4d2 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 4214c34d4f..307dc33f44 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Common.ReflectionExtensions; -namespace BizHawk.Client.EmuHawk.WinFormExtensions +namespace BizHawk.Client.EmuHawk { public static class ControlExtensions { diff --git a/BizHawk.Client.EmuHawk/LogWindow.cs b/BizHawk.Client.EmuHawk/LogWindow.cs index cabeec6c97..272aa0c40d 100644 --- a/BizHawk.Client.EmuHawk/LogWindow.cs +++ b/BizHawk.Client.EmuHawk/LogWindow.cs @@ -8,7 +8,6 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; // todo - perks - pause, copy to clipboard, backlog length limiting diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index c7f0477e07..5450465d20 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -12,12 +12,10 @@ using BizHawk.Emulation.Cores.Nintendo.SubNESHawk; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.PCEngine; -using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Emulation.Cores.Computers.AppleII; using BizHawk.Client.ApiHawk; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 45e98115f5..2ddb21d14c 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -26,7 +26,6 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.GBHawkLink; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.CoreExtensions; using BizHawk.Client.ApiHawk; diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 9efcf1df1c..92adc48586 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -8,7 +8,6 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index e6d775fab5..b34524398a 100644 --- a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -10,7 +10,6 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; using BizHawk.Emulation.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; // notes: eventually, we intend to have a "firmware acquisition interface" exposed to the emulator cores. // it will be implemented by EmuHawk, and use firmware keys to fetch the firmware content. diff --git a/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs index c2fa44ebf5..01931d6823 100644 --- a/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs +++ b/BizHawk.Client.EmuHawk/config/FirmwaresConfigInfo.cs @@ -1,8 +1,6 @@ using System; using System.Windows.Forms; -using BizHawk.Client.EmuHawk.WinFormExtensions; - // todo - display details on the current resolution status // todo - check(mark) the one thats selected // todo - turn top info into textboxes i guess, labels suck diff --git a/BizHawk.Client.EmuHawk/config/GB/BmpView.cs b/BizHawk.Client.EmuHawk/config/GB/BmpView.cs index 5eac75d0ee..9adb98c73b 100644 --- a/BizHawk.Client.EmuHawk/config/GB/BmpView.cs +++ b/BizHawk.Client.EmuHawk/config/GB/BmpView.cs @@ -7,7 +7,6 @@ using System.Drawing; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs index deb87f5c15..0b34b1a967 100644 --- a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs +++ b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs @@ -5,7 +5,6 @@ using System.Windows.Forms; using System.IO; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Cores.Nintendo.Gameboy; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/config/MessageConfig.cs b/BizHawk.Client.EmuHawk/config/MessageConfig.cs index 53f1119c76..3f74affeaa 100644 --- a/BizHawk.Client.EmuHawk/config/MessageConfig.cs +++ b/BizHawk.Client.EmuHawk/config/MessageConfig.cs @@ -3,7 +3,6 @@ using System.Drawing; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs index 0803978ce4..08c4a7f9a5 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs @@ -5,7 +5,6 @@ using BizHawk.Common.StringExtensions; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs index 9e3309ceb6..deff82e7c3 100644 --- a/BizHawk.Client.EmuHawk/config/PathConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PathConfig.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs b/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs index 6e7dbd8aff..650f2bfae4 100644 --- a/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/SNES/SNESControllerConfig.cs @@ -2,7 +2,6 @@ using System.Windows.Forms; using BizHawk.Emulation.Cores.Nintendo.SNES; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index 5ada65c815..4975530ed5 100644 --- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -9,7 +9,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 31bcbb20e6..f49ce72478 100644 --- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -8,8 +8,6 @@ using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.Common.MovieConversionExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; - namespace BizHawk.Client.EmuHawk { // TODO - Allow relative paths in record TextBox diff --git a/BizHawk.Client.EmuHawk/tools/BatchRun.cs b/BizHawk.Client.EmuHawk/tools/BatchRun.cs index 038256141d..c9ca3c4ce4 100644 --- a/BizHawk.Client.EmuHawk/tools/BatchRun.cs +++ b/BizHawk.Client.EmuHawk/tools/BatchRun.cs @@ -4,8 +4,6 @@ using System.Windows.Forms; using System.Threading; using System.IO; -using BizHawk.Client.EmuHawk.WinFormExtensions; - namespace BizHawk.Client.EmuHawk { public partial class BatchRun : Form diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs index a1bc552e74..4144ced342 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -6,7 +6,6 @@ using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; //TODO - select which memorydomains go out to the CDL file. will this cause a problem when re-importing it? //perhaps missing domains shouldnt fail a check diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 48175e433b..4bf293b773 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -9,7 +9,6 @@ using System.Windows.Forms; using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs index 3f972e2845..980879d7d3 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs @@ -6,7 +6,6 @@ using System.Windows.Forms; using BizHawk.Common.NumberExtensions; using BizHawk.Emulation.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index ba42eb3e96..2fbeb47aec 100644 --- a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -6,7 +6,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common.NumberExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy; using BizHawk.Common; diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs index df0499f3e3..b52d5bf657 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexColor.cs @@ -1,9 +1,6 @@ using System; using System.Windows.Forms; -using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; - namespace BizHawk.Client.EmuHawk { public partial class HexColorsForm : Form @@ -28,7 +25,7 @@ namespace BizHawk.Client.EmuHawk private void HexBackground_Click(object sender, MouseEventArgs e) { - if (colorDialog1.ShowDialog() == DialogResult.OK) + if (colorDialog1.ShowDialog().IsOk()) { _hexEditor.Colors.Background = colorDialog1.Color; _hexEditor.Header.BackColor = colorDialog1.Color; @@ -39,7 +36,7 @@ namespace BizHawk.Client.EmuHawk private void HexForeground_Click(object sender, MouseEventArgs e) { - if (colorDialog1.ShowDialog() == DialogResult.OK) + if (colorDialog1.ShowDialog().IsOk()) { _hexEditor.Colors.Foreground = colorDialog1.Color; _hexEditor.Header.ForeColor = colorDialog1.Color; @@ -50,7 +47,7 @@ namespace BizHawk.Client.EmuHawk private void HexMenuBar_Click(object sender, MouseEventArgs e) { - if (colorDialog1.ShowDialog() == DialogResult.OK) + if (colorDialog1.ShowDialog().IsOk()) { _hexEditor.Colors.MenuBar = colorDialog1.Color; _hexEditor.HexMenuStrip.BackColor = _hexEditor.Colors.MenuBar; diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 6bc3e31ea9..68c7f3139b 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -15,7 +15,6 @@ using BizHawk.Common.IOExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 2603869466..487063f65d 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -10,7 +10,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Common; using BizHawk.Emulation.Common; diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index 0b3424f541..1068b92ca7 100644 --- a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -5,7 +5,6 @@ using System.IO; using BizHawk.Emulation.Common; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs index c42f7a0a4e..18f83328a7 100644 --- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs +++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs @@ -9,7 +9,6 @@ using System.Xml.Linq; using BizHawk.Emulation.Common; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs index 3851a59303..3c43770879 100644 --- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs +++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs @@ -3,7 +3,6 @@ using System.Windows.Forms; using BizHawk.Common; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using System.IO; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs index 1ca7e0eb4f..77737b2779 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs @@ -4,7 +4,6 @@ using System.IO; using System.Drawing.Imaging; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs index b527785d53..bca3623644 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs @@ -4,7 +4,6 @@ using System.IO; using System.Drawing.Imaging; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs index 7ff09e6f63..a37f2fa3cf 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/PatternViewer.cs @@ -4,7 +4,6 @@ using System.IO; using System.Drawing.Imaging; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs index 95f6ceda64..ba50de9063 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs @@ -4,7 +4,6 @@ using System.IO; using System.Drawing.Imaging; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs index b2a4b9fd2b..f94440cb41 100644 --- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs @@ -30,7 +30,6 @@ using System.Drawing.Imaging; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Common; using BizHawk.Common; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 6290675a95..6d1fd21ff4 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 7142a2bec8..739b27c6eb 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 2bad74b9d8..3bc86e3f55 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -7,7 +7,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Client.Common.MovieConversionExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 13bfdb67cf..01024f97f0 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -11,8 +11,6 @@ using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; using BizHawk.Client.Common.MovieConversionExtensions; - -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs b/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs index 26b05d9800..0edb3c1e0c 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs @@ -5,7 +5,6 @@ using System.Windows.Forms; using BizHawk.Emulation.Common; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using System.Drawing; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index 955f1213c9..c4b7ab01e6 100644 --- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -8,7 +8,6 @@ using System.Windows.Forms; using BizHawk.Emulation.Common; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 197376f42d..89c4f5626c 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -15,7 +15,6 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index fa58151023..f83d47fc53 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -11,7 +11,6 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.ToolExtensions; namespace BizHawk.Client.EmuHawk