Mercurial > sdl-ios-xcode
changeset 4927:d716dff4b13e
Fixed touch events on Mac OS X 10.6
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 02 Dec 2010 11:56:23 -0800 |
| parents | ab02a7242f08 |
| children | aa8888658021 |
| files | src/video/cocoa/SDL_cocoawindow.m |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/cocoa/SDL_cocoawindow.m Wed Dec 01 12:52:48 2010 -0800 +++ b/src/video/cocoa/SDL_cocoawindow.m Thu Dec 02 11:56:23 2010 -0800 @@ -57,11 +57,13 @@ } else { [_data->nswindow setDelegate:self]; } +// FIXME: Why doesn't this work? +// [center addObserver:self selector:@selector(rightMouseDown:) name:[NSString stringWithCString:"rightMouseDown" encoding:NSUTF8StringEncoding] object:[_data->nswindow contentView]]; [center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp]; [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp]; [_data->nswindow setAcceptsMouseMovedEvents:YES]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 [[_data->nswindow contentView] setAcceptsTouchEvents:YES]; #endif } @@ -295,7 +297,7 @@ - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 NSSet *touches = 0; NSEnumerator *enumerator; NSTouch *touch; @@ -357,7 +359,7 @@ touch = (NSTouch*)[enumerator nextObject]; } -#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 */ +#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 */ } @end @@ -437,6 +439,9 @@ NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; NSView *contentView = [[SDLView alloc] initWithFrame: rect listener: data->listener]; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + [contentView setAcceptsTouchEvents:YES]; +#endif [nswindow setContentView: contentView]; [contentView release];