summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-05-13 11:05:00 +0000
committerManolo Gouy <Manolo>2011-05-13 11:05:00 +0000
commit4ee9b8d7aaab6c207254349aa4b91d0c86b3fe77 (patch)
tree9790793734fed48e69857c5d8db261bdf9a42bcc
parent6892d8a2655f2976198a07b14dcd2c981e2d1de9 (diff)
Fix for STR #2629: remove beep when typing cmd-<key> under Mac OS.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8660 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index e1d556a1c..8b46c27b2 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1694,7 +1694,8 @@ static void q_set_window_title(NSWindow *nsw, const char * name ) {
break;
}
}
- if (!no_text_key) {
+ if (!no_text_key && !(Fl::e_state & FL_META) ) {
+ // Don't send cmd-<key> to interpretKeyEvents because it beeps.
// Then we can let the OS have a stab at it and see if it thinks it
// should result in some text
NSText *edit = [[theEvent window] fieldEditor:YES forObject:nil];