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

winport - remove glitchy save type advanced menu thingy

This commit is contained in:
zeromus 2015-03-28 00:16:41 +00:00
parent 3289a3aecc
commit c325eac5e3
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
desmume/src/windows/main.cpp
View File

@ -2524,9 +2524,7 @@ int MenuInit()
ResetSaveStateTimes(); ResetSaveStateTimes();
HMENU configMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_3DCONFIG); HMENU configMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_3DCONFIG);
HMENU advancedMenu = GetSubMenuByIdOfFirstChild(configMenu, ID_ADVANCED);
HMENU toolsMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_DISASSEMBLER); HMENU toolsMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_DISASSEMBLER);
DeleteMenu(advancedMenu,ID_ADVANCED,MF_BYCOMMAND);
#ifndef DEVELOPER_MENU_ITEMS #ifndef DEVELOPER_MENU_ITEMS
// menu items that are only useful for desmume developers (maybe) // menu items that are only useful for desmume developers (maybe)
@ -2534,27 +2532,29 @@ int MenuInit()
DeleteMenu(fileMenu, IDM_FILE_RECORDUSERSPUWAV, MF_BYCOMMAND); DeleteMenu(fileMenu, IDM_FILE_RECORDUSERSPUWAV, MF_BYCOMMAND);
#endif #endif
#ifdef DEVELOPER //zero 27-mar-2015 - removing this.. its just glitchy and rarely maintained.
for(int i=0; i<MAX_SAVE_TYPES; i++) //add a different dialog, near the save import (perhaps based on it, where the save is cleared and re-initialized instead of imported) to restore this in the future if needed
{ //#ifdef DEVELOPER
memset(&mm, 0, sizeof(MENUITEMINFO)); // for(int i=0; i<MAX_SAVE_TYPES; i++)
// {
mm.cbSize = sizeof(MENUITEMINFO); // memset(&mm, 0, sizeof(MENUITEMINFO));
mm.fMask = MIIM_TYPE | MIIM_ID; //
mm.fType = MFT_STRING; // mm.cbSize = sizeof(MENUITEMINFO);
mm.wID = IDC_SAVETYPE+i+1; // mm.fMask = MIIM_TYPE | MIIM_ID;
mm.dwTypeData = (LPSTR)save_types[i].descr; // mm.fType = MFT_STRING;
// mm.wID = IDC_SAVETYPE+i+1;
MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm); // mm.dwTypeData = (LPSTR)save_types[i].descr;
} //
memset(&mm, 0, sizeof(MENUITEMINFO)); // MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm);
mm.cbSize = sizeof(MENUITEMINFO); // }
mm.fMask = MIIM_TYPE; // memset(&mm, 0, sizeof(MENUITEMINFO));
mm.fType = MFT_SEPARATOR; // mm.cbSize = sizeof(MENUITEMINFO);
MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm); // mm.fMask = MIIM_TYPE;
#else // mm.fType = MFT_SEPARATOR;
DeleteMenu(configMenu,GetSubMenuIndexByHMENU(configMenu,advancedMenu),MF_BYPOSITION); // MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm);
#endif //#else
// DeleteMenu(configMenu,GetSubMenuIndexByHMENU(configMenu,advancedMenu),MF_BYPOSITION);
//#endif
if (!gShowConsole) if (!gShowConsole)
DeleteMenu(toolsMenu, IDM_CONSOLE_ALWAYS_ON_TOP, MF_BYCOMMAND); DeleteMenu(toolsMenu, IDM_CONSOLE_ALWAYS_ON_TOP, MF_BYCOMMAND);

10
desmume/src/windows/resources.rc
View File

@ -1703,16 +1703,6 @@ BEGIN
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&VSync", ID_DISPLAYMETHOD_VSYNC MENUITEM "&VSync", ID_DISPLAYMETHOD_VSYNC
END END
POPUP "Ad&vanced"
BEGIN
MENUITEM "advanced", ID_ADVANCED
POPUP "&Save Type"
BEGIN
MENUITEM "&Autodetect", IDC_SAVETYPE
MENUITEM SEPARATOR
MENUITEM "Force As Current", IDC_SAVETYPE_FORCE
END
END
END END
POPUP "&Tools" POPUP "&Tools"
BEGIN BEGIN