diff options
| -rw-r--r-- | graphics/macgui/macmenu.cpp | 2 | ||||
| -rw-r--r-- | graphics/macgui/mactext.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp index e42430ba99..dcf2e20470 100644 --- a/graphics/macgui/macmenu.cpp +++ b/graphics/macgui/macmenu.cpp @@ -592,7 +592,7 @@ void MacMenu::enableCommand(int menunum, int action, bool state) { } void MacMenu::enableCommand(const char *menuitem, const char *menuaction, bool state) { - int menunum = 0; + uint menunum = 0; while (menunum < _items.size()) if (_items[menunum]->name.equalsIgnoreCase(menuitem)) diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp index 88fe6421a5..23442d05f4 100644 --- a/graphics/macgui/mactext.cpp +++ b/graphics/macgui/mactext.cpp @@ -508,11 +508,11 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int if (formatted) res += _textLines[i].chunks[chunk].toString(); - if (endCol >= _textLines[i].chunks[chunk].text.size()) + if (endCol >= (int) _textLines[i].chunks[chunk].text.size()) res += _textLines[i].chunks[chunk].text; else res += Common::String(_textLines[i].chunks[chunk].text.c_str(), endCol); - } else if (_textLines[i].chunks[chunk].text.size() > startCol) { + } else if ((int) _textLines[i].chunks[chunk].text.size() > startCol) { if (formatted) res += _textLines[i].chunks[chunk].toString(); @@ -532,7 +532,7 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int res += _textLines[i].chunks[chunk].toString(); res += _textLines[i].chunks[chunk].text; - } else if (_textLines[i].chunks[chunk].text.size() > startCol) { + } else if ((int) _textLines[i].chunks[chunk].text.size() > startCol) { if (formatted) res += _textLines[i].chunks[chunk].toString(); @@ -546,7 +546,7 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int if (formatted) res += _textLines[i].chunks[chunk].toString(); - if (endCol >= _textLines[i].chunks[chunk].text.size()) + if (endCol >= (int) _textLines[i].chunks[chunk].text.size()) res += _textLines[i].chunks[chunk].text; else res += Common::String(_textLines[i].chunks[chunk].text.c_str(), endCol); |