Preferences panel can be viewed on X.2. Closes #104.

+ fix hotkeys widget with macos < 10.3

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index cf199dbdf08d449ca254ee83e32e362d801259b2..72ababd32fc089aac149e981aa17e978282ce565 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -294,7 +294,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
     
     o_about = [[VLAboutBox alloc] init];
-    o_prefs = [[VLCPrefs alloc] init];
+    o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
 
     i_lastShownVolume = -1;
@@ -1415,6 +1415,9 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)viewPreferences:(id)sender
 {
+/* GRUIIIIIIIK */
+    if( o_prefs == nil )
+        o_prefs = [[VLCPrefs alloc] init];
     [o_prefs showPrefs];
 }
 

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 2d6c9949625a8cbc7383538e4d04ccefd79535c6..8352d4c0a33d2d3badd1427372ba740da58aa666 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -55,6 +55,7 @@
         action:nil keyEquivalent:@""];                                      \
     [o_mi setKeyEquivalentModifierMask:                                     \
         0];                                                                 \
+if( MACOS_VERSION >= 10.3 )                                                 \
     [o_mi setAlternate: NO];                                                \
     [o_mi setTag:                                                           \
         ( value )];                                                         \