Skip to content

Commit

Permalink
Simplification of the - (BOOL)[FLView performKeyEquivalent:(NSEvent*)…
Browse files Browse the repository at this point in the history
…theEvent] method.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9800 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Manolo Gouy authored and Manolo Gouy committed Jan 18, 2013
1 parent 81da29f commit a0ef82b
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/Fl_cocoa.mm
Expand Up @@ -1795,13 +1795,12 @@ - (BOOL)performKeyEquivalent:(NSEvent*)theEvent
fl_lock_function();
cocoaKeyboardHandler(theEvent);
in_key_event = YES;
NSUInteger mods = [theEvent modifierFlags];
BOOL handled = YES;
if ( (mods & NSAlternateKeyMask) && (mods & NSCommandKeyMask) ) [self doCommandBySelector:NULL];
else handled = [[self performSelector:inputContextSEL] handleEvent:theEvent];
if (! [[self performSelector:inputContextSEL] handleEvent:theEvent] ) {
[self doCommandBySelector:@selector(noop:)];
}
in_key_event = NO;
fl_unlock_function();
return handled;
return YES;
}
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent
{
Expand Down

0 comments on commit a0ef82b

Please sign in to comment.