aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-11-29 13:34:41 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-11-29 13:34:41 +0000
commitedddae32a7ded7a7a11f060a07957b51d9785b71 (patch)
treef11a30e006a4f8c1f26cf5118de919f4e51f76c3
parent664feae026dc0bf060281e408b3113bfaf74623f (diff)
downloadqemu-arm-edddae32a7ded7a7a11f060a07957b51d9785b71.tar.gz
ui/cocoa: Remove compatibility code for pre-10.10 OSX
Since we now require at least OSX 10.10 we can remove the compatibility hacks for earlier versions. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--ui/cocoa.m21
1 files changed, 0 insertions, 21 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 725e16c5a8..6cf808077a 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -38,15 +38,6 @@
#include <Carbon/Carbon.h>
#include "qom/cpu.h"
-#ifndef MAC_OS_X_VERSION_10_5
-#define MAC_OS_X_VERSION_10_5 1050
-#endif
-#ifndef MAC_OS_X_VERSION_10_6
-#define MAC_OS_X_VERSION_10_6 1060
-#endif
-#ifndef MAC_OS_X_VERSION_10_9
-#define MAC_OS_X_VERSION_10_9 1090
-#endif
#ifndef MAC_OS_X_VERSION_10_10
#define MAC_OS_X_VERSION_10_10 101000
#endif
@@ -82,13 +73,6 @@
#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask
#define NSWindowStyleMaskTitled NSTitledWindowMask
#endif
-/* 10.13 deprecates NSFileHandlingPanelOKButton in favour of
- * NSModalResponseOK, which was introduced in 10.9. Define
- * it for older versions.
- */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9
-#define NSModalResponseOK NSFileHandlingPanelOKButton
-#endif
//#define DEBUG
@@ -981,9 +965,7 @@ QemuCocoaView *cocoaView;
------------------------------------------------------
*/
@interface QemuCocoaAppController : NSObject
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
<NSWindowDelegate, NSApplicationDelegate>
-#endif
{
}
- (void)doToggleFullScreen:(id)sender;
@@ -1032,9 +1014,6 @@ QemuCocoaView *cocoaView;
[normalWindow setAcceptsMouseMovedEvents:YES];
[normalWindow setTitle:@"QEMU"];
[normalWindow setContentView:cocoaView];
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10)
- [normalWindow useOptimizedDrawing:YES];
-#endif
[normalWindow makeKeyAndOrderFront:self];
[normalWindow center];
[normalWindow setDelegate: self];