Fix for endless loop with default buttons.

This commit is contained in:
Randall Luecke
2010-08-16 15:05:46 -05:00
parent f587713795
commit 6e796d7a22
2 changed files with 3 additions and 3 deletions
+1 -2
View File
@@ -569,6 +569,7 @@ CPButtonStateMixed = CPThemeState("mixed");
*/
- (void)setKeyEquivalent:(CPString)aString
{
_keyEquivalent = aString || @"";
// 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)
@@ -581,8 +582,6 @@ CPButtonStateMixed = CPThemeState("mixed");
[[self window] setDefaultButton:nil];
[self setDefaultButton:NO];
}
_keyEquivalent = aString || @"";
}
- (void)viewWillMoveToWindow:(CPWindow)aWindow
+2 -1
View File
@@ -2411,7 +2411,8 @@ CPTexturedBackgroundWindowMask
_defaultButton = aButton;
[_defaultButton setKeyEquivalent:CPCarriageReturnCharacter];
if ([_defaultButton keyEquivalent] !== CPCarriageReturnCharacter)
[_defaultButton setKeyEquivalent:CPCarriageReturnCharacter];
}
- (CPButton)defaultButton