Skip to content

Commit 5de4ed7

Browse files
cimarronmcimarronm
committed
Updated to not use NSDictionary literals for pre-obj2.0 compiler support.
1 parent b671394 commit 5de4ed7

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎src/_macosx.m

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5443,45 +5443,46 @@ - (void)removeRubberband
54435443

54445444
- (const char*)convertKeyEvent:(NSEvent*)event
54455445
{
5446-
NSDictionary* specialkeymappings = @{
5447-
@(NSLeftArrowFunctionKey): @"left",
5448-
@(NSRightArrowFunctionKey): @"right",
5449-
@(NSUpArrowFunctionKey): @"up",
5450-
@(NSDownArrowFunctionKey): @"down",
5451-
@(NSF1FunctionKey): @"f1",
5452-
@(NSF2FunctionKey): @"f2",
5453-
@(NSF3FunctionKey): @"f3",
5454-
@(NSF4FunctionKey): @"f4",
5455-
@(NSF5FunctionKey): @"f5",
5456-
@(NSF6FunctionKey): @"f6",
5457-
@(NSF7FunctionKey): @"f7",
5458-
@(NSF8FunctionKey): @"f8",
5459-
@(NSF9FunctionKey): @"f9",
5460-
@(NSF10FunctionKey): @"f10",
5461-
@(NSF11FunctionKey): @"f11",
5462-
@(NSF12FunctionKey): @"f12",
5463-
@(NSF13FunctionKey): @"f13",
5464-
@(NSF14FunctionKey): @"f14",
5465-
@(NSF15FunctionKey): @"f15",
5466-
@(NSF16FunctionKey): @"f16",
5467-
@(NSF17FunctionKey): @"f17",
5468-
@(NSF18FunctionKey): @"f18",
5469-
@(NSF19FunctionKey): @"f19",
5470-
@(NSScrollLockFunctionKey): @"scroll_lock",
5471-
@(NSBreakFunctionKey): @"break",
5472-
@(NSInsertFunctionKey): @"insert",
5473-
@(NSDeleteFunctionKey): @"delete",
5474-
@(NSHomeFunctionKey): @"home",
5475-
@(NSEndFunctionKey): @"end",
5476-
@(NSPageDownFunctionKey): @"pagedown",
5477-
@(NSPageUpFunctionKey): @"pageup",
5478-
@(NSDeleteCharacter): @"backspace",
5479-
@(NSEnterCharacter): @"enter",
5480-
@(NSTabCharacter): @"tab",
5481-
@(NSCarriageReturnCharacter): @"enter",
5482-
@(NSBackTabCharacter): @"backtab",
5483-
@27: @"escape"
5484-
};
5446+
NSDictionary* specialkeymappings = [NSDictionary dictionaryWithObjectsAndKeys:
5447+
@"left", [NSNumber numberWithUnsignedLong:NSLeftArrowFunctionKey],
5448+
@"right", [NSNumber numberWithUnsignedLong:NSRightArrowFunctionKey],
5449+
@"up", [NSNumber numberWithUnsignedLong:NSUpArrowFunctionKey],
5450+
@"down", [NSNumber numberWithUnsignedLong:NSDownArrowFunctionKey],
5451+
@"f1", [NSNumber numberWithUnsignedLong:NSF1FunctionKey],
5452+
@"f2", [NSNumber numberWithUnsignedLong:NSF2FunctionKey],
5453+
@"f3", [NSNumber numberWithUnsignedLong:NSF3FunctionKey],
5454+
@"f4", [NSNumber numberWithUnsignedLong:NSF4FunctionKey],
5455+
@"f5", [NSNumber numberWithUnsignedLong:NSF5FunctionKey],
5456+
@"f6", [NSNumber numberWithUnsignedLong:NSF6FunctionKey],
5457+
@"f7", [NSNumber numberWithUnsignedLong:NSF7FunctionKey],
5458+
@"f8", [NSNumber numberWithUnsignedLong:NSF8FunctionKey],
5459+
@"f9", [NSNumber numberWithUnsignedLong:NSF9FunctionKey],
5460+
@"f10", [NSNumber numberWithUnsignedLong:NSF10FunctionKey],
5461+
@"f11", [NSNumber numberWithUnsignedLong:NSF11FunctionKey],
5462+
@"f12", [NSNumber numberWithUnsignedLong:NSF12FunctionKey],
5463+
@"f13", [NSNumber numberWithUnsignedLong:NSF13FunctionKey],
5464+
@"f14", [NSNumber numberWithUnsignedLong:NSF14FunctionKey],
5465+
@"f15", [NSNumber numberWithUnsignedLong:NSF15FunctionKey],
5466+
@"f16", [NSNumber numberWithUnsignedLong:NSF16FunctionKey],
5467+
@"f17", [NSNumber numberWithUnsignedLong:NSF17FunctionKey],
5468+
@"f18", [NSNumber numberWithUnsignedLong:NSF18FunctionKey],
5469+
@"f19", [NSNumber numberWithUnsignedLong:NSF19FunctionKey],
5470+
@"scroll_lock", [NSNumber numberWithUnsignedLong:NSScrollLockFunctionKey],
5471+
@"break", [NSNumber numberWithUnsignedLong:NSBreakFunctionKey],
5472+
@"insert", [NSNumber numberWithUnsignedLong:NSInsertFunctionKey],
5473+
@"delete", [NSNumber numberWithUnsignedLong:NSDeleteFunctionKey],
5474+
@"home", [NSNumber numberWithUnsignedLong:NSHomeFunctionKey],
5475+
@"end", [NSNumber numberWithUnsignedLong:NSEndFunctionKey],
5476+
@"pagedown", [NSNumber numberWithUnsignedLong:NSPageDownFunctionKey],
5477+
@"pageup", [NSNumber numberWithUnsignedLong:NSPageUpFunctionKey],
5478+
@"backspace", [NSNumber numberWithUnsignedLong:NSDeleteCharacter],
5479+
@"enter", [NSNumber numberWithUnsignedLong:NSEnterCharacter],
5480+
@"tab", [NSNumber numberWithUnsignedLong:NSTabCharacter],
5481+
@"enter", [NSNumber numberWithUnsignedLong:NSCarriageReturnCharacter],
5482+
@"backtab", [NSNumber numberWithUnsignedLong:NSBackTabCharacter],
5483+
@"escape", [NSNumber numberWithUnsignedLong:27],
5484+
nil
5485+
];
54855486

54865487
NSMutableString* returnkey = [NSMutableString string];
54875488
if ([event modifierFlags] & NSControlKeyMask)
@@ -5494,8 +5495,7 @@ - (const char*)convertKeyEvent:(NSEvent*)event
54945495
[returnkey appendString:@"shift+" ];
54955496

54965497
unichar uc = [[event charactersIgnoringModifiers] characterAtIndex:0];
5497-
NSString* specialchar = [specialkeymappings objectForKey:@(uc)];
5498-
// NSString* specialchar = specialkeymappings[@(uc)];
5498+
NSString* specialchar = [specialkeymappings objectForKey:[NSNumber numberWithUnsignedLong:uc]];
54995499
if (specialchar)
55005500
[returnkey appendString:specialchar];
55015501
else

0 commit comments

Comments
 (0)