[vlc-commits] macosx: tweak conditional code handling

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun 14 17:39:20 2016 +0200| [e5660d61f3099f49693a94ef4e96bee83f7188f6] | committer: Felix Paul Kühne

macosx: tweak conditional code handling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5660d61f3099f49693a94ef4e96bee83f7188f6
---

 modules/gui/macosx/MainWindowTitle.m |    2 +-
 modules/gui/macosx/StringUtility.m   |    2 +-
 modules/gui/macosx/Windows.m         |    2 +-
 modules/gui/macosx/about.m           |    2 +-
 modules/gui/macosx/misc.m            |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m
index 114b1fc..1e45be5 100644
--- a/modules/gui/macosx/MainWindowTitle.m
+++ b/modules/gui/macosx/MainWindowTitle.m
@@ -89,7 +89,7 @@
 {
     b_nativeFullscreenMode = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
 
-    if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN) {
+    if (!b_nativeFullscreenMode || OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA) {
         [_fullscreenButton setHidden: YES];
     }
 
diff --git a/modules/gui/macosx/StringUtility.m b/modules/gui/macosx/StringUtility.m
index 3640c4c..19783f0 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -532,7 +532,7 @@ NSString *toNSStr(const char *str) {
 NSImage *imageFromRes(NSString *o_id)
 {
     NSString *result = @"";
-    if (OSX_YOSEMITE || OSX_EL_CAPITAN) {
+    if (OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA) {
         result = [result stringByAppendingString:@"ys-"];
     }
 
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 3303f16..c2e88a3 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -334,7 +334,7 @@
 
     if (b_nativeFullscreenMode) {
         [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
-    } else if (OSX_EL_CAPITAN) {
+    } else if (OSX_EL_CAPITAN || OSX_SIERRA) {
         // Native fullscreen seems to be default on El Capitan, this disables it explicitely
         [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
     }
diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 39c3e1a..e163d9f 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -139,7 +139,7 @@
                                  "\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
                                  "underline; color:#0057ae;\">Help and join us!</span></a>"));
     NSString *fontfamily;
-    if (OSX_YOSEMITE || OSX_EL_CAPITAN)
+    if (OSX_YOSEMITE || OSX_EL_CAPITAN || OSX_SIERRA)
         fontfamily = @"Helvetica Neue";
     else
         fontfamily = @"Lucida Grande";
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index e272ec7..e4c30e3 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -173,7 +173,7 @@ static bool b_old_spaces_style = YES;
     /* init our fake object attribute */
     blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
 
-    if (OSX_MAVERICKS || OSX_YOSEMITE || OSX_EL_CAPITAN) {
+    if (!OSX_LION && !OSX_MOUNTAIN_LION) {
         NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
         [userDefaults addSuiteNamed:@"com.apple.spaces"];
         /* this is system settings -> mission control -> monitors using different spaces */