GRAPHICS: MACGUI: Fix signed/unsigned mismatch

This commit is contained in:
Avijeet 2022-07-08 19:02:21 +05:30 committed by Eugene Sandulenko
parent c031566369
commit 5e5dd3f399
2 changed files with 4 additions and 4 deletions

View File

@ -492,7 +492,7 @@ int MacMenu::addMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text,
return submenu->items.size() - 1;
}
void MacMenu::insertMenuItem(MacMenuSubMenu *submenu, const Common::String &text, int pos, int action, int style, char shortcut, bool enabled, bool checked) {
void MacMenu::insertMenuItem(MacMenuSubMenu *submenu, const Common::String &text, uint pos, int action, int style, char shortcut, bool enabled, bool checked) {
_dimensionsDirty = true;
if (submenu == nullptr) {
@ -515,7 +515,7 @@ void MacMenu::insertMenuItem(MacMenuSubMenu *submenu, const Common::String &text
submenu->items.insert(submenu->items.begin() + pos, new MacMenuItem(text, action, style, shortcut, -1, enabled, checked));
}
void MacMenu::insertMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text, int pos, int action, int style, char shortcut, bool enabled, bool checked) {
void MacMenu::insertMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text, uint pos, int action, int style, char shortcut, bool enabled, bool checked) {
_dimensionsDirty = true;
Common::U32String amp("&");

View File

@ -77,8 +77,8 @@ public:
MacMenuSubMenu *addSubMenu(MacMenuSubMenu *submenu, int index = -1);
int addMenuItem(MacMenuSubMenu *submenu, const Common::String &text, int action = -1, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
int addMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text, int action = 0, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
void insertMenuItem(MacMenuSubMenu *submenu, const Common::String &text, int pos, int action = -1, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
void insertMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text, int pos, int action = 0, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
void insertMenuItem(MacMenuSubMenu *submenu, const Common::String &text, uint pos, int action = -1, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
void insertMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text, uint pos, int action = 0, int style = 0, char shortcut = 0, bool enabled = true, bool checked = false);
void removeMenuItem(MacMenuSubMenu *submenu, uint pos);
void loadMenuResource(Common::MacResManager *resFork, uint16 id);
void loadMenuBarResource(Common::MacResManager *resFork, uint16 id);