kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes to hotkey event handler.

CQTexperiment
Chris Moeller 2016-05-05 14:03:58 -07:00
parent 68db8edae3
commit 7b940443af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/NDHotKey/NDHotKey/NDHotKeyEvent.m
View File

@ -79,7 +79,7 @@ static NSHashTable * allHotKeyEvents = NULL;
static EventHandlerRef hotKeysEventHandler = NULL; static EventHandlerRef hotKeysEventHandler = NULL;
static OSType signature = 0; static OSType signature = 0;
static pascal OSErr eventHandlerCallback( EventHandlerCallRef anInHandlerCallRef, EventRef anInEvent, void * self ); static OSStatus eventHandlerCallback( EventHandlerCallRef anInHandlerCallRef, EventRef anInEvent, void * self );
#ifndef NDMapTableClassDefined #ifndef NDMapTableClassDefined
static NSUInteger hashValueHashFunction( NSHashTable * aTable, const void * aHotKeyEvent ); static NSUInteger hashValueHashFunction( NSHashTable * aTable, const void * aHotKeyEvent );
@ -119,7 +119,7 @@ struct HotKeyMappingEntry
NDHotKeyEventLock; NDHotKeyEventLock;
if( theHotKeyEvents != nil && hotKeysEventHandler == NULL ) if( theHotKeyEvents != nil && hotKeysEventHandler == NULL )
{ {
if( InstallEventHandler( GetEventDispatcherTarget(), NewEventHandlerUPP((EventHandlerProcPtr)eventHandlerCallback), 2, theTypeSpec, (__bridge void *)(theHotKeyEvents), &hotKeysEventHandler ) != noErr ) if( InstallEventHandler( GetEventDispatcherTarget(), (EventHandlerProcPtr)eventHandlerCallback, 2, theTypeSpec, (__bridge void *)(theHotKeyEvents), &hotKeysEventHandler ) != noErr )
NSLog(@"Could not install Event handler"); NSLog(@"Could not install Event handler");
} }
NDHotKeyEventUnlock; NDHotKeyEventUnlock;
@ -654,7 +654,7 @@ struct HotKeyMappingEntry
NSStringFromSelector([self selectorReleased])]; NSStringFromSelector([self selectorReleased])];
} }
pascal OSErr eventHandlerCallback( EventHandlerCallRef anInHandlerCallRef, EventRef anInEvent, void * anInUserData ) OSStatus eventHandlerCallback( EventHandlerCallRef anInHandlerCallRef, EventRef anInEvent, void * anInUserData )
{ {
// NSHashTable * allHotKeyEvents = (NSHashTable *)anInUserData; // NSHashTable * allHotKeyEvents = (NSHashTable *)anInUserData;
EventHotKeyID theHotKeyID; EventHotKeyID theHotKeyID;