diff options
author | Roland Knall <rknall@gmail.com> | 2018-11-01 12:09:02 +0100 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2018-11-01 15:02:36 +0000 |
commit | 5769a72963210da88551fbd7c553c1e2d82a7a0b (patch) | |
tree | d3b7e6eb709d5dab0f5136128b9123fb2fbfbda5 /ui/macosx | |
parent | 7306e2b8ee1231f2b889547dc75be54463c14d8d (diff) |
macOs: Fix build fix for tab view
Fix the build for displaying the tabs wrongly on mac
Change-Id: I58265b7cf9a4758885ef1add13417c42a467be9d
Reviewed-on: https://code.wireshark.org/review/30462
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/macosx')
-rw-r--r-- | ui/macosx/cocoa_bridge.mm | 5 | ||||
-rw-r--r-- | ui/macosx/macos_compat.h | 36 |
2 files changed, 39 insertions, 2 deletions
diff --git a/ui/macosx/cocoa_bridge.mm b/ui/macosx/cocoa_bridge.mm index 4423bed61d..0848b29d85 100644 --- a/ui/macosx/cocoa_bridge.mm +++ b/ui/macosx/cocoa_bridge.mm @@ -11,6 +11,7 @@ */ #include <ui/macosx/cocoa_bridge.h> +#include <ui/macosx/macos_compat.h> #import <Cocoa/Cocoa.h> @@ -20,8 +21,8 @@ void CocoaBridge::cleanOSGeneratedMenuItems() // Remove (don't allow) the "Show Tab Bar" menu item from the "View" menu, if // supported - if ([NSWindow respondsToSelector:@selector(allowsAutomaticWindowTabbing)]) - NSWindow.allowsAutomaticWindowTabbing = NO; + if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) + [NSWindow setAllowsAutomaticWindowTabbing: NO]; #endif [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSFullScreenMenuItemEverywhere"]; diff --git a/ui/macosx/macos_compat.h b/ui/macosx/macos_compat.h new file mode 100644 index 0000000000..515bb9eae6 --- /dev/null +++ b/ui/macosx/macos_compat.h @@ -0,0 +1,36 @@ +/* cocoa_bridge.h + * + * This code was taken directly from: + * https://forum.qt.io/topic/82609/remove-native-mac-menu-items-such-as-show-tab-bar + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef MACOS_COMPAT_H +#define MACOS_COMPAT_H + +#import <Cocoa/Cocoa.h> + +#if !defined(MAC_OS_X_VERSION_10_9) +# define MAC_OS_X_VERSION_10_9 1090 +#endif + +#if !defined(MAC_OS_X_VERSION_10_10) +# define MAC_OS_X_VERSION_10_10 101000 +#endif + +#if !defined(MAC_OS_X_VERSION_10_12) +# define MAC_OS_X_VERSION_10_12 101200 +#endif + +#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12) +@interface NSWindow (macOS10_12_SDK) ++ (void)setAllowsAutomaticWindowTabbing:(BOOL)allow; +@end +#endif + +#endif // MACOS_COMPAT_H |