# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1318898227 0 # Node ID 46de4dbe710d638fdd4a92d893319d9122e4122e # Parent 9327f684c9b8932f26059d147ee5dadd3daf5de1 Fixed clickdefault not triggering event for buttons on Mac. diff -r 9327f684c9b8 -r 46de4dbe710d mac/dw.m --- a/mac/dw.m Mon Oct 17 16:15:13 2011 +0000 +++ b/mac/dw.m Tue Oct 18 00:37:07 2011 +0000 @@ -1036,7 +1036,10 @@ unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; if(clickDefault && vk == VK_RETURN) { - [[self window] makeFirstResponder:clickDefault]; + if([clickDefault isKindOfClass:[NSButton class]]) + [clickDefault buttonClicked:self]; + else + [[self window] makeFirstResponder:clickDefault]; } else { [super keyUp:theEvent]; @@ -1079,7 +1082,10 @@ { if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN) { - [[self window] makeFirstResponder:clickDefault]; + if([clickDefault isKindOfClass:[NSButton class]]) + [clickDefault buttonClicked:self]; + else + [[self window] makeFirstResponder:clickDefault]; } else {