diff options
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 0354c2df8..d88e0e3ed 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1131,7 +1131,7 @@ void ScintillaCocoa::CreateCallTipWindow(PRectangle rc) { if (!ct.wCallTip.Created()) { NSRect ctRect = NSMakeRect(rc.top, rc.bottom, rc.Width(), rc.Height()); NSWindow *callTip = [[NSWindow alloc] initWithContentRect: ctRect - styleMask: NSBorderlessWindowMask + styleMask: NSWindowStyleMaskBorderless backing: NSBackingStoreBuffered defer: NO]; [callTip setLevel: NSFloatingWindowLevel]; @@ -1418,7 +1418,7 @@ void ScintillaCocoa::StartDrag() { NSImage *dragImage = [[NSImage alloc] initWithSize: selectionRectangle.size]; dragImage.backgroundColor = [NSColor clearColor]; [dragImage lockFocus]; - [image drawAtPoint: NSZeroPoint fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 0.5]; + [image drawAtPoint: NSZeroPoint fromRect: NSZeroRect operation: NSCompositingOperationSourceOver fraction: 0.5]; [dragImage unlockFocus]; NSPoint startPoint; @@ -2094,17 +2094,17 @@ static inline UniChar KeyTranslate(UniChar unicodeChar, NSEventModifierFlags mod case 27: return SCK_ESCAPE; case '+': - if (modifierFlags & NSNumericPadKeyMask) + if (modifierFlags & NSEventModifierFlagNumericPad) return SCK_ADD; else return unicodeChar; case '-': - if (modifierFlags & NSNumericPadKeyMask) + if (modifierFlags & NSEventModifierFlagNumericPad) return SCK_SUBTRACT; else return unicodeChar; case '/': - if (modifierFlags & NSNumericPadKeyMask) + if (modifierFlags & NSEventModifierFlagNumericPad) return SCK_DIVIDE; else return unicodeChar; @@ -2129,10 +2129,10 @@ static inline UniChar KeyTranslate(UniChar unicodeChar, NSEventModifierFlags mod static int TranslateModifierFlags(NSUInteger modifiers) { // Signal Control as SCI_META return - (((modifiers & NSShiftKeyMask) != 0) ? SCI_SHIFT : 0) | - (((modifiers & NSCommandKeyMask) != 0) ? SCI_CTRL : 0) | - (((modifiers & NSAlternateKeyMask) != 0) ? SCI_ALT : 0) | - (((modifiers & NSControlKeyMask) != 0) ? SCI_META : 0); + (((modifiers & NSEventModifierFlagShift) != 0) ? SCI_SHIFT : 0) | + (((modifiers & NSEventModifierFlagCommand) != 0) ? SCI_CTRL : 0) | + (((modifiers & NSEventModifierFlagOption) != 0) ? SCI_ALT : 0) | + (((modifiers & NSEventModifierFlagControl) != 0) ? SCI_META : 0); } //-------------------------------------------------------------------------------------------------- @@ -2362,7 +2362,7 @@ void ScintillaCocoa::MouseUp(NSEvent *event) { //-------------------------------------------------------------------------------------------------- void ScintillaCocoa::MouseWheel(NSEvent *event) { - bool command = (event.modifierFlags & NSCommandKeyMask) != 0; + bool command = (event.modifierFlags & NSEventModifierFlagCommand) != 0; int dY = 0; // In order to make scrolling with larger offset smoother we scroll less lines the larger the |