diff options
author | Eugene Sandulenko | 2017-08-21 19:40:05 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-08-21 19:40:05 +0200 |
commit | 97ed6a2af73608dad953e740f58432921a6ac700 (patch) | |
tree | d56ac0a12eeb3091b7570f106d92a14ba100e784 /graphics/macgui/macmenu.cpp | |
parent | 203b5138fa9bd32b2b218566639b9dfd7c53bd2c (diff) | |
download | scummvm-rg350-97ed6a2af73608dad953e740f58432921a6ac700.tar.gz scummvm-rg350-97ed6a2af73608dad953e740f58432921a6ac700.tar.bz2 scummvm-rg350-97ed6a2af73608dad953e740f58432921a6ac700.zip |
GRAPHICS: MACGUI: Pass command id when creating menu to avoid namespace clashes
This fixes Command menu in WAGE.
Diffstat (limited to 'graphics/macgui/macmenu.cpp')
-rw-r--r-- | graphics/macgui/macmenu.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp index dcf2e20470..cecdcabcea 100644 --- a/graphics/macgui/macmenu.cpp +++ b/graphics/macgui/macmenu.cpp @@ -56,11 +56,6 @@ enum { kFontStyleExtended = 64 }; -enum { - kMenuActionCommand -}; - - struct MacMenuSubItem { Common::String text; int action; @@ -216,7 +211,7 @@ void MacMenu::clearSubMenu(int id) { menu->subitems.clear(); } -void MacMenu::createSubMenuFromString(int id, const char *str) { +void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) { clearSubMenu(id); MacMenuItem *menu = _items[id]; @@ -278,7 +273,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str) { } } - menu->subitems.push_back(new MacMenuSubItem(item.c_str(), kMenuActionCommand, style, shortcut, enabled)); + menu->subitems.push_back(new MacMenuSubItem(item.c_str(), commandId, style, shortcut, enabled)); } item.clear(); |