From c9850562c64344356478d2fe614724d8931d7185 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 25 Aug 2011 03:11:28 -0400 Subject: [PATCH] Removed the MAC_OS_X_VERSION_10_x macros from the 1.3 branch. --- include/SDL_platform.h | 9 --------- src/audio/coreaudio/SDL_coreaudio.h | 2 +- src/video/cocoa/SDL_cocoaclipboard.m | 2 +- src/video/cocoa/SDL_cocoakeyboard.m | 10 +++++----- src/video/cocoa/SDL_cocoamodes.m | 26 +++++++++++++------------- src/video/cocoa/SDL_cocoashape.m | 2 +- src/video/cocoa/SDL_cocoavideo.h | 2 +- src/video/cocoa/SDL_cocoawindow.h | 2 +- src/video/cocoa/SDL_cocoawindow.m | 6 +++--- 9 files changed, 26 insertions(+), 35 deletions(-) diff --git a/include/SDL_platform.h b/include/SDL_platform.h index 9e7a33b02..ec29b06b8 100644 --- a/include/SDL_platform.h +++ b/include/SDL_platform.h @@ -74,15 +74,6 @@ /* lets us know what version of Mac OS X we're compiling on */ #include "AvailabilityMacros.h" #include "TargetConditionals.h" -#ifndef MAC_OS_X_VERSION_10_4 -#define MAC_OS_X_VERSION_10_4 1040 -#endif -#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 #if TARGET_OS_IPHONE /* if compiling for iPhone */ #undef __IPHONEOS__ diff --git a/src/audio/coreaudio/SDL_coreaudio.h b/src/audio/coreaudio/SDL_coreaudio.h index 1fa14ec51..511e1325f 100644 --- a/src/audio/coreaudio/SDL_coreaudio.h +++ b/src/audio/coreaudio/SDL_coreaudio.h @@ -32,7 +32,7 @@ #if MACOSX_COREAUDIO #include #include -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050 #include #endif #endif diff --git a/src/video/cocoa/SDL_cocoaclipboard.m b/src/video/cocoa/SDL_cocoaclipboard.m index 1d437aea0..3166708ce 100644 --- a/src/video/cocoa/SDL_cocoaclipboard.m +++ b/src/video/cocoa/SDL_cocoaclipboard.m @@ -26,7 +26,7 @@ static NSString * GetTextFormat(_THIS) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; if (data->osversion >= 0x1060) { diff --git a/src/video/cocoa/SDL_cocoakeyboard.m b/src/video/cocoa/SDL_cocoakeyboard.m index da1ac84eb..e420a2fe9 100644 --- a/src/video/cocoa/SDL_cocoakeyboard.m +++ b/src/video/cocoa/SDL_cocoakeyboard.m @@ -170,7 +170,7 @@ - (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange } /* Needs long instead of NSInteger for compilation on Mac OS X 10.4 */ -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - (long) conversationIdentifier #else - (NSInteger) conversationIdentifier @@ -481,7 +481,7 @@ - (NSArray *) validAttributesForMarkedText static void UpdateKeymap(SDL_VideoData *data) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 TISInputSourceRef key_layout; #else KeyboardLayoutRef key_layout; @@ -492,7 +492,7 @@ - (NSArray *) validAttributesForMarkedText SDL_Keycode keymap[SDL_NUM_SCANCODES]; /* See if the keymap needs to be updated */ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 key_layout = TISCopyCurrentKeyboardLayoutInputSource(); #else KLGetCurrentKeyboardLayout(&key_layout); @@ -505,7 +505,7 @@ - (NSArray *) validAttributesForMarkedText SDL_GetDefaultKeymap(keymap); /* Try Unicode data first (preferred as of Mac OS X 10.5) */ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 CFDataRef uchrDataRef = TISGetInputSourceProperty(key_layout, kTISPropertyUnicodeKeyLayoutData); if (uchrDataRef) chr_data = CFDataGetBytePtr(uchrDataRef); @@ -547,7 +547,7 @@ - (NSArray *) validAttributesForMarkedText return; } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 cleanup: CFRelease(key_layout); #else diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m index de59493ea..5babd40d1 100644 --- a/src/video/cocoa/SDL_cocoamodes.m +++ b/src/video/cocoa/SDL_cocoamodes.m @@ -27,10 +27,10 @@ #if FORCE_OLD_API #undef MAC_OS_X_VERSION_MIN_REQUIRED -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_MIN_REQUIRED 1050 #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 /* Add methods to get at private members of NSScreen. Since there is a bug in Apple's screen switching code @@ -122,7 +122,7 @@ - (void) setFrame:(NSRect)frame; } data->moderef = moderef; - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { CGDisplayModeRef vidmode = (CGDisplayModeRef) moderef; CFStringRef fmt = CGDisplayModeCopyPixelEncoding(vidmode); @@ -144,7 +144,7 @@ - (void) setFrame:(NSRect)frame; } #endif - #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 if (!IS_SNOW_LEOPARD_OR_LATER(_this)) { CFDictionaryRef vidmode = (CFDictionaryRef) moderef; number = CFDictionaryGetValue(vidmode, kCGDisplayWidth); @@ -181,7 +181,7 @@ - (void) setFrame:(NSRect)frame; Cocoa_ReleaseDisplayMode(_THIS, const void *moderef) { /* We don't own moderef unless we use the 10.6+ APIs. */ - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { CGDisplayModeRelease((CGDisplayModeRef) moderef); /* NULL is ok */ } @@ -192,7 +192,7 @@ - (void) setFrame:(NSRect)frame; Cocoa_ReleaseDisplayModeList(_THIS, CFArrayRef modelist) { /* We don't own modelis unless we use the 10.6+ APIs. */ - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { CFRelease(modelist); /* NULL is ok */ } @@ -242,13 +242,13 @@ - (void) setFrame:(NSRect)frame; continue; } - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { moderef = CGDisplayCopyDisplayMode(displays[i]); } #endif - #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 if (!IS_SNOW_LEOPARD_OR_LATER(_this)) { moderef = CGDisplayCurrentMode(displays[i]); } @@ -301,13 +301,13 @@ - (void) setFrame:(NSRect)frame; SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; CFArrayRef modes = NULL; - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { modes = CGDisplayCopyAllDisplayModes(data->display, NULL); } #endif - #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 if (!IS_SNOW_LEOPARD_OR_LATER(_this)) { modes = CGDisplayAvailableModes(data->display); } @@ -321,7 +321,7 @@ - (void) setFrame:(NSRect)frame; const void *moderef = CFArrayGetValueAtIndex(modes, i); SDL_DisplayMode mode; if (GetDisplayMode(_this, moderef, &mode)) { - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { CGDisplayModeRetain((CGDisplayModeRef) moderef); } @@ -337,13 +337,13 @@ - (void) setFrame:(NSRect)frame; static CGError Cocoa_SwitchMode(_THIS, CGDirectDisplayID display, const void *mode) { - #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 if (IS_SNOW_LEOPARD_OR_LATER(_this)) { return CGDisplaySetDisplayMode(display, (CGDisplayModeRef) mode, NULL); } #endif - #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 if (!IS_SNOW_LEOPARD_OR_LATER(_this)) { return CGDisplaySwitchToMode(display, (CFDictionaryRef) mode); } diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m index 977a2ebb9..19d432d5f 100644 --- a/src/video/cocoa/SDL_cocoashape.m +++ b/src/video/cocoa/SDL_cocoashape.m @@ -28,7 +28,7 @@ Cocoa_CreateShaper(SDL_Window* window) { SDL_WindowData* windata = (SDL_WindowData*)window->driverdata; [windata->nswindow setOpaque:NO]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 [windata->nswindow setStyleMask:NSBorderlessWindowMask]; #endif SDL_WindowShaper* result = result = malloc(sizeof(SDL_WindowShaper)); diff --git a/src/video/cocoa/SDL_cocoavideo.h b/src/video/cocoa/SDL_cocoavideo.h index d56e51c5b..d9389cf41 100644 --- a/src/video/cocoa/SDL_cocoavideo.h +++ b/src/video/cocoa/SDL_cocoavideo.h @@ -39,7 +39,7 @@ #include "SDL_cocoaopengl.h" #include "SDL_cocoawindow.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 #if __LP64__ typedef long NSInteger; typedef unsigned long NSUInteger; diff --git a/src/video/cocoa/SDL_cocoawindow.h b/src/video/cocoa/SDL_cocoawindow.h index 7a86fde70..d0e634eb2 100644 --- a/src/video/cocoa/SDL_cocoawindow.h +++ b/src/video/cocoa/SDL_cocoawindow.h @@ -28,7 +28,7 @@ typedef struct SDL_WindowData SDL_WindowData; /* *INDENT-OFF* */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 @interface Cocoa_WindowListener : NSResponder { #else @interface Cocoa_WindowListener : NSResponder { diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index e494d62ad..dbdfb5daa 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -67,7 +67,7 @@ - (void)listen:(SDL_WindowData *)data [window setAcceptsMouseMovedEvents:YES]; [view setNextResponder:self]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 [view setAcceptsTouchEvents:YES]; #endif } @@ -380,7 +380,7 @@ - (void)touchesCancelledWithEvent:(NSEvent *) theEvent - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 NSSet *touches = 0; NSEnumerator *enumerator; NSTouch *touch; @@ -442,7 +442,7 @@ - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event touch = (NSTouch*)[enumerator nextObject]; } -#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 */ +#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 */ } @end