Author: manolo
Date: 2013-01-18 09:12:39 -0800 (Fri, 18 Jan 2013)
New Revision: 9801
Log:
r.9800 was a bad move; going back.
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2013-01-18 16:34:58 UTC (rev 9800)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2013-01-18 17:12:39 UTC (rev 9801)
@@ -1795,12 +1795,13 @@
fl_lock_function();
cocoaKeyboardHandler(theEvent);
in_key_event = YES;
- if (! [[self performSelector:inputContextSEL] handleEvent:theEvent] ) {
- [self doCommandBySelector:@selector(noop:)];
- }
+ NSUInteger mods = [theEvent modifierFlags];
+ BOOL handled = YES;
+ if ( (mods & NSAlternateKeyMask) && (mods & NSCommandKeyMask) ) [self
doCommandBySelector:@selector(noop:)];
+ else handled = [[self performSelector:inputContextSEL] handleEvent:theEvent];
in_key_event = NO;
fl_unlock_function();
- return YES;
+ return handled;
}
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent
{
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
