aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure
diff options
context:
space:
mode:
authorEugene Sandulenko2019-10-04 15:54:01 +0200
committerEugene Sandulenko2019-10-04 15:54:48 +0200
commit35773e76b9835bcd07416c0ffc5d494cb8afe0ee (patch)
tree9a5e9bd297d47b88d8e4adfafe8fc354f0f8e065 /engines/macventure
parent48b261cf6b3714ed5e9f224149272e2808e00f09 (diff)
downloadscummvm-rg350-35773e76b9835bcd07416c0ffc5d494cb8afe0ee.tar.gz
scummvm-rg350-35773e76b9835bcd07416c0ffc5d494cb8afe0ee.tar.bz2
scummvm-rg350-35773e76b9835bcd07416c0ffc5d494cb8afe0ee.zip
GRAPHICS: MACGUI: Unify MacMenuItem and MacMenuSubItem
Diffstat (limited to 'engines/macventure')
-rw-r--r--engines/macventure/gui.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index cc1de7cab2..d7b640571d 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -410,7 +410,7 @@ bool Gui::loadMenus() {
if ((resArray = _resourceManager->getResIDArray(MKTAG('M', 'E', 'N', 'U'))).size() == 0)
return false;
- _menu->addMenuSubItem(0, "Abb", kMenuActionAbout, 0, 'A', true);
+ _menu->addMenuItem(nullptr, "Abb", kMenuActionAbout, 0, 'A', true);
int i = 1;
for (iter = resArray.begin(); iter != resArray.end(); ++iter) {
@@ -430,7 +430,8 @@ bool Gui::loadMenus() {
title[titleLength] = '\0';
if (titleLength > 1) {
- _menu->addMenuItem(title);
+ _menu->addMenuItem(nullptr, title);
+ Graphics::MacMenuSubMenu *submenu = _menu->addSubMenu(nullptr);
// Read submenu items
while ((titleLength = res->readByte())) {
@@ -445,7 +446,7 @@ bool Gui::loadMenus() {
res->readUint16BE();
// Read style
style = res->readUint16BE();
- _menu->addMenuSubItem(i, title, 0, style, key, false);
+ _menu->addMenuItem(submenu, title, 0, style, key, false);
}
}