projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update project for OS X 10.10.
[enjoyable.git]
/
Classes
/
NJKeyInputField.m
diff --git
a/Classes/NJKeyInputField.m
b/Classes/NJKeyInputField.m
index
791911b
..
3cdbd7c
100644
(file)
--- a/
Classes/NJKeyInputField.m
+++ b/
Classes/NJKeyInputField.m
@@
-20,6
+20,9
@@
enum {
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
+@interface NJKeyInputField () <NSTextFieldDelegate>
+@end
+
@implementation NJKeyInputField {
NSTextField *field;
NSImageView *warning;
@implementation NJKeyInputField {
NSTextField *field;
NSImageView *warning;
@@
-52,7
+55,7
@@
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
- (void)clear {
self.keyCode = NJKeyInputFieldEmpty;
- (void)clear {
self.keyCode = NJKeyInputFieldEmpty;
-
[self.delegate keyInputFieldDidClear:self];
+ [self.delegate keyInputFieldDidClear:self];
[self resignIfFirstResponder];
}
[self resignIfFirstResponder];
}
@@
-60,7
+63,7
@@
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
return self.keyCode != NJKeyInputFieldEmpty;
}
return self.keyCode != NJKeyInputFieldEmpty;
}
-+ (NSString *)
string
ForKeyCode:(CGKeyCode)keyCode {
++ (NSString *)
displayName
ForKeyCode:(CGKeyCode)keyCode {
switch (keyCode) {
case kVK_F1: return @"F1";
case kVK_F2: return @"F2";
switch (keyCode) {
case kVK_F1: return @"F1";
case kVK_F2: return @"F2";
@@
-204,7
+207,6
@@
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
case kVK_ApplicationMenu:
return NSLocalizedString(@"Menu", "keyboard key");
case kVK_ApplicationMenu:
return NSLocalizedString(@"Menu", "keyboard key");
-
case kVK_MAX: // NJKeyInputFieldEmpty
return @"";
default:
case kVK_MAX: // NJKeyInputFieldEmpty
return @"";
default:
@@
-230,7
+232,7
@@
const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
- (void)setKeyCode:(CGKeyCode)keyCode {
_keyCode = keyCode;
- (void)setKeyCode:(CGKeyCode)keyCode {
_keyCode = keyCode;
- field.stringValue = [NJKeyInputField
string
ForKeyCode:keyCode];
+ field.stringValue = [NJKeyInputField
displayName
ForKeyCode:keyCode];
}
- (void)keyDown:(NSEvent *)event {
}
- (void)keyDown:(NSEvent *)event {
@@
-265,7
+267,7
@@
static BOOL isValidKeyCode(long code) {
warning.hidden = YES;
char *error = NULL;
const char *s = field.stringValue.UTF8String;
warning.hidden = YES;
char *error = NULL;
const char *s = field.stringValue.UTF8String;
-
long code =
strtol(s, &error, 16);
+
short code = (short)
strtol(s, &error, 16);
if (!*error && isValidKeyCode(code) && field.stringValue.length) {
self.keyCode = code;
if (!*error && isValidKeyCode(code) && field.stringValue.length) {
self.keyCode = code;