summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorericm <ericm>2000-04-19 01:06:50 (GMT)
committerericm <ericm>2000-04-19 01:06:50 (GMT)
commitf7b076a54982678c409753c1acf6650bdda2b096 (patch)
tree21e83a6636d62a5d6f1449659e7debc92eaaadfe /win
parentf00c2ef4f68bab03411a16e8e943090aca012e66 (diff)
downloadtk-f7b076a54982678c409753c1acf6650bdda2b096.zip
tk-f7b076a54982678c409753c1acf6650bdda2b096.tar.gz
tk-f7b076a54982678c409753c1acf6650bdda2b096.tar.bz2
* win/tkWinPointer.c: Changed Mod2Mask in TkWinGetModifierState to
ALT_MASK, to fix some event problems [Bugs: 1160, 5088]. * win/tkWinX.c: Changed Mod2Mask in GetState to ALT_MASK, to fix some event problems [Bugs: 1160, 5088]. * generic/tkInt.h: Moved definition of ALT_MASK and META_MASK here so that it would be accessible from other modules than tkBind.c. * generic/tkBind.c: Added code in BindEvent to check for ALT_MASK and META_MASK in the event state field, as this field may not be set up with the correct display modifier mask bits if the XEvent structure was created by [event generate] or by the Windows X emulation. [Bugs: 1160, 5088].
Diffstat (limited to 'win')
-rw-r--r--win/tkWinPointer.c4
-rw-r--r--win/tkWinX.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 6e62e31..453ea26 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinPointer.c,v 1.7 1999/12/14 06:53:54 hobbs Exp $
+ * RCS: @(#) $Id: tkWinPointer.c,v 1.8 2000/04/19 01:06:51 ericm Exp $
*/
#include "tkWinInt.h"
@@ -63,7 +63,7 @@ TkWinGetModifierState()
state |= ControlMask;
}
if (GetKeyState(VK_MENU) & 0x8000) {
- state |= Mod2Mask;
+ state |= ALT_MASK;
}
if (GetKeyState(VK_CAPITAL) & 0x0001) {
state |= LockMask;
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 0ccf07a..5c2e3b4 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinX.c,v 1.9 2000/04/12 18:51:11 hobbs Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.10 2000/04/19 01:06:51 ericm Exp $
*/
#include "tkWinInt.h"
@@ -965,7 +965,7 @@ GetState(message, wParam, lParam)
mask = ControlMask;
break;
case VK_MENU:
- mask = Mod2Mask;
+ mask = ALT_MASK;
break;
case VK_CAPITAL:
if (message == WM_SYSKEYDOWN || message == WM_KEYDOWN) {