ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a few more itoolform cleanups

This commit is contained in:
goyuken 2014-12-15 18:13:54 +00:00
parent 2ac897c643
commit 08d09bc64f
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class LuaConsole : Form, IToolForm public partial class LuaConsole : Form, IToolForm
{ {
public IDictionary<Type, object> EmulatorServices { private get; set; }
private readonly LuaFileList _luaList; private readonly LuaFileList _luaList;
private int _defaultWidth; private int _defaultWidth;
private int _defaultHeight; private int _defaultHeight;

7
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
View File

@ -8,9 +8,10 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class TAStudio : IToolForm public partial class TAStudio : IToolForm
{ {
public IDictionary<Type, object> EmulatorServices { private get; set; } [RequiredService]
public IEmulator Emulator { get { return (IEmulator)EmulatorServices[typeof(IEmulator)]; } } public IEmulator Emulator { get; private set; }
public IStatable StatableEmulator { get { return (IStatable)EmulatorServices[typeof(IStatable)]; } } [RequiredService]
public IStatable StatableEmulator { get; private set; }
private bool _hackyDontUpdate; private bool _hackyDontUpdate;
private bool _initializing; // If true, will bypass restart logic, this is necessary since loading projects causes a movie to load which causes a rom to reload causing dialogs to restart private bool _initializing; // If true, will bypass restart logic, this is necessary since loading projects causes a movie to load which causes a rom to reload causing dialogs to restart

2
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class ToolBox : Form, IToolForm public partial class ToolBox : Form, IToolForm
{ {
public IDictionary<Type, object> EmulatorServices { private get; set; }
public ToolBox() public ToolBox()
{ {
InitializeComponent(); InitializeComponent();

2
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
View File

@ -16,8 +16,6 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class TraceLogger : Form, IToolForm public partial class TraceLogger : Form, IToolForm
{ {
public IDictionary<Type, object> EmulatorServices { private get; set; }
[RequiredService] [RequiredService]
private IDebuggable _debugtarget { get; set; } private IDebuggable _debugtarget { get; set; }
private ITracer Tracer { get { return _debugtarget.Tracer; } } private ITracer Tracer { get { return _debugtarget.Tracer; } }

2
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
View File

@ -25,8 +25,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public IDictionary<Type, object> EmulatorServices { private get; set; }
public bool Readonly public bool Readonly
{ {
get get