diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-04-10 23:47:01 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-04-12 18:44:43 +0200 |
| commit | 9dd8b3d430cc4d5f385b97e03e02fbc9865d069c (patch) | |
| tree | c182d40dd56733ff55f81e6fa26e1711cea8942f /src/video/cocoa/cocoa_v.h | |
| parent | 0e5be3887cd6d77a4f6ab1e8a1b23701de7f12e7 (diff) | |
| download | openttd-9dd8b3d430cc4d5f385b97e03e02fbc9865d069c.tar.xz | |
Remove: [OSX] Stuff that is pre-10.7 from the Cocoa/Quartz video driver.
Diffstat (limited to 'src/video/cocoa/cocoa_v.h')
| -rw-r--r-- | src/video/cocoa/cocoa_v.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h index ee8c29c85..7286c685b 100644 --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -190,10 +190,8 @@ public: extern CocoaSubdriver *_cocoa_subdriver; #ifdef ENABLE_COCOA_QUARTZ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp); #endif -#endif void QZ_GameSizeChanged(); @@ -223,16 +221,7 @@ uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_i @end /** Subclass of NSView to fix Quartz rendering and mouse awareness */ -@interface OTTD_CocoaView : NSView -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 - <NSTextInputClient, NSTextInput> -# else - <NSTextInputClient> -# endif /* MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 */ -#else - <NSTextInput> -#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 */ +@interface OTTD_CocoaView : NSView <NSTextInputClient> { CocoaSubdriver *driver; NSTrackingRectTag trackingtag; @@ -252,10 +241,7 @@ uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_i @end /** Delegate for our NSWindow to send ask for quit on close */ -@interface OTTD_CocoaWindowDelegate : NSObject -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - <NSWindowDelegate> -#endif +@interface OTTD_CocoaWindowDelegate : NSObject <NSWindowDelegate> { CocoaSubdriver *driver; } |