diff options
| -rw-r--r-- | AppKit/GTMHotKeyTextField.m | 6 | ||||
| -rw-r--r-- | AppKit/GTMHotKeyTextFieldTest.m | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/AppKit/GTMHotKeyTextField.m b/AppKit/GTMHotKeyTextField.m index df5853a..276f212 100644 --- a/AppKit/GTMHotKeyTextField.m +++ b/AppKit/GTMHotKeyTextField.m @@ -148,7 +148,11 @@ static CFStringRef kGTM_TISPropertyUnicodeKeyLayoutData = NULL; } - (NSString *)stringValue { - return [[self class] displayStringForHotKey:hotKey_]; + NSString *value = [[self class] displayStringForHotKey:hotKey_]; + if (!value) { + value = @""; + } + return value; } - (void)setStringValue:(NSString *)string { diff --git a/AppKit/GTMHotKeyTextFieldTest.m b/AppKit/GTMHotKeyTextFieldTest.m index 59c46f8..1bdc4cc 100644 --- a/AppKit/GTMHotKeyTextFieldTest.m +++ b/AppKit/GTMHotKeyTextFieldTest.m @@ -182,7 +182,7 @@ STAssertEquals([field intValue], 0, nil); STAssertEquals([field floatValue], 0.0f, nil); #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 - [GTMUnitTestDevLog expectString:expectedString]; + [GTMUnitTestDevLog expectString:@"%@", expectedString]; [field setIntegerValue:5]; STAssertEquals([field integerValue], (NSInteger)0, nil); #endif @@ -216,7 +216,7 @@ [GTMUnitTestDevLog expectString:@"Hot key fields don't accept formatters."]; [field setFormatter:testFormatter]; - [GTMUnitTestDevLog expectString:expectedString]; + [GTMUnitTestDevLog expectString:@"%@", expectedString]; [field takeObjectValueFrom:self]; // Setting to nil is valid. |