[vlc-commits] macosx: add NSFullScreenWindowMask to compatibilityFixes.h and avoid NSAnimationContext warning

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat Mar  1 13:28:41 2014 +0100| [03e70c71d1d2cdbac3d0264c2d497838ada116fd] | committer: David Fuhrmann

macosx: add NSFullScreenWindowMask to compatibilityFixes.h and avoid NSAnimationContext warning

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

 modules/gui/macosx/CompatibilityFixes.h |    8 ++++++++
 modules/gui/macosx/Windows.m            |    2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index 651a4b9..caab7d5 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -45,6 +45,10 @@ enum {
 };
 
 enum {
+    NSFullScreenWindowMask      = 1 << 14
+};
+
+enum {
     NSWindowAnimationBehaviorDefault = 0,       // let AppKit infer animation behavior for this window
     NSWindowAnimationBehaviorNone = 2,          // suppress inferred animations (don't animate)
     NSWindowAnimationBehaviorDocumentWindow = 3,
@@ -67,4 +71,8 @@ typedef NSInteger NSWindowAnimationBehavior;
 - (BOOL)isDirectionInvertedFromDevice;
 @end
 
+ at interface NSAnimationContext (IntroducedInLion)
++ (void)runAnimationGroup:(void (^)(NSAnimationContext *context))changes completionHandler:(void (^)(void))completionHandler;
+ at end
+
 #endif
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 062b0ea..2c56cc5 100644
--- 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
 {