diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 15:17:18 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-17 15:17:18 +1000 |
| commit | 83f45b0a9b0ed59736e7de796ec6db14c90be5c8 (patch) | |
| tree | bc14d402be83b0d239a9160ab4b76b071ec4e203 /src | |
| parent | 862eaefe89d77e1ce8453d7bcac9145fb023b649 (diff) | |
| download | scintilla-mirror-83f45b0a9b0ed59736e7de796ec6db14c90be5c8.tar.gz | |
Casts required for Unix LP64 after changes to Sci_Position/Sci_PositionU.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ScintillaBase.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
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 |