Merge pull request #9074 from electron/tabbing-mode-version-guard

Only define NSWindowTabbingModeDisallowed on pre-10.12 SDKs
2017-03-31 12:09:54 -07:00 · 2017-03-31 12:09:54 -07:00 · 0faa15c6ca
commit 0faa15c6ca
parent 8a01ebef63 08db63c3cc
1 changed files with 6 additions and 1 deletions
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@ -336,14 +336,19 @@ bool ScopedDisableResize::disable_resize_ = false;

@end

+#if !defined(MAC_OS_X_VERSION_10_12)
+
 enum {
  NSWindowTabbingModeDisallowed = 2
 };
+
@interface NSWindow (SierraSDK)
 - (void)setTabbingMode:(NSInteger)mode;
- (void)setTabbingIdentifier:(NSString *)identifier;
+- (void)setTabbingIdentifier:(NSString*)identifier;
@end

+#endif  // MAC_OS_X_VERSION_10_12
+
@interface AtomNSWindow : EventDispatchingWindow<QLPreviewPanelDataSource, QLPreviewPanelDelegate, NSTouchBarDelegate> {
 @private
  atom::NativeWindowMac* shell_;