r.9800 was a bad move; going back.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9801 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Jan 18, 2013 · b08f91e · b08f91e
1 parent a0ef82b
commit b08f91e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
@@ -1795,12 +1795,13 @@ - (BOOL)performKeyEquivalent:(NSEvent*)theEvent
   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
 {