Revert "Disable Tool Box on Linux (fixes #2741)"
This reverts commit fe6bf7ba12
.
This commit is contained in:
parent
dc090b81fe
commit
078852567a
|
@ -1,7 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
using BizHawk.Common;
|
|
||||||
using BizHawk.Emulation.Common;
|
using BizHawk.Emulation.Common;
|
||||||
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
|
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
|
||||||
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
|
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
|
||||||
|
@ -351,7 +349,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
Tools.Load<TAStudio>();
|
Tools.Load<TAStudio>();
|
||||||
break;
|
break;
|
||||||
case "ToolBox":
|
case "ToolBox":
|
||||||
if (!OSTailoredCode.IsUnixHost) Tools.Load<ToolBox>();
|
Tools.Load<ToolBox>();
|
||||||
break;
|
break;
|
||||||
case "Virtual Pad":
|
case "Virtual Pad":
|
||||||
Tools.Load<VirtualpadTool>();
|
Tools.Load<VirtualpadTool>();
|
||||||
|
|
|
@ -354,12 +354,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
#else
|
#else
|
||||||
SynclessRecordingMenuItem.Enabled = false;
|
SynclessRecordingMenuItem.Enabled = false;
|
||||||
#endif
|
#endif
|
||||||
if (OSTailoredCode.IsUnixHost)
|
|
||||||
{
|
|
||||||
ToolBoxMenuItem.Enabled = false;
|
|
||||||
ToolBoxMenuItem.Visible = false;
|
|
||||||
toolStripSeparator12.Visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Game = GameInfo.NullInstance;
|
Game = GameInfo.NullInstance;
|
||||||
_throttle = new Throttle();
|
_throttle = new Throttle();
|
||||||
|
|
|
@ -25,11 +25,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
private void ToolBox_Load(object sender, EventArgs e)
|
private void ToolBox_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (OSTailoredCode.IsUnixHost)
|
|
||||||
{
|
|
||||||
Close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Location = new Point(
|
Location = new Point(
|
||||||
Owner.Location.X + Owner.Size.Width,
|
Owner.Location.X + Owner.Size.Width,
|
||||||
Owner.Location.Y
|
Owner.Location.Y
|
||||||
|
@ -38,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
public override void Restart()
|
public override void Restart()
|
||||||
{
|
{
|
||||||
if (OSTailoredCode.IsUnixHost) return;
|
|
||||||
SetTools();
|
SetTools();
|
||||||
SetSize();
|
SetSize();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue