Author: matt
Date: 2009-06-28 15:25:44 -0700 (Sun, 28 Jun 2009)
New Revision: 6802
Log:
- Fixed unexpected shortcut behavior for Win32 (STR #2199)

Modified:
   branches/branch-1.3/CHANGES
   branches/branch-1.3/src/fl_shortcut.cxx

Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2009-06-28 22:09:25 UTC (rev 6801)
+++ branches/branch-1.3/CHANGES 2009-06-28 22:25:44 UTC (rev 6802)
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.3.0
 
+       - Fixed unexpected shortcut behavior for Win32 (STR #2199)
        - Fixed documentation for Fl_Progress (STR #2209)
        - Fluid printing used wrong colors under Windows (STR #2195)
        - Updated documentation for Fl_Input_

Modified: branches/branch-1.3/src/fl_shortcut.cxx
===================================================================
--- branches/branch-1.3/src/fl_shortcut.cxx     2009-06-28 22:09:25 UTC (rev 
6801)
+++ branches/branch-1.3/src/fl_shortcut.cxx     2009-06-28 22:25:44 UTC (rev 
6802)
@@ -305,6 +305,10 @@
 }
 
 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))

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to