Mercurial > dwindows
comparison mac/dw.m @ 1236:46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 18 Oct 2011 00:37:07 +0000 |
parents | 9327f684c9b8 |
children | f8673299ec37 |
comparison
equal
deleted
inserted
replaced
1235:9327f684c9b8 | 1236:46de4dbe710d |
---|---|
1034 -(void)keyUp:(NSEvent *)theEvent | 1034 -(void)keyUp:(NSEvent *)theEvent |
1035 { | 1035 { |
1036 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; | 1036 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; |
1037 if(clickDefault && vk == VK_RETURN) | 1037 if(clickDefault && vk == VK_RETURN) |
1038 { | 1038 { |
1039 [[self window] makeFirstResponder:clickDefault]; | 1039 if([clickDefault isKindOfClass:[NSButton class]]) |
1040 [clickDefault buttonClicked:self]; | |
1041 else | |
1042 [[self window] makeFirstResponder:clickDefault]; | |
1040 } else | 1043 } else |
1041 { | 1044 { |
1042 [super keyUp:theEvent]; | 1045 [super keyUp:theEvent]; |
1043 } | 1046 } |
1044 } | 1047 } |
1077 -(void)setClickDefault:(id)input { clickDefault = input; } | 1080 -(void)setClickDefault:(id)input { clickDefault = input; } |
1078 -(void)keyUp:(NSEvent *)theEvent | 1081 -(void)keyUp:(NSEvent *)theEvent |
1079 { | 1082 { |
1080 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN) | 1083 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN) |
1081 { | 1084 { |
1082 [[self window] makeFirstResponder:clickDefault]; | 1085 if([clickDefault isKindOfClass:[NSButton class]]) |
1086 [clickDefault buttonClicked:self]; | |
1087 else | |
1088 [[self window] makeFirstResponder:clickDefault]; | |
1083 } | 1089 } |
1084 else | 1090 else |
1085 { | 1091 { |
1086 [super keyUp:theEvent]; | 1092 [super keyUp:theEvent]; |
1087 } | 1093 } |