diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 | 
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?  | 
