From 011e95515bf04972912a3c007ea0b491337d227b Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 29 Nov 2010 19:26:11 +0000
Subject: Fixes STR #2344: SHIFT+ALT+A  triggers correctly when caps-lock is
 on.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7914 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_shortcut.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx
index a3acedbc1..c2955152c 100644
--- a/src/fl_shortcut.cxx
+++ b/src/fl_shortcut.cxx
@@ -83,7 +83,7 @@ int Fl::test_shortcut(unsigned int shortcut) {
 
   // try matching utf8, ignore shift:
   unsigned int firstChar = fl_utf8decode(Fl::event_text(), Fl::event_text()+Fl::event_length(), 0);
-  if (key==firstChar) return 1;
+  if ( ! (FL_CAPS_LOCK&shift) && key==firstChar) return 1;
 
   // kludge so that Ctrl+'_' works (as opposed to Ctrl+'^_'):
   if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F
-- 
cgit v1.2.3