[vlc-commits] macosx: fix DVD menu control and usage of hotkeys with modifiers

Mon Jan 9 00:55:22 CET 2012

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jan  8 18:03:36 2012 +0100| [b8329984530011448504316d0e13a691671d01dd] | committer: Jean-Baptiste Kempf

macosx: fix DVD menu control and usage of hotkeys with modifiers

fixes both #5733 and #5806
(cherry picked from commit a3349c78515633fec940c37ef469252a730fb529)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 .../macosx/Resources/English.lproj/MainMenu.xib    |   11 +-
 modules/gui/macosx/MainWindow.m                    |    6 +-
 modules/gui/macosx/VideoView.h                     |    5 +-
 modules/gui/macosx/VideoView.m                     |  146 +++-----------------
 modules/video_output/macosx.m                      |    7 +-
 5 files changed, 37 insertions(+), 138 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=b8329984530011448504316d0e13a691671d01dd