geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed building with the macOS 10.8 SDK

main
Sam Lantinga 2021-11-14 20:15:48 -08:00
parent d7d67af441
commit cc094f4d7c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video/cocoa/SDL_cocoawindow.m
View File

@ -55,12 +55,19 @@
#ifndef MAC_OS_X_VERSION_10_12 #ifndef MAC_OS_X_VERSION_10_12
#define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
#endif #endif
#ifndef NSAppKitVersionNumber10_13_2
#define NSAppKitVersionNumber10_13_2 1561.2
#endif
#ifndef NSAppKitVersionNumber10_14 #ifndef NSAppKitVersionNumber10_14
#define NSAppKitVersionNumber10_14 1671 #define NSAppKitVersionNumber10_14 1671
#endif
@interface NSWindow (SDL)
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101000 /* Added in the 10.10 SDK */
@property (readonly) NSRect contentLayoutRect;
#endif #endif
/* This is available as of 10.13.2, but isn't in public headers */ /* This is available as of 10.13.2, but isn't in public headers */
@interface NSWindow (SDL)
@property (nonatomic) NSRect mouseConfinementRect; @property (nonatomic) NSRect mouseConfinementRect;
@end @end
@ -391,7 +398,7 @@ Cocoa_UpdateClipCursor(SDL_Window * window)
{ {
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
if (@available(macOS 10.13.2, *)) { if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_13_2) {
NSWindow *nswindow = data->nswindow; NSWindow *nswindow = data->nswindow;
SDL_Rect mouse_rect; SDL_Rect mouse_rect;
@ -1280,7 +1287,7 @@ Cocoa_UpdateClipCursor(SDL_Window * window)
x = (int)point.x; x = (int)point.x;
y = (int)(window->h - point.y); y = (int)(window->h - point.y);
if (@available(macOS 10.13.2, *)) { if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_13_2) {
/* Mouse grab is taken care of by the confinement rect */ /* Mouse grab is taken care of by the confinement rect */
} else { } else {
CGPoint cgpoint; CGPoint cgpoint;