git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Should Build and Run with the new Controller
[MenuTunes.git]
/
KeyCombo.m
diff --git
a/KeyCombo.m
b/KeyCombo.m
index
5248197
..
edebd68
100755
(executable)
--- a/
KeyCombo.m
+++ b/
KeyCombo.m
@@
-99,7
+99,7
@@
- (NSString *)userDisplayRep
{
if ( ! [self isValid] ) {
- (NSString *)userDisplayRep
{
if ( ! [self isValid] ) {
- return @"
None
";
+ return @"";
} else {
return [NSString stringWithFormat: @"%@%@",
[KeyCombo _stringForModifiers: mModifiers],
} else {
return [NSString stringWithFormat: @"%@%@",
[KeyCombo _stringForModifiers: mModifiers],
@@
-112,7
+112,7
@@
static long modToChar[4][2] = {
{ cmdKey, 0x23180000 },
{ optionKey, 0x23250000 },
static long modToChar[4][2] = {
{ cmdKey, 0x23180000 },
{ optionKey, 0x23250000 },
- { controlKey, 0x
005E
0000 },
+ { controlKey, 0x
2303
0000 },
{ shiftKey, 0x21e70000 }
};
{ shiftKey, 0x21e70000 }
};
@@
-187,7
+187,7
@@
if (data) {
combo = [[NSUnarchiver unarchiveObjectWithData:data] retain];
} else {
if (data) {
combo = [[NSUnarchiver unarchiveObjectWithData:data] retain];
} else {
- combo =
[[KeyCombo alloc] init]
;
+ combo =
nil
;
}
return combo;
}
return combo;