diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
| commit | 91e85ffa9fb176b9c87dac1a3849a99ab594d899 (patch) | |
| tree | 7bcb7ea3f640821519ad77c6018df2b531176caa /cocoa | |
| parent | 454c44ddcd26843a1253757de333bc3c3c0cba8e (diff) | |
| download | scintilla-mirror-91e85ffa9fb176b9c87dac1a3849a99ab594d899.tar.gz | |
Use min and max from std instead of own version from platform.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index eeb0daf8f..90d6aa4d7 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1887,7 +1887,7 @@ void ScintillaCocoa::Resize() { void ScintillaCocoa::UpdateForScroll() { Point ptOrigin = GetVisibleOriginInMain(); xOffset = static_cast<int>(ptOrigin.x); - int newTop = Platform::Minimum(static_cast<int>(ptOrigin.y / vs.lineHeight), MaxScrollPos()); + Sci::Line newTop = std::min(static_cast<Sci::Line>(ptOrigin.y / vs.lineHeight), MaxScrollPos()); SetTopLine(newTop); } |