diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2018-06-07 13:56:28 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2018-06-07 13:56:28 +1000 |
| commit | 9002d79da5518e33227a1e91968d29a0ec3425fe (patch) | |
| tree | 95bd912fdf35993e7a378f4f7d81277e4e4dcd94 /cocoa/ScintillaView.mm | |
| parent | b780f4975a8d6fc26a5e2902a1d7d9a18151e5be (diff) | |
| download | scintilla-mirror-9002d79da5518e33227a1e91968d29a0ec3425fe.tar.gz | |
Update Cocoa enumerations to current names instead of deprecated names.
Diffstat (limited to 'cocoa/ScintillaView.mm')
| -rw-r--r-- | cocoa/ScintillaView.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 00f30e2f4..75f3c4f41 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -706,7 +706,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { */ - (void) scrollWheel: (NSEvent *) theEvent { #ifdef SCROLL_WHEEL_MAGNIFICATION - if (([theEvent modifierFlags] & NSCommandKeyMask) != 0) { + if (([theEvent modifierFlags] & NSEventModifierFlagCommand) != 0) { mOwner.backend->MouseWheel(theEvent); return; } @@ -1129,7 +1129,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { rect.size.height = 1.0; NSRect rectInWindow = [self.superview.superview convertRect: rect toView: nil]; NSPoint pt = rectInWindow.origin; - NSEvent *event = [NSEvent mouseEventWithType: NSRightMouseDown + NSEvent *event = [NSEvent mouseEventWithType: NSEventTypeRightMouseDown location: pt modifierFlags: 0 timestamp: 0 @@ -1480,7 +1480,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { * Used to position and size the parts of the editor (content, scrollers, info bar). */ - (void) positionSubViews { - CGFloat scrollerWidth = [NSScroller scrollerWidthForControlSize: NSRegularControlSize + CGFloat scrollerWidth = [NSScroller scrollerWidthForControlSize: NSControlSizeRegular scrollerStyle: NSScrollerStyleLegacy]; NSSize size = self.frame.size; |