libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Use Common::String for addMenuItem and addMenuSubItem

Browse Source
This commit is contained in:
Cameron Cawley 2019-08-10 14:50:33 +01:00
parent 1632fba91e
commit 9052a16887
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/wage/gui.cpp
View File

@ -102,11 +102,11 @@ Gui::Gui(WageEngine *engine) {
_menu->addStaticMenus(menuSubItems);
_menu->addMenuSubItem(kMenuAbout, _engine->_world->getAboutMenuItemName(), kMenuActionAbout);
_commandsMenuId = _menu->addMenuItem(_engine->_world->_commandsMenuName.c_str());
_commandsMenuId = _menu->addMenuItem(_engine->_world->_commandsMenuName);
regenCommandsMenu();
if (!_engine->_world->_weaponMenuDisabled) {
_weaponsMenuId = _menu->addMenuItem(_engine->_world->_weaponsMenuName.c_str());
_weaponsMenuId = _menu->addMenuItem(_engine->_world->_weaponsMenuName);
regenWeaponsMenu();
} else {
@ -226,7 +226,7 @@ void Gui::regenWeaponsMenu() {
command += " ";
command += obj->_name;
_menu->addMenuSubItem(_weaponsMenuId, command.c_str(), kMenuActionCommand, 0, 0, true);
_menu->addMenuSubItem(_weaponsMenuId, command, kMenuActionCommand, 0, 0, true);
empty = false;
}

10
graphics/macgui/macmenu.cpp
View File

@ -75,7 +75,7 @@ struct MacMenuSubItem {
bool enabled;
Common::Rect bbox;
MacMenuSubItem(const char *t, int a, int s = 0, char sh = 0, bool e = true) : text(t), unicode(false), action(a), style(s), shortcut(sh), enabled(e) {}
MacMenuSubItem(const Common::String &t, int a, int s = 0, char sh = 0, bool e = true) : text(t), unicode(false), action(a), style(s), shortcut(sh), enabled(e) {}
MacMenuSubItem(const Common::U32String &t, int a, int s = 0, char sh = 0, bool e = true) : unicodeText(t), unicode(true), action(a), style(s), shortcut(sh), enabled(e) {}
};
@ -89,7 +89,7 @@ struct MacMenuItem {
Common::Rect bbox;
Common::Rect subbbox;
MacMenuItem(const char *n) : name(n), unicode(false) {}
MacMenuItem(const Common::String &n) : name(n), unicode(false) {}
MacMenuItem(const Common::U32String &n) : unicodeName(n), unicode(true) {}
};
@ -260,7 +260,7 @@ void MacMenu::addStaticMenus(const MacMenuData *data) {
calcDimensions();
}
int MacMenu::addMenuItem(const char *name) {
int MacMenu::addMenuItem(const Common::String &name) {
MacMenuItem *i = new MacMenuItem(name);
_items.push_back(i);
@ -274,7 +274,7 @@ int MacMenu::addMenuItem(const Common::U32String &name) {
return _items.size() - 1;
}
void MacMenu::addMenuSubItem(int id, const char *text, int action, int style, char shortcut, bool enabled) {
void MacMenu::addMenuSubItem(int id, const Common::String &text, int action, int style, char shortcut, bool enabled) {
_items[id]->subitems.push_back(new MacMenuSubItem(text, action, style, shortcut, enabled));
calcMenuBounds(_items[id]);
@ -378,7 +378,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
}
}
menu->subitems.push_back(new MacMenuSubItem(item.c_str(), commandId, style, shortcut, enabled));
menu->subitems.push_back(new MacMenuSubItem(item, commandId, style, shortcut, enabled));
}
item.clear();

4
graphics/macgui/macmenu.h
View File

@ -57,9 +57,9 @@ public:
void addStaticMenus(const MacMenuData *data);
void calcDimensions();
int addMenuItem(const char *name);
int addMenuItem(const Common::String &name);
int addMenuItem(const Common::U32String &name);
void addMenuSubItem(int id, const char *text, int action, int style = 0, char shortcut = 0, bool enabled = true);
void addMenuSubItem(int id, const Common::String &text, int action, int style = 0, char shortcut = 0, bool enabled = true);
void addMenuSubItem(int id, const Common::U32String &text, int action, int style = 0, char shortcut = 0, bool enabled = true);
void createSubMenuFromString(int id, const char *string, int commandId);
void clearSubMenu(int id);