From b08f91e52911f049e4c7f0bf836b57b9517d9dea Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 18 Jan 2013 17:12:39 +0000
Subject: 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
---
 src/Fl_cocoa.mm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 609d7b417..04fd53240 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1795,12 +1795,13 @@ static void cocoaKeyboardHandler(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
 {   
-- 
cgit v1.2.3