some fixes to default buttons to make them more cocoa compliant...

This commit is contained in:
Randall Luecke
2010-08-01 20:19:26 -05:00
parent bcff25b959
commit 90a45dca29
2 changed files with 11 additions and 2 deletions
+6
View File
@@ -572,9 +572,15 @@ CPButtonStateMixed = CPThemeState("mixed");
// Check if the key equivalent is the enter key
// Treat \r and \n as the same key equivalent. See issue #710.
if (aString === CPNewlineCharacter || aString === CPCarriageReturnCharacter)
{
[[self window] setDefaultButton:self];
[self setDefaultButton:YES];
}
else if ([[self window] defaultButton] === self)
{
[[self window] setDefaultButton:nil];
[self setDefaultButton:NO];
}
_keyEquivalent = aString || @"";
}
+5 -2
View File
@@ -2406,9 +2406,12 @@ CPTexturedBackgroundWindowMask
if (_defaultButton === aButton)
return;
[_defaultButton setDefaultButton:NO];
if ([_defaultButton keyEquivalent] === CPCarriageReturnCharacter)
[_defaultButton setKeyEquivalent:nil];
_defaultButton = aButton;
[_defaultButton setDefaultButton:YES];
[_defaultButton setKeyEquivalent:CPCarriageReturnCharacter];
}
- (CPButton)defaultButton