diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 6348d3f78..5e93d7f94 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1628,7 +1628,7 @@ bool ScintillaCocoa::KeyboardInput(NSEvent* event) bool handled = false; // Handle each entry individually. Usually we only have one entry anway. - for (int i = 0; i < input.length; i++) + for (size_t i = 0; i < input.length; i++) { const UniChar originalKey = [input characterAtIndex: i]; UniChar key = KeyTranslate(originalKey); diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index fa5d836eb..da6b03e0d 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -205,7 +205,8 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) { if (ac.chooseSingle && (listType == 0)) { if (list && !strchr(list, ac.GetSeparator())) { const char *typeSep = strchr(list, ac.GetTypesep()); - int lenInsert = static_cast<int>((typeSep) ? (typeSep-list) : strlen(list)); + int lenInsert = typeSep ? + static_cast<int>(typeSep-list) : static_cast<int>(strlen(list)); if (ac.ignoreCase) { SetEmptySelection(sel.MainCaret() - lenEntered); pdoc->DeleteChars(sel.MainCaret(), lenEntered); |