X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=KeyInputTextView.m;h=1bb79521fc1eda6d15817ad4b0fe98254d564a29;hp=cde2547d8c8ac455db7e9e2f4741627e919f73c6;hb=15a3aec049658f4a1c3c6e8c9f8a549fb8de0782;hpb=c6fb77859e508aaef686b7a5a6a12abe29178708

diff --git a/KeyInputTextView.m b/KeyInputTextView.m
index cde2547..1bb7952 100644
--- a/KeyInputTextView.m
+++ b/KeyInputTextView.m
@@ -14,8 +14,6 @@
     BOOL enabled;
 }
 
-@synthesize descr;
-
 - (id)initWithFrame:(NSRect)frameRect {
     if ((self = [super initWithFrame:frameRect])) {
         self.alignment = NSCenterTextAlignment;
@@ -33,7 +31,7 @@
     return self.vk >= 0;
 }
 
-- (NSString *)stringForKeyCode:(int)keycode {
++ (NSString *)stringForKeyCode:(int)keycode {
     switch(keycode) {
         case   -1: return @"";
         case 0x7a: return @"F1";
@@ -157,7 +155,7 @@
 }
 
 - (BOOL)acceptsFirstResponder {
-    return enabled;
+    return self.enabled;
 }
 
 - (BOOL)becomeFirstResponder {
@@ -176,8 +174,7 @@
 
 - (void)setVk:(int)key {
     vk = key;
-    descr = [self stringForKeyCode:key];
-    [self setStringValue:descr];
+    [self setStringValue:[KeyInputTextView stringForKeyCode:key]];
     if (self.hasKey)
         [targetController keyChanged];
 }
@@ -189,7 +186,7 @@
 - (void)keyDown:(NSEvent *)evt {
     if (!evt.isARepeat) {
         self.vk = evt.keyCode;
-        [[self window] makeFirstResponder:nil];
+        [self.window makeFirstResponder:nil];
     }
 }