From 13324ebe2cc0f222228e00d84ceabd79d695c0fa Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 9 Jun 2017 11:31:14 +1000 Subject: Backport: Use min and max from std instead of own version from platform. Backport of changeset 6297:4bf96081f6e6. --- cocoa/ScintillaCocoa.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cocoa') 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(ptOrigin.x); - int newTop = Platform::Minimum(static_cast(ptOrigin.y / vs.lineHeight), MaxScrollPos()); + Sci::Line newTop = std::min(static_cast(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? -- cgit v1.2.3