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))