macosx/CAS: add MKV to the black list for HTTP streaming

[vlc] / modules / gui / macosx / CompatibilityFixes.h

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index 2d62c8a0932a618dd2195235c69493c98a1d924b..b424754f9e2425e2bdc8410714618a3041d2f1dd 100644 (file)
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * sdkfixes.h: MacOS X interface module
+ * CompatibilityFixes.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -25,44 +25,14 @@
 
 #pragma mark -
 #pragma OS detection code
-#define OSX_LEOPARD (NSAppKitVersionNumber < 1038 && NSAppKitVersionNumber >= 949)
 #define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
-#define OSX_LION NSAppKitVersionNumber >= 1115.2
-
-#pragma mark -
-#pragma Fixes for OS X Leopard (10.5)
-
-#ifndef MAC_OS_X_VERSION_10_6
-
-@protocol NSAnimationDelegate <NSObject> @end
-@protocol NSWindowDelegate <NSObject> @end
-@protocol NSComboBoxDataSource <NSObject> @end
-@protocol NSTextFieldDelegate <NSObject> @end
-@protocol NSTableViewDataSource <NSObject> @end
-@protocol NSOutlineViewDelegate <NSObject> @end
-@protocol NSOutlineViewDataSource <NSObject> @end
-@protocol NSToolbarDelegate <NSObject> @end
-
-enum {
-    NSApplicationPresentationDefault                    = 0,
-    NSApplicationPresentationAutoHideDock               = (1 <<  0),
-    NSApplicationPresentationHideDock                   = (1 <<  1),
-    NSApplicationPresentationAutoHideMenuBar            = (1 <<  2),
-    NSApplicationPresentationHideMenuBar                = (1 <<  3),
-    NSApplicationPresentationDisableAppleMenu           = (1 <<  4),
-    NSApplicationPresentationDisableProcessSwitching    = (1 <<  5),
-    NSApplicationPresentationDisableForceQuit           = (1 <<  6),
-    NSApplicationPresentationDisableSessionTermination  = (1 <<  7),
-    NSApplicationPresentationDisableHideApplication     = (1 <<  8),
-    NSApplicationPresentationDisableMenuBarTransparency = (1 <<  9)
-};
-#endif
+#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
+#define OSX_MOUNTAIN_LION NSAppKitVersionNumber >= 1162
 
 #pragma mark -
 #pragma Fixes for OS X Snow Leopard (10.6)
 
 #ifndef MAC_OS_X_VERSION_10_7
-
 enum {
     NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
     NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
@@ -73,4 +43,17 @@ enum {
     NSApplicationPresentationAutoHideToolbar            = (1 << 11)
 };
 
+/* the following is just to fix warnings, not for implementation! */
+@interface NSWindow (IntroducedInLion)
+- (void)setRestorable:(BOOL)b_value;
+- (void)toggleFullScreen:(id)id_value;
+- (void)windowWillEnterFullScreen:(NSNotification *)notification;
+- (void)windowDidEnterFullScreen:(NSNotification *)notification;
+- (void)windowWillExitFullScreen:(NSNotification *)notification;
+@end
+
+@interface NSEvent (IntroducedInLion)
+- (BOOL)isDirectionInvertedFromDevice;
+@end
+
 #endif