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

View File

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

View File

@ -8,9 +8,10 @@ namespace BizHawk.Client.EmuHawk
{
public partial class TAStudio : IToolForm
{
public IDictionary<Type, object> EmulatorServices { private get; set; }
public IEmulator Emulator { get { return (IEmulator)EmulatorServices[typeof(IEmulator)]; } }
public IStatable StatableEmulator { get { return (IStatable)EmulatorServices[typeof(IStatable)]; } }
[RequiredService]
public IEmulator Emulator { get; private set; }
[RequiredService]
public IStatable StatableEmulator { get; private set; }
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

View File

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

View File

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

View File

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