* Fix for the disabled menu's under Tiger.

Apparently menu's got smarter in Tiger. As a workaround for the old version, you should first open the Help menu and then drag to the other menu's.

This still isn't the correct way to fix it. We should attach a callback function to the autogenerated menu's and have the callback function update the menu. (but this will work for now).

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 78de7cddd3f65b1b3e959e9947cb0b71e8fca734..b70b5c8a2315a0565861256f5e42817e94dcdde6 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -587,6 +587,7 @@
         {
             bEnabled = FALSE;
         }
+               [o_main setupMenus]; /* Make sure input menu is up to date */
     }
     else if( [[o_mi title] isEqualToString: _NS("Previous")] ||
              [[o_mi title] isEqualToString: _NS("Next")] )
@@ -637,6 +638,7 @@
     else if( [[o_mi title] isEqualToString: _NS("Mute")] ) 
     {
         [o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState];
+               [o_main setupMenus]; /* Make sure audio menu is up to date */
     }
     else if( [[o_mi title] isEqualToString: _NS("Half Size")] ||
                 [[o_mi title] isEqualToString: _NS("Normal Size")] ||
@@ -683,6 +685,7 @@
         {
             bEnabled = FALSE;
         }
+               [o_main setupMenus]; /* Make sure video menu is up to date */
     }
 
 

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 1cee2881aed40f93a08bd5ffed46c675eefbaeaf..2e2f1cbd3b00a6ac2b68fd8e823e013cabf33ea7 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1591,12 +1591,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     NSString *o_title = [o_mi title];
     BOOL bEnabled = TRUE;
 
-    if( [o_title isEqualToString: _NS("License")] )
-    {
-        /* we need to do this only once */
-        [self setupMenus];
-    }
-
     /* Recent Items Menu */
     if( [o_title isEqualToString: _NS("Clear Menu")] )
     {