summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLauri Kasanen <cand@gmx.com>2014-08-29 12:10:11 +0000
committerLauri Kasanen <cand@gmx.com>2014-08-29 12:10:11 +0000
commit795342693de6e6b587084d3b4a0a0acf9267aa32 (patch)
treede5b53707599372c0882131a3dbedf7998ab8a18 /src
parent9905a47ffb9060e435929b024d3de4c1d96d850c (diff)
Don't grab navkeys with modifiers, as the app may want them. STR #3104
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10261 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Group.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 695a5c48d..7b10dc9f3 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -122,8 +122,10 @@ static int send(Fl_Widget* o, int event) {
}
// translate the current keystroke into up/down/left/right for navigation:
-#define ctrl(x) (x^0x40)
static int navkey() {
+ // The app may want these for hotkeys, check key state
+ if (Fl::event_state(FL_CTRL | FL_ALT | FL_META)) return 0;
+
switch (Fl::event_key()) {
case 0: // not an FL_KEYBOARD/FL_SHORTCUT event
break;