Rename a bunch of constants to fix deprecation warnings (10.12)

Applications/NewApplication/src/AppDelegate.mm

@@ -204,7 +204,7 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 
 - (void)applicationDidFinishLaunching:(NSNotification*)aNotification
 {
-	_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 400) styleMask:(NSTitledWindowMask|NSResizableWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO];
+	_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 400) styleMask:(NSWindowStyleMaskTitled|NSWindowStyleMaskResizable|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable) backing:NSBackingStoreBuffered defer:NO];
 	_window.releasedWhenClosed = NO;
 	_window.delegate           = self;
 	_window.title              = @"New Application";

Applications/TextMate/src/AboutWindowController.mm

@@ -98,7 +98,7 @@ - (id)init
 	rect.origin.y = round(NSMinY(visibleRect) + dy*3/4);
 	rect.origin.x = NSMaxY(visibleRect) - NSMaxY(rect);
 
-	NSWindow* win = [[NSWindow alloc] initWithContentRect:rect styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO];
+	NSWindow* win = [[NSWindow alloc] initWithContentRect:rect styleMask:(NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable|NSWindowStyleMaskMiniaturizable) backing:NSBackingStoreBuffered defer:NO];
 	if((self = [super initWithWindow:win]))
 	{
 		self.toolbar = [[NSToolbar alloc] initWithIdentifier:@"About TextMate"];

Applications/TextMate/src/AppController Documents.mm

@@ -42,7 +42,7 @@ - (void)openDocument:(id)sender
 	openPanel.title                           = [NSString stringWithFormat:@"%@: Open", [[[NSBundle mainBundle] localizedInfoDictionary] valueForKey: @"CFBundleName"] ?: [[NSProcessInfo processInfo] processName]];
 
 	[openPanel setShowsHiddenFilesCheckBox:YES];
-	if([openPanel runModal] == NSOKButton)
+	if([openPanel runModal] == NSModalResponseOK)
 	{
 		NSMutableArray* filenames = [NSMutableArray array];
 		for(NSURL* url in [openPanel URLs])

Applications/TextMate/src/AppController.mm

@@ -47,7 +47,7 @@ void OakOpenDocuments (NSArray* paths, BOOL treatFilePackageAsFolder)
 	NSMutableArray<OakDocument*>* documents = [NSMutableArray array];
 	NSMutableArray* itemsToInstall = [NSMutableArray array];
 	NSMutableArray* plugInsToInstall = [NSMutableArray array];
-	BOOL enableInstallHandler = treatFilePackageAsFolder == NO && ([NSEvent modifierFlags] & NSAlternateKeyMask) == 0;
+	BOOL enableInstallHandler = treatFilePackageAsFolder == NO && ([NSEvent modifierFlags] & NSEventModifierFlagOption) == 0;
 	for(NSString* path in paths)
 	{
 		BOOL isDirectory = NO;
@@ -448,19 +448,19 @@ - (void)setCurrentResponderIsOakTextView:(BOOL)flag
 			forwardMenuItem.keyEquivalent                = @"";
 
 			shiftLeftMenuItem.keyEquivalent              = @"[";
-			shiftLeftMenuItem.keyEquivalentModifierMask  = NSCommandKeyMask;
+			shiftLeftMenuItem.keyEquivalentModifierMask  = NSEventModifierFlagCommand;
 			shiftRightMenuItem.keyEquivalent             = @"]";
-			shiftRightMenuItem.keyEquivalentModifierMask = NSCommandKeyMask;
+			shiftRightMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand;
 		}
 		else
 		{
 			shiftLeftMenuItem.keyEquivalent           = @"";
 			shiftRightMenuItem.keyEquivalent          = @"";
 
 			backMenuItem.keyEquivalent                = @"[";
-			backMenuItem.keyEquivalentModifierMask    = NSCommandKeyMask;
+			backMenuItem.keyEquivalentModifierMask    = NSEventModifierFlagCommand;
 			forwardMenuItem.keyEquivalent             = @"]";
-			forwardMenuItem.keyEquivalentModifierMask = NSCommandKeyMask;
+			forwardMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand;
 		}
 	}
 }
@@ -574,7 +574,7 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 		NSString* promptUser = nil;
 		if(path::exists(prematureTerminationDuringRestore))
 			promptUser = @"Previous attempt of restoring your session caused an abnormal exit. Would you like to skip session restore?";
-		else if([NSEvent modifierFlags] & NSShiftKeyMask)
+		else if([NSEvent modifierFlags] & NSEventModifierFlagShift)
 			promptUser = @"By holding down shift (⇧) you have indicated that you wish to disable restoring the documents which were open in last session.";
 
 		if(promptUser)

Applications/TextMate/src/Favorites.mm

@@ -118,7 +118,7 @@ - (NSView*)tableView:(NSTableView*)aTableView viewForTableColumn:(NSTableColumn*
 	if(!res)
 	{
 		NSButton* removeButton = [NSButton new];
-		[[removeButton cell] setControlSize:NSSmallControlSize];
+		[[removeButton cell] setControlSize:NSControlSizeSmall];
 		removeButton.refusesFirstResponder = YES;
 		removeButton.bezelStyle = NSRoundRectBezelStyle;
 		removeButton.buttonType = NSMomentaryPushInButton;

Applications/TextMate/src/main.mm

@@ -23,7 +23,7 @@ static void sig_term_handler (void* unused)
 	[DocumentWindowController saveSessionIncludingUntitledDocuments:YES];
 	[[NSNotificationCenter defaultCenter] postNotificationName:NSApplicationWillTerminateNotification object:NSApp];
 	[NSApp stop:nil];
-	[NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:0 context:NULL subtype:0 data1:0 data2:0] atStart:NO];
+	[NSApp postEvent:[NSEvent otherEventWithType:NSEventTypeApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:0 context:NULL subtype:0 data1:0 data2:0] atStart:NO];
 	[[NSUserDefaults standardUserDefaults] synchronize];
 }
 

Frameworks/CommitWindow/src/CWTableCellView.mm

@@ -11,15 +11,15 @@ - (id)init
 		self.textField = textField;
 
 		NSButton* commitCheckBox = OakCreateCheckBox(@"");
-		[commitCheckBox.cell setControlSize:NSSmallControlSize];
+		[commitCheckBox.cell setControlSize:NSControlSizeSmall];
 		_commitCheckBox = commitCheckBox;
 
 		NSTextField* statusTextField = OakCreateLabel();
 		_statusTextField = statusTextField;
 
 		NSButton* diffButton = OakCreateButton(@"Diff", NSRoundedBezelStyle);
 		diffButton.font = [NSFont messageFontOfSize:9];
-		[diffButton.cell setControlSize: NSMiniControlSize];
+		[diffButton.cell setControlSize: NSControlSizeMini];
 		_diffButton = diffButton;
 
 		[textField        bind:NSValueBinding toObject:self withKeyPath:@"objectValue.path"      options:0];

Frameworks/CommitWindow/src/CommitWindow.mm

@@ -146,20 +146,20 @@ - (id)initWithOptions:(NSDictionary*)someOptions
 
 		[CWStatusStringTransformer register];
 
-		self.window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 600, 350) styleMask:NSTitledWindowMask|NSResizableWindowMask backing:NSBackingStoreBuffered defer:NO];
+		self.window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 600, 350) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO];
 		self.window.delegate          = self;
 		self.window.frameAutosaveName = @"Commit Window";
 
 		_commitButton = OakCreateButton([self commitButtonTitle], NSRoundedBezelStyle);
 		_commitButton.action                    = @selector(performCommit:);
 		_commitButton.keyEquivalent             = @"\r";
-		_commitButton.keyEquivalentModifierMask = NSCommandKeyMask;
+		_commitButton.keyEquivalentModifierMask = NSEventModifierFlagCommand;
 		_commitButton.target                    = self;
 
 		_cancelButton = OakCreateButton(@"Cancel", NSRoundedBezelStyle);
 		_cancelButton.action                    = @selector(cancel:);
 		_cancelButton.keyEquivalent             = @".";
-		_cancelButton.keyEquivalentModifierMask = NSCommandKeyMask;
+		_cancelButton.keyEquivalentModifierMask = NSEventModifierFlagCommand;
 		_cancelButton.target                    = self;
 
 		_showTableButton = [[NSButton alloc] initWithFrame:NSZeroRect];
@@ -207,19 +207,19 @@ - (id)initWithOptions:(NSDictionary*)someOptions
 		if(self.showContinueSuffix)
 		{
 			__weak auto wealf = self;
-			_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^NSEvent*(NSEvent* event){
+			_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskFlagsChanged handler:^NSEvent*(NSEvent* event){
 				if(![wealf.window isKeyWindow])
 					return event;
 
-				if([event modifierFlags] & NSAlternateKeyMask)
+				if([event modifierFlags] & NSEventModifierFlagOption)
 				{
-					wealf.commitButton.keyEquivalentModifierMask |= NSAlternateKeyMask;
+					wealf.commitButton.keyEquivalentModifierMask |= NSEventModifierFlagOption;
 					wealf.commitButton.action = @selector(performCommit:);
 					wealf.showContinueSuffix = NO;
 				}
 				else
 				{
-					wealf.commitButton.keyEquivalentModifierMask &= ~NSAlternateKeyMask;
+					wealf.commitButton.keyEquivalentModifierMask &= ~NSEventModifierFlagOption;
 					wealf.commitButton.action = @selector(performCommitAndContinue:);
 					wealf.showContinueSuffix = YES;
 				}

Frameworks/DocumentWindow/src/DocumentWindowController.mm

@@ -203,7 +203,7 @@ - (id)init
 		self.layoutView.tabBarView   = self.tabBarView;
 		self.layoutView.documentView = self.documentView;
 
-		NSUInteger windowStyle = (NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask|NSTexturedBackgroundWindowMask);
+		NSUInteger windowStyle = (NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable|NSWindowStyleMaskMiniaturizable|NSWindowStyleMaskTexturedBackground);
 		self.window = [[NSWindow alloc] initWithContentRect:[NSWindow contentRectForFrameRect:[self frameRectForNewWindow] styleMask:windowStyle] styleMask:windowStyle backing:NSBackingStoreBuffered defer:NO];
 		self.window.collectionBehavior = NSWindowCollectionBehaviorFullScreenPrimary;
 		self.window.delegate           = self;
@@ -278,7 +278,7 @@ - (NSRect)frameRectForNewWindow
 	std::map<CGFloat, NSWindow*> ourWindows;
 	for(NSWindow* win in [NSApp windows])
 	{
-		if([win isVisible] && [win isOnActiveSpace] && ![win isZoomed] && (([win styleMask] & NSFullScreenWindowMask)) != NSFullScreenWindowMask && [[win delegate] isKindOfClass:[self class]])
+		if([win isVisible] && [win isOnActiveSpace] && ![win isZoomed] && (([win styleMask] & NSWindowStyleMaskFullScreen)) != NSWindowStyleMaskFullScreen && [[win delegate] isKindOfClass:[self class]])
 			ourWindows.emplace(NSMaxY([win frame]), win);
 	}
 
@@ -321,7 +321,7 @@ - (NSRect)frameRectForNewWindow
 
 - (void)windowWillClose:(NSNotification*)aNotification
 {
-	if((([self.window styleMask] & NSFullScreenWindowMask) != NSFullScreenWindowMask) && !self.window.isZoomed)
+	if((([self.window styleMask] & NSWindowStyleMaskFullScreen) != NSWindowStyleMaskFullScreen) && !self.window.isZoomed)
 		[[NSUserDefaults standardUserDefaults] setObject:NSStringFromRect([self windowFrame]) forKey:@"DocumentControllerWindowFrame"];
 
 	[_arrayController unbind:NSContentBinding];
@@ -1786,7 +1786,7 @@ - (void)setFileBrowserVisible:(BOOL)makeVisibleFlag
 				[self revealFileInProject:self];
 		}
 
-		if(!self.disableFileBrowserWindowResize && ([self.window styleMask] & NSFullScreenWindowMask) != NSFullScreenWindowMask)
+		if(!self.disableFileBrowserWindowResize && ([self.window styleMask] & NSWindowStyleMaskFullScreen) != NSWindowStyleMaskFullScreen)
 		{
 			NSRect windowFrame = self.window.frame;
 
@@ -2397,7 +2397,7 @@ - (NSRect)previewPanel:(QLPreviewPanel*)panel sourceFrameOnScreenForPreviewItem:
 
 - (BOOL)previewPanel:(QLPreviewPanel*)panel handleEvent:(NSEvent*)event
 {
-	if([event type] == NSKeyDown)
+	if([event type] == NSEventTypeKeyDown)
 	{
 		[self.fileBrowser.outlineView keyDown:event];
 		NSArray* newSelection = self.fileBrowser.selectedURLs;
@@ -2567,7 +2567,7 @@ - (NSDictionary*)sessionInfoIncludingUntitledDocuments:(BOOL)includeUntitled
 	if(NSDictionary* history = self.fileBrowserHistory)
 		res[@"fileBrowserState"] = history;
 
-	if(([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask)
+	if(([self.window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen)
 		res[@"fullScreen"] = @YES;
 	else if(self.window.isZoomed)
 		res[@"zoomed"] = @YES;

Frameworks/DocumentWindow/src/OakRunCommandWindowController.mm

@@ -32,14 +32,14 @@ + (instancetype)sharedInstance
 
 - (id)init
 {
-	if((self = [super initWithWindow:[[NSPanel alloc] initWithContentRect:NSZeroRect styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO]]))
+	if((self = [super initWithWindow:[[NSPanel alloc] initWithContentRect:NSZeroRect styleMask:(NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable|NSWindowStyleMaskMiniaturizable) backing:NSBackingStoreBuffered defer:NO]]))
 	{
 		self.outputType           = output::replace_input;
 		self.myConstraints        = [NSMutableArray new];
 
-		self.commandLabel         = OakCreateLabel(@"Command:", nil, NSRightTextAlignment);
+		self.commandLabel         = OakCreateLabel(@"Command:", nil, NSTextAlignmentRight);
 		self.commandComboBox      = OakCreateComboBox();
-		self.resultLabel          = OakCreateLabel(@"Result:", nil, NSRightTextAlignment);
+		self.resultLabel          = OakCreateLabel(@"Result:", nil, NSTextAlignmentRight);
 		self.resultPopUpButton    = OakCreatePopUpButton();
 		self.executeButton        = OakCreateButton(@"Execute");
 		self.cancelButton         = OakCreateButton(@"Cancel");

Frameworks/DocumentWindow/src/ProjectLayoutView.mm

@@ -315,7 +315,7 @@ - (void)mouseDown:(NSEvent*)anEvent
 	else if(NSMouseInRect(mouseDownPos, [self htmlOutputResizeRect], [self isFlipped]))
 		view = _htmlOutputView;
 
-	if(!view || [anEvent type] != NSLeftMouseDown)
+	if(!view || [anEvent type] != NSEventTypeLeftMouseDown)
 	{
 		[super mouseDown:anEvent];
 	}
@@ -339,10 +339,10 @@ - (void)mouseDown:(NSEvent*)anEvent
 		NSRect initialFrame = view.frame;
 
 		BOOL didDrag = NO;
-		while([anEvent type] != NSLeftMouseUp)
+		while([anEvent type] != NSEventTypeLeftMouseUp)
 		{
-			anEvent = [NSApp nextEventMatchingMask:(NSLeftMouseDraggedMask|NSLeftMouseDownMask|NSLeftMouseUpMask) untilDate:[NSDate distantFuture] inMode:NSEventTrackingRunLoopMode dequeue:YES];
-			if([anEvent type] != NSLeftMouseDragged)
+			anEvent = [NSApp nextEventMatchingMask:(NSEventMaskLeftMouseDragged|NSEventMaskLeftMouseDown|NSEventMaskLeftMouseUp) untilDate:[NSDate distantFuture] inMode:NSEventTrackingRunLoopMode dequeue:YES];
+			if([anEvent type] != NSEventTypeLeftMouseDragged)
 				break;
 
 			NSPoint mouseCurrentPos = [self convertPoint:[anEvent locationInWindow] fromView:nil];

Frameworks/DocumentWindow/src/SelectGrammarViewController.mm

@@ -29,7 +29,7 @@ @interface SelectGrammarViewController ()
 	NSButton* res = OakCreateButton(title);
 	[res setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
 	res.font             = [NSFont messageFontOfSize:[NSFont smallSystemFontSize]];
-	res.cell.controlSize = NSSmallControlSize;
+	res.cell.controlSize = NSControlSizeSmall;
 	res.action           = action;
 	res.target           = target;
 	res.tag              = tag;
@@ -68,7 +68,7 @@ - (void)loadView
 	[_label setContentCompressionResistancePriority:NSLayoutPriorityDefaultLow forOrientation:NSLayoutConstraintOrientationHorizontal];
 
 	_progressIndicator = [NSProgressIndicator new];
-	_progressIndicator.controlSize          = NSSmallControlSize;
+	_progressIndicator.controlSize          = NSControlSizeSmall;
 	_progressIndicator.maxValue             = 1;
 	_progressIndicator.indeterminate        = YES;
 	_progressIndicator.displayedWhenStopped = NO;
@@ -95,10 +95,10 @@ - (void)loadView
 
 	self.neverButton.hidden = YES;
 
-	_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^NSEvent*(NSEvent* event){
-		NSUInteger modifierFlags = [self.view.window isKeyWindow] ? ([event modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)) : 0;
-		self.neverButton.hidden  = modifierFlags != NSAlternateKeyMask;
-		self.notNowButton.hidden = modifierFlags == NSAlternateKeyMask;
+	_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskFlagsChanged handler:^NSEvent*(NSEvent* event){
+		NSUInteger modifierFlags = [self.view.window isKeyWindow] ? ([event modifierFlags] & (NSEventModifierFlagShift|NSEventModifierFlagControl|NSEventModifierFlagOption|NSEventModifierFlagCommand)) : 0;
+		self.neverButton.hidden  = modifierFlags != NSEventModifierFlagOption;
+		self.notNowButton.hidden = modifierFlags == NSEventModifierFlagOption;
 		return event;
 	}];
 }

Frameworks/Find/src/FFResultsViewController.mm

@@ -48,7 +48,7 @@ @implementation OakSearchResultsCheckboxView
 - (id)initWithFrame:(NSRect)aFrame
 {
 	NSButton* button = OakCreateCheckBox(nil);
-	[[button cell] setControlSize:NSSmallControlSize];
+	[[button cell] setControlSize:NSControlSizeSmall];
 	[button sizeToFit];
 	[button setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 
@@ -183,13 +183,13 @@ - (id)initWithViewController:(FFResultsViewController*)viewController
 
 		NSButton* countOfLeafs = [NSButton new];
 		[[countOfLeafs cell] setHighlightsBy:NSNoCellMask];
-		countOfLeafs.alignment  = NSCenterTextAlignment;
+		countOfLeafs.alignment  = NSTextAlignmentCenter;
 		countOfLeafs.bezelStyle = NSInlineBezelStyle;
 		countOfLeafs.font       = [NSFont labelFontOfSize:0];
 		countOfLeafs.identifier = @"countOfLeafs";
 
 		NSButton* remove = [NSButton new];
-		[[remove cell] setControlSize:NSSmallControlSize];
+		[[remove cell] setControlSize:NSControlSizeSmall];
 		remove.bezelStyle = NSRoundRectBezelStyle;
 		remove.buttonType = NSMomentaryPushInButton;
 		remove.image      = [NSImage imageNamed:NSImageNameRemoveTemplate];
@@ -251,7 +251,7 @@ - (void)setShowKeyEquivalent:(BOOL)flag
 		[path stroke];
 
 		NSMutableParagraphStyle* pStyle = [NSMutableParagraphStyle new];
-		[pStyle setAlignment:NSCenterTextAlignment];
+		[pStyle setAlignment:NSTextAlignmentCenter];
 		NSDictionary* attributes = @{
 			NSFontAttributeName            : [NSFont boldSystemFontOfSize:0],
 			NSForegroundColorAttributeName : color,
@@ -352,17 +352,17 @@ - (void)loadView
 		_outlineView.action       = @selector(didSingleClick:);
 		_outlineView.doubleAction = @selector(didDoubleClick:);
 
-		_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^NSEvent*(NSEvent* event){
-			NSUInteger modifierFlags = [_outlineView.window isKeyWindow] ? ([event modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)) : 0;
+		_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskFlagsChanged handler:^NSEvent*(NSEvent* event){
+			NSUInteger modifierFlags = [_outlineView.window isKeyWindow] ? ([event modifierFlags] & (NSEventModifierFlagShift|NSEventModifierFlagControl|NSEventModifierFlagOption|NSEventModifierFlagCommand)) : 0;
 			if(_longPressedCommandModifier)
 			{
-				self.showKeyEquivalent = modifierFlags == NSCommandKeyMask;
+				self.showKeyEquivalent = modifierFlags == NSEventModifierFlagCommand;
 				if(modifierFlags == 0)
 					_longPressedCommandModifier = NO;
 			}
 			else
 			{
-				if(modifierFlags == NSCommandKeyMask)
+				if(modifierFlags == NSEventModifierFlagCommand)
 						[self performSelector:@selector(delayedLongPressedCommandModifier:) withObject:self afterDelay:0.2];
 				else	[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(delayedLongPressedCommandModifier:) object:self];
 			}

Frameworks/Find/src/Find.mm

@@ -296,7 +296,7 @@ - (void)performFindAction:(FindActionTag)action withWindowController:(FindWindow
 			case FindActionReplace:        _findOperation = kFindOperationReplace;                                                          break;
 		}
 
-		self.closeWindowOnSuccess = action == FindActionFindNext && [[NSApp currentEvent] type] == NSKeyDown && to_s([NSApp currentEvent]) == utf8::to_s(NSCarriageReturnCharacter);
+		self.closeWindowOnSuccess = action == FindActionFindNext && [[NSApp currentEvent] type] == NSEventTypeKeyDown && to_s([NSApp currentEvent]) == utf8::to_s(NSCarriageReturnCharacter);
 		[OakPasteboard pasteboardWithName:NSFindPboard].auxiliaryOptionsForCurrent = nil;
 		[NSApp sendAction:@selector(performFindOperation:) to:nil from:self];
 	}