aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-06-09 11:31:14 +1000
committerNeil <nyamatongwe@gmail.com>2017-06-09 11:31:14 +1000
commit13324ebe2cc0f222228e00d84ceabd79d695c0fa (patch)
treeb301543b52452f29a28011cf4970246ef1781ffe /cocoa
parentdbefd4e6e1d808505086b3374106ff26ac2a6452 (diff)
downloadscintilla-mirror-13324ebe2cc0f222228e00d84ceabd79d695c0fa.tar.gz
Backport: Use min and max from std instead of own version from platform.
Backport of changeset 6297:4bf96081f6e6.
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/ScintillaCocoa.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 2b20c38a4..9d08481bb 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -2004,7 +2004,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);
}
@@ -2253,7 +2253,7 @@ bool ScintillaCocoa::KeyboardInput(NSEvent* event)
{
const UniChar originalKey = [input characterAtIndex: i];
NSEventModifierFlags modifierFlags = [event modifierFlags];
-
+
UniChar key = KeyTranslate(originalKey, modifierFlags);
bool consumed = false; // Consumed as command?