X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.m;h=967a935c7b7baa94fe23eb0433f35ce52dca08bb;hp=cd513de0dde7024c2cc5c9144db16ef1f99818b6;hb=5bbd1edf2c0cc46fab98f712171a68f9182b0670;hpb=03b4a589de71a49ad00450701630673631e88647 diff --git a/JoystickController.m b/JoystickController.m index cd513de..967a935 100644 --- a/JoystickController.m +++ b/JoystickController.m @@ -177,7 +177,10 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD informativeTextWithFormat:@"Error 0x%08x occured trying to access your devices. " @"Input may not be correctly detected or mapped.", ret] - runModal]; + beginSheetModalForWindow:outlineView.window + modalDelegate:nil + didEndSelector:nil + contextInfo:nil]; } IOHIDManagerRegisterDeviceMatchingCallback(hidManager, add_callback, (__bridge void *)self); @@ -189,7 +192,7 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD return [item children] ? nil : item; } -- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { +- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { return item ? [[item children] count] : _joysticks.count; } @@ -197,7 +200,7 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD return item ? [[item children] count] > 0: YES; } -- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item { +- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { return item ? [item children][index] : _joysticks[index]; }