[vlc-commits] macosx: disable native fullscreen checkbox in prefs if a change would have no effect

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat Mar 10 20:36:29 2012 +0100| [0a0a242c9a6ce40fea8f59685fdf7091cc62ad2d] | committer: David Fuhrmann

macosx: disable native fullscreen checkbox in prefs if a change would have no effect
(cherry picked from commit 50134d9405852b74a9844e44f154049a91eaef9e)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

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

 modules/gui/macosx/simple_prefs.m |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 09a353e..0bf32b9 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -463,12 +463,23 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     [self setupButton: o_intf_art_pop forIntList: "album-art"];
 
     [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
+
     [self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"];
+    BOOL b_correct_sdk = NO;
+#ifdef MAC_OS_X_VERSION_10_7
+    b_correct_sdk = YES;
+#endif
+    if( !b_correct_sdk || !OSX_LION )
+    {
+        [o_intf_nativefullscreen_ckb setState: NSOffState];
+        [o_intf_nativefullscreen_ckb setEnabled: NO];
+    }
+
     [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
 
-[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
+    [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
 
-[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
+    [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
     if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
         [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
     else