Merge pull request #153 from macvim-dev/revert-80-modal-sheet-warnings

splhack · splhack · commit a1e5b6e15d19 · 2015-11-20T12:37:03.000-08:00
Revert "Fix beginModalSheetForWindow warning." to fix #152
diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m
@@ -1532,15 +1532,10 @@ - (void)handleShowDialog:(NSDictionary *)attr
         }
     }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_10
-  [alert beginSheetModalForWindow:[windowController window]
-                completionHandler: ^(NSModalResponse code) { [self alertDidEnd:alert code:code context:NULL]; }];
-#else
     [alert beginSheetModalForWindow:[windowController window]
                       modalDelegate:self
                      didEndSelector:@selector(alertDidEnd:code:context:)
                         contextInfo:NULL];
-#endif
 
     [alert release];
 }

Original file line number	Diff line number	Diff line change
`@@ -1532,15 +1532,10 @@ - (void)handleShowDialog:(NSDictionary *)attr`
`1532`	`1532`	`}`
`1533`	`1533`	`}`
`1534`	`1534`
`1535`		`-#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_10`
`1536`		`- [alert beginSheetModalForWindow:[windowController window]`
`1537`		`- completionHandler: ^(NSModalResponse code) { [self alertDidEnd:alert code:code context:NULL]; }];`
`1538`		`-#else`
`1539`	`1535`	`[alert beginSheetModalForWindow:[windowController window]`
`1540`	`1536`	`modalDelegate:self`
`1541`	`1537`	`didEndSelector:@selector(alertDidEnd:code:context:)`
`1542`	`1538`	`contextInfo:NULL];`
`1543`		`-#endif`
`1544`	`1539`
`1545`	`1540`	`[alert release];`
`1546`	`1541`	`}`