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 | 5d888154b02ae8665464bcdfaf89e0be3a582320 (patch) | |
| tree | 378cea962426e7a779919a1153d91f26ba7f93c6 /cocoa | |
| parent | 3065f334c00ee1eaf91d40fe139806111dd959fd (diff) | |
| download | scintilla-mirror-5d888154b02ae8665464bcdfaf89e0be3a582320.tar.gz | |
Backport: Casts required for Unix LP64 after changes to Sci_Position/Sci_PositionU.
Backport of changeset 6351:b7126dd1f020.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index d4d103838..2f0b80e8f 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1209,7 +1209,8 @@ void ScintillaCocoa::ClaimSelection() */ 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; @@ -1234,7 +1235,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; @@ -1342,8 +1343,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; |
