Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiling with older Mac OS X SDK

Browse Source
This commit is contained in:
Sam Lantinga 2013-11-11 03:29:11 -08:00
parent 2384ad5b9e
commit f0692d656f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,10 +114,12 @@ GetWindowStyle(SDL_Window * window)
[center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:window]; [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:window];
[center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:window]; [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:window];
[center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:window]; [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:window];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
[center addObserver:self selector:@selector(windowWillEnterFullScreen:) name:NSWindowWillEnterFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowWillEnterFullScreen:) name:NSWindowWillEnterFullScreenNotification object:window];
[center addObserver:self selector:@selector(windowDidEnterFullScreen:) name:NSWindowDidEnterFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowDidEnterFullScreen:) name:NSWindowDidEnterFullScreenNotification object:window];
[center addObserver:self selector:@selector(windowWillExitFullScreen:) name:NSWindowWillExitFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowWillExitFullScreen:) name:NSWindowWillExitFullScreenNotification object:window];
[center addObserver:self selector:@selector(windowDidExitFullScreen:) name:NSWindowDidExitFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowDidExitFullScreen:) name:NSWindowDidExitFullScreenNotification object:window];
#endif /* Mac OS X 10.7+ */
} else { } else {
[window setDelegate:self]; [window setDelegate:self];
} }
@ -203,10 +205,12 @@ GetWindowStyle(SDL_Window * window)
[center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window]; [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window];
[center removeObserver:self name:NSWindowDidBecomeKeyNotification object:window]; [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:window];
[center removeObserver:self name:NSWindowDidResignKeyNotification object:window]; [center removeObserver:self name:NSWindowDidResignKeyNotification object:window];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
[center removeObserver:self name:NSWindowWillEnterFullScreenNotification object:window]; [center removeObserver:self name:NSWindowWillEnterFullScreenNotification object:window];
[center removeObserver:self name:NSWindowDidEnterFullScreenNotification object:window]; [center removeObserver:self name:NSWindowDidEnterFullScreenNotification object:window];
[center removeObserver:self name:NSWindowWillExitFullScreenNotification object:window]; [center removeObserver:self name:NSWindowWillExitFullScreenNotification object:window];
[center removeObserver:self name:NSWindowDidExitFullScreenNotification object:window]; [center removeObserver:self name:NSWindowDidExitFullScreenNotification object:window];
#endif /* Mac OS X 10.7+ */
} else { } else {
[window setDelegate:nil]; [window setDelegate:nil];
} }
@ -823,13 +827,17 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window)
return -1; return -1;
} }
[nswindow setBackgroundColor:[NSColor blackColor]]; [nswindow setBackgroundColor:[NSColor blackColor]];
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if ([nswindow respondsToSelector:@selector(setCollectionBehavior:)]) {
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
}
#endif
/* Create a default view for this window */ /* Create a default view for this window */
rect = [nswindow contentRectForFrameRect:[nswindow frame]]; rect = [nswindow contentRectForFrameRect:[nswindow frame]];
NSView *contentView = [[SDLView alloc] initWithFrame:rect]; NSView *contentView = [[SDLView alloc] initWithFrame:rect];
if ((window->flags & SDL_WINDOW_ALLOW_HIGHDPI) > 0) { if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
if ([contentView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) { if ([contentView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) {
[contentView setWantsBestResolutionOpenGLSurface:YES]; [contentView setWantsBestResolutionOpenGLSurface:YES];
} }
@ -1117,7 +1125,7 @@ Cocoa_SetWindowFullscreen_NewStyle(_THIS, SDL_Window * window, SDL_VideoDisplay
NSWindow *nswindow = data->nswindow; NSWindow *nswindow = data->nswindow;
if (fullscreen != [data->listener isToggledFullscreen]) { if (fullscreen != [data->listener isToggledFullscreen]) {
[nswindow toggleFullScreen:nil]; [nswindow performSelector: @selector(toggleFullScreen:) withObject:nswindow];
} }
ScheduleContextUpdates(data); ScheduleContextUpdates(data);
} }