macosx: add NSFullScreenWindowMask to compatibilityFixes.h and avoid NSAnimationConte...

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index 651a4b9a0a0bede1114970c796b54da7a0857d9a..caab7d528187cd02b97767d49840e3671c90946f 100644 (file)
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -44,6 +44,10 @@ enum {
     NSApplicationPresentationAutoHideToolbar            = (1 << 11)
 };
 
+enum {
+    NSFullScreenWindowMask      = 1 << 14
+};
+
 enum {
     NSWindowAnimationBehaviorDefault = 0,       // let AppKit infer animation behavior for this window
     NSWindowAnimationBehaviorNone = 2,          // suppress inferred animations (don't animate)
@@ -67,4 +71,8 @@ typedef NSInteger NSWindowAnimationBehavior;
 - (BOOL)isDirectionInvertedFromDevice;
 @end
 
+@interface NSAnimationContext (IntroducedInLion)
++ (void)runAnimationGroup:(void (^)(NSAnimationContext *context))changes completionHandler:(void (^)(void))completionHandler;
+@end
+
 #endif

diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 062b0eab5a8bdd8f2c1adc39f89dbfff56d9ef82..2c56cc5a9b676ee3432284accf3c38a3425d4caa 100644 (file)
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -661,7 +661,6 @@
     [[[VLCMainWindow sharedInstance] fsPanel] setNonActive:nil];
 }
 
-#ifdef MAC_OS_X_VERSION_10_7
 -(NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow *)window
 {
     if (window == self) {
@@ -703,7 +702,6 @@
         [[window animator] setFrame:frameBeforeLionFullscreen display:YES animate:YES];
     } completionHandler:nil];
 }
-#endif
 
 - (void)windowWillEnterFullScreen:(NSNotification *)notification
 {