aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaCocoa.mm
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-03-31 23:21:05 +1100
committerNeil <nyamatongwe@gmail.com>2017-03-31 23:21:05 +1100
commit9a3399828738c816bd40d2e0e87b36894a0e67e7 (patch)
tree8046324259fe1625e849ae46d2d9ebbb599e271f /cocoa/ScintillaCocoa.mm
parent20a8cd5d081f553232f7443d4e2b73f83ca389d3 (diff)
downloadscintilla-mirror-9a3399828738c816bd40d2e0e87b36894a0e67e7.tar.gz
Prefer standard min/max over Platform's as adapts to changed types.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
-rw-r--r--cocoa/ScintillaCocoa.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 0eae8d356..abbfd85dd 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1263,7 +1263,7 @@ void ScintillaCocoa::DragScroll()
// TODO: does not work for wrapped lines, fix it.
Sci::Line line = pdoc->LineFromPosition(posDrag.Position());
Sci::Line currentVisibleLine = cs.DisplayFromDoc(line);
- Sci::Line lastVisibleLine = Platform::Minimum(topLine + LinesOnScreen(), cs.LinesDisplayed()) - 2;
+ Sci::Line lastVisibleLine = std::min(topLine + LinesOnScreen(), cs.LinesDisplayed()) - 2;
if (currentVisibleLine <= topLine && topLine > 0)
ScrollTo(topLine - scrollSpeed);