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

Adjust MMX menu variable and position. 

It should only appear on `x86`.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-09-06 00:45:14 -03:00 committed by Rafael Kitover
parent 27b038b378
commit 51fa150f1c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wx/cmdevents.cpp
View File

@ -2803,8 +2803,10 @@ EVT_HANDLER(ApplyPatches, "Apply IPS/UPS/IPF patches if found")
EVT_HANDLER(MMX, "Enable MMX") EVT_HANDLER(MMX, "Enable MMX")
{ {
#ifdef MMX
GetMenuOptionInt("MMX", disableMMX, 1); GetMenuOptionInt("MMX", disableMMX, 1);
update_opts(); update_opts();
#endif
} }
EVT_HANDLER(KeepOnTop, "Keep window on top") EVT_HANDLER(KeepOnTop, "Keep window on top")

13
src/wx/guiinit.cpp
View File

@ -2833,6 +2833,17 @@ bool MainFrame::BindControls()
continue; continue;
} }
#endif #endif
#ifndef MMX
if (cmdtab[i].cmd_id == XRCID("MMX"))
{
if (mi)
mi->GetMenu()->Remove(mi);
cmdtab[i].cmd_id = XRCID("NOOP");
cmdtab[i].mi = NULL;
continue;
}
#endif
if (mi) { if (mi) {
// wxgtk provides no way to retrieve stock label/accel // wxgtk provides no way to retrieve stock label/accel
@ -2911,6 +2922,7 @@ bool MainFrame::BindControls()
// remove this item from the menu completely // remove this item from the menu completely
wxMenuItem* gdbmi = XRCITEM("GDBMenu"); wxMenuItem* gdbmi = XRCITEM("GDBMenu");
gdbmi->GetMenu()->Remove(gdbmi); gdbmi->GetMenu()->Remove(gdbmi);
gdbmi = NULL;
#endif #endif
// if a recent menu is present, save its location // if a recent menu is present, save its location
@ -2981,6 +2993,7 @@ bool MainFrame::BindControls()
MenuOptionIntMask("JoypadAutoholdR", autohold, KEYM_R); MenuOptionIntMask("JoypadAutoholdR", autohold, KEYM_R);
MenuOptionIntMask("JoypadAutoholdSelect", autohold, KEYM_SELECT); MenuOptionIntMask("JoypadAutoholdSelect", autohold, KEYM_SELECT);
MenuOptionIntMask("JoypadAutoholdStart", autohold, KEYM_START); MenuOptionIntMask("JoypadAutoholdStart", autohold, KEYM_START);
MenuOptionIntMask("MMX", disableMMX, 1);
MenuOptionBool("EmulatorSpeedupToggle", turbo); MenuOptionBool("EmulatorSpeedupToggle", turbo);
MenuOptionIntRadioValue("LinkType0Nothing", gopts.gba_link_type, 0); MenuOptionIntRadioValue("LinkType0Nothing", gopts.gba_link_type, 0);
MenuOptionIntRadioValue("LinkType1Cable", gopts.gba_link_type, 1); MenuOptionIntRadioValue("LinkType1Cable", gopts.gba_link_type, 1);