diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 9 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 26 |
2 files changed, 21 insertions, 14 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 9f7a4cbf8..7fc0a8c89 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1144,7 +1144,8 @@ void ScintillaCocoa::ClaimSelection() { * as a row:column pair. The result is zero-based. */ NSPoint ScintillaCocoa::GetCaretPosition() { - const Sci::Line line = pdoc->LineFromPosition(sel.RangeMain().caret.Position()); + const Sci::Line line = static_cast<Sci::Line>( + pdoc->LineFromPosition(sel.RangeMain().caret.Position())); NSPoint result; result.y = line; @@ -1167,7 +1168,7 @@ void ScintillaCocoa::DragScroll() { } // TODO: does not work for wrapped lines, fix it. - Sci::Line line = pdoc->LineFromPosition(posDrag.Position()); + Sci::Line line = static_cast<Sci::Line>(pdoc->LineFromPosition(posDrag.Position())); Sci::Line currentVisibleLine = cs.DisplayFromDoc(line); Sci::Line lastVisibleLine = std::min(topLine + LinesOnScreen(), cs.LinesDisplayed()) - 2; @@ -1264,8 +1265,8 @@ void ScintillaCocoa::StartDrag() { PRectangle client = GetTextRectangle(); Sci::Position selStart = sel.RangeMain().Start().Position(); Sci::Position selEnd = sel.RangeMain().End().Position(); - Sci::Line startLine = pdoc->LineFromPosition(selStart); - Sci::Line endLine = pdoc->LineFromPosition(selEnd); + Sci::Line startLine = static_cast<Sci::Line>(pdoc->LineFromPosition(selStart)); + Sci::Line endLine = static_cast<Sci::Line>(pdoc->LineFromPosition(selEnd)); Point pt; long startPos, endPos, ep; PRectangle rcSel; diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index d65659ae8..c0166c41b 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -660,9 +660,9 @@ const char *LexState::DescribeWordListSets() { void LexState::SetWordList(int n, const char *wl) { if (instance) { - int firstModification = instance->WordListSet(n, wl); + Sci_Position firstModification = instance->WordListSet(n, wl); if (firstModification >= 0) { - pdoc->ModifiedAt(firstModification); + pdoc->ModifiedAt(static_cast<Sci::Position>(firstModification)); } } } @@ -706,9 +706,9 @@ const char *LexState::DescribeProperty(const char *name) { void LexState::PropSet(const char *key, const char *val) { props.Set(key, val); if (instance) { - int firstModification = instance->PropertySet(key, val); + Sci_Position firstModification = instance->PropertySet(key, val); if (firstModification >= 0) { - pdoc->ModifiedAt(firstModification); + pdoc->ModifiedAt(static_cast<Sci::Position>(firstModification)); } } } @@ -831,8 +831,10 @@ const char *LexState::DescriptionOfStyle(int style) { void ScintillaBase::NotifyStyleToNeeded(Sci::Position endStyleNeeded) { #ifdef SCI_LEXER if (DocumentLexState()->lexLanguage != SCLEX_CONTAINER) { - Sci::Line lineEndStyled = pdoc->LineFromPosition(pdoc->GetEndStyled()); - Sci::Position endStyled = pdoc->LineStart(lineEndStyled); + Sci::Line lineEndStyled = static_cast<Sci::Line>( + pdoc->LineFromPosition(pdoc->GetEndStyled())); + Sci::Position endStyled = static_cast<Sci::Position>( + pdoc->LineStart(lineEndStyled)); DocumentLexState()->Colourise(endStyled, endStyleNeeded); return; } @@ -1052,7 +1054,8 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara case SCI_COLOURISE: if (DocumentLexState()->lexLanguage == SCLEX_CONTAINER) { pdoc->ModifiedAt(static_cast<Sci::Position>(wParam)); - NotifyStyleToNeeded((lParam == -1) ? pdoc->Length() : static_cast<Sci::Position>(lParam)); + NotifyStyleToNeeded((lParam == -1) ? static_cast<Sci::Position>(pdoc->Length()) : + static_cast<Sci::Position>(lParam)); } else { DocumentLexState()->Colourise(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); } @@ -1142,13 +1145,16 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara return DocumentLexState()->NamedStyles(); case SCI_NAMEOFSTYLE: - return StringResult(lParam, DocumentLexState()->NameOfStyle(wParam)); + return StringResult(lParam, DocumentLexState()-> + NameOfStyle(static_cast<int>(wParam))); case SCI_TAGSOFSTYLE: - return StringResult(lParam, DocumentLexState()->TagsOfStyle(wParam)); + return StringResult(lParam, DocumentLexState()-> + TagsOfStyle(static_cast<int>(wParam))); case SCI_DESCRIPTIONOFSTYLE: - return StringResult(lParam, DocumentLexState()->DescriptionOfStyle(wParam)); + return StringResult(lParam, DocumentLexState()-> + DescriptionOfStyle(static_cast<int>(wParam))); #endif |