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

fix compile failure

This commit is contained in:
goyuken 2014-12-17 18:25:54 +00:00
parent ecf8728de6
commit 56d144699d
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -421,7 +421,7 @@ namespace BizHawk.Client.EmuHawk
box.SetButtons( box.SetButtons(
new[] { "Switch", "Cancel" }, new[] { "Switch", "Cancel" },
new[] { DialogResult.Yes, DialogResult.Cancel }); new[] { DialogResult.Yes, DialogResult.Cancel });
box.MaximumSize = new Size(450, 350); box.MaximumSize = new Size(450, 350);
box.SetMessageToAutoSize(); box.SetMessageToAutoSize();
var result = box.ShowDialog(); var result = box.ShowDialog();
@ -1100,6 +1100,11 @@ namespace BizHawk.Client.EmuHawk
#region Tools #region Tools
static bool ToolAvailable<T>()
{
return ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(T));
}
private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings;
@ -1111,18 +1116,18 @@ namespace BizHawk.Client.EmuHawk
TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings; TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings;
VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings; VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings;
TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings; TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings;
TraceLoggerMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(TraceLogger)); TraceLoggerMenuItem.Enabled = ToolAvailable<TraceLogger>();
TAStudioMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(TAStudio)); TAStudioMenuItem.Enabled = ToolAvailable<TAStudio>();
CheatsMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(Cheats)); CheatsMenuItem.Enabled = ToolAvailable<Cheats>();
HexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(HexEditor)); HexEditorMenuItem.Enabled = ToolAvailable<HexEditor>();
HexEditorMenuItem.Enabled = true; HexEditorMenuItem.Enabled = true;
RamSearchMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(RamSearch)); RamSearchMenuItem.Enabled = ToolAvailable<RamSearch>();
RamWatchMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(RamWatch)); RamWatchMenuItem.Enabled = ToolAvailable<RamWatch>();
DebuggerMenuItem.Visible = VersionInfo.DeveloperBuild; DebuggerMenuItem.Visible = VersionInfo.DeveloperBuild;
DebuggerMenuItem.Enabled = GlobalWin.Tools.IsAvailable(typeof(GenericDebugger)); DebuggerMenuItem.Enabled = ToolAvailable<GenericDebugger>();
batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild; batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild;
} }
@ -1385,13 +1390,13 @@ namespace BizHawk.Client.EmuHawk
HighlightActiveDisplayRegionMenuItem.Checked = s.HighlightActiveDisplayRegion; HighlightActiveDisplayRegionMenuItem.Checked = s.HighlightActiveDisplayRegion;
SMSEnableFMChipMenuItem.Visible = SMSEnableFMChipMenuItem.Visible =
SMSFix3DGameDisplayToolStripMenuItem.Visible = SMSFix3DGameDisplayToolStripMenuItem.Visible =
SMSenableBIOSToolStripMenuItem.Visible = SMSenableBIOSToolStripMenuItem.Visible =
Global.Game.System == "SMS"; Global.Game.System == "SMS";
SMSOverclockMenuItem.Visible = SMSOverclockMenuItem.Visible =
SMSForceStereoMenuItem.Visible = SMSForceStereoMenuItem.Visible =
SMSdisplayToolStripMenuItem.Visible = SMSdisplayToolStripMenuItem.Visible =
Global.Game.System != "GG"; Global.Game.System != "GG";
ShowClippedRegionsMenuItem.Visible = ShowClippedRegionsMenuItem.Visible =
@ -1400,7 +1405,7 @@ namespace BizHawk.Client.EmuHawk
Global.Game.System == "GG"; Global.Game.System == "GG";
SMSOverclockMenuItem.Visible = SMSOverclockMenuItem.Visible =
SMSVDPViewerToolStripMenuItem.Visible = SMSVDPViewerToolStripMenuItem.Visible =
Global.Game.System != "SG"; Global.Game.System != "SG";
} }
@ -1812,7 +1817,7 @@ namespace BizHawk.Client.EmuHawk
{ {
N64PluginSettingsMenuItem.Enabled = N64PluginSettingsMenuItem.Enabled =
N64ControllerSettingsMenuItem.Enabled = N64ControllerSettingsMenuItem.Enabled =
N64ExpansionSlotMenuItem.Enabled = N64ExpansionSlotMenuItem.Enabled =
!Global.MovieSession.Movie.IsActive; !Global.MovieSession.Movie.IsActive;
N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint; N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint;
@ -2368,7 +2373,7 @@ namespace BizHawk.Client.EmuHawk
} }
private void FormDragDrop_internal(object sender, DragEventArgs e) private void FormDragDrop_internal(object sender, DragEventArgs e)
{ {
var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop); var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
var isLua = false; var isLua = false;
foreach (var path in filePaths) foreach (var path in filePaths)