diff options
author | Neil <nyamatongwe@gmail.com> | 2018-04-19 17:09:27 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-04-19 17:09:27 +1000 |
commit | 1edfa1eaef9301aeffe31253cfc06709d4d8aae0 (patch) | |
tree | 1f3d496d6b70578797b056e5bcbf5694cb65f407 /src/MarginView.cxx | |
parent | d7c16df6b0cafa6d5dffbcfad31afe7d468b85be (diff) | |
download | scintilla-mirror-1edfa1eaef9301aeffe31253cfc06709d4d8aae0.tar.gz |
Backport: Casting changed in many places, due to change to 64-bit variables for 64-bit
builds. Some of the changes ensure no truncation while others remove casts
that are no longer needed because the externally visible Sci_Position is now
identical to Sci::Position. Some extra methods (CellBuffer::UCharAt and
Document::SciLineFromPosition) added to avoid casting in client code.
Sci::Line is currently identical to Sci::Position but it could be made smaller
so lines have Sci::Line types and are cast.
Some arguments widened.
Backport of changeset 6705:5c0a80740b8c.
Diffstat (limited to 'src/MarginView.cxx')
-rw-r--r-- | src/MarginView.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 02a961b10..09f1b636d 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -245,7 +245,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, if (highlightDelimiter.isEnabled) { const Sci::Line lastLine = model.pcs->DocFromDisplay(topLine + model.LinesOnScreen()) + 1; model.pdoc->GetHighlightDelimiters(highlightDelimiter, - static_cast<Sci::Line>(model.pdoc->LineFromPosition(model.sel.MainCaret())), lastLine); + model.pdoc->SciLineFromPosition(model.sel.MainCaret()), lastLine); } } |