Mercurial > dwindows

comparison mac/dw.m @ 1652:202b1affc706

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix taskbar/menubar event breakage from the recent Mac control key changes.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 07 Apr 2012 20:51:40 +0000
parents 1f35129e4817
children 3d4066aab4e0
comparison
equal deleted inserted replaced
1651:2d5d3a11dee4 1652:202b1affc706
849 -(NSFont *)font { return font; } 849 -(NSFont *)font { return font; }
850 -(void)setSize:(NSSize)input { size = input; } 850 -(void)setSize:(NSSize)input { size = input; }
851 -(NSSize)size { return size; } 851 -(NSSize)size { return size; }
852 -(void)mouseDown:(NSEvent *)theEvent 852 -(void)mouseDown:(NSEvent *)theEvent
853 { 853 {
854 if(!([theEvent modifierFlags] & NSControlKeyMask)) 854 if(![theEvent isMemberOfClass:[NSEvent class]] || !([theEvent modifierFlags] & NSControlKeyMask))
855 _event_handler(self, theEvent, 3); 855 _event_handler(self, theEvent, 3);
856 } 856 }
857 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); } 857 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
858 -(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); return nil; } 858 -(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); return nil; }
859 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); } 859 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }