diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2010-11-10 20:36:02 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2010-11-10 20:36:02 +0000 |
| commit | 8b6fbb8fa94600574337580cd1c3d7511379b8d4 (patch) | |
| tree | 5876b4ac4cee078eac615ce6863d2fcab5ab8457 /AppKit | |
| parent | 699407b316e8a9b49370fe65941f257665b2c83e (diff) | |
[Author: dmaclach]
Fix up GTMHotKeyTextField so that it compiles cleanly with format string warnings on.
Change to match other controls where string value always returns the empty string as opposed to nil.
R=thomasvl
DELTA=7 (4 added, 0 deleted, 3 changed)
Diffstat (limited to 'AppKit')
| -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. |