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

a few mainform simplifications

This commit is contained in:
adelikat 2020-07-02 17:43:21 -05:00
parent e3afead876
commit 374964bfb0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -171,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
if (Config.SkipWaterboxIntegrityChecks) if (Config.SkipWaterboxIntegrityChecks)
prefs = CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck; prefs = CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck;
return new CoreComm(ShowMessageCoreComm, NotifyCoreComm, cfp, prefs); return new CoreComm(ShowMessageCoreComm, AddOnScreenMessage, cfp, prefs);
} }
void SetImages() void SetImages()
@ -2177,7 +2177,7 @@ namespace BizHawk.Client.EmuHawk
//HACK //HACK
var _ = typeof(ToolStrip).InvokeMember( var _ = typeof(ToolStrip).InvokeMember(
"ProcessMnemonicInternal", "ProcessMnemonicInternal",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance, BindingFlags.NonPublic | BindingFlags.InvokeMethod | BindingFlags.Instance,
null, null,
MainformMenu, MainformMenu,
new object[] { c }); new object[] { c });
@ -3377,7 +3377,7 @@ namespace BizHawk.Client.EmuHawk
private int? LoadArchiveChooser(HawkFile file) private int? LoadArchiveChooser(HawkFile file)
{ {
using var ac = new ArchiveChooser(file); using var ac = new ArchiveChooser(file);
if (ShowDialogAsChild(ac) == DialogResult.OK) if (ShowDialogAsChild(ac).IsOk())
{ {
return ac.SelectedMemberIndex; return ac.SelectedMemberIndex;
} }
@ -3444,11 +3444,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void NotifyCoreComm(string message)
{
AddOnScreenMessage(message);
}
private string ChoosePlatformForRom(RomGame rom) private string ChoosePlatformForRom(RomGame rom)
{ {
using var platformChooser = new PlatformChooser(Config) using var platformChooser = new PlatformChooser(Config)