From a7723c902ade6ee4939c9c88a023f673eaee417c Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 28 Jun 2009 22:25:51 +0000 Subject: [PATCH] - Fixed unexpected shortcut behavior for Win32 (STR #2199) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6803 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + src/fl_shortcut.cxx | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 0569ed574..444427a0b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.10 + - Fixed unexpected shortcut behavior for Win32 (STR #2199) - Added cast to Fl_Color in all Fluid code (STR #2206) - Fixed wrong identifier for special keys combined with modifier (STR #2196) diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index 98c13ad59..b259b6deb 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -222,6 +222,10 @@ char Fl_Widget::label_shortcut(const char *t) { } int Fl_Widget::test_shortcut(const char *t) { + #ifdef WIN32 + // on MSWindows, users expect shortcuts to work only when the Alt modifier is pressed + if (Fl::event_state(FL_ALT)==0) return 0; + #endif char c = Fl::event_text()[0]; if (!c || !t) return 0; if (c == label_shortcut(t))