summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorericm <ericm>2000-04-10 22:43:11 (GMT)
committerericm <ericm>2000-04-10 22:43:11 (GMT)
commitd18c89755234173b73aa739b7a51e75618b6e534 (patch)
tree520393cf07e5b8085d9682bd1f974c1f06db4115 /win
parent5a779544857025669c6e9f823fd1b7dd7baf413f (diff)
downloadtk-d18c89755234173b73aa739b7a51e75618b6e534.zip
tk-d18c89755234173b73aa739b7a51e75618b6e534.tar.gz
tk-d18c89755234173b73aa739b7a51e75618b6e534.tar.bz2
* tests/event.test: Added test for [event generate $widget
<Alt-z>] [Bug: 4611]. * tests/choosedir.test: Changed "namespace import ::tcltest" to "namespace import -force ::tcltest". * win/tkWinKey.c: * unix/tkUnixKey.c: * mac/tkMacKeyboard.c: Changed InitKeymapInfo to TkpInitKeymapInfo. [Bug: 4611]. * generic/tkStubInit.c: * generic/tkIntDecls.h: Re-gen'd from tkInt.decls. * generic/tkInt.decls: Added TkpInitKeymapInfo to list of function decls. * generic/tkBind.c (HandleEventGenerate): Added code to initialize keymap info if necessary, and to correctly set modifier bits in XEvent structure create to handle [event generate] calls. Previously, the alt/meta bits were not set correctly, so [event generate $widget <Alt-z>] would always fail. [Bug: 4611]
Diffstat (limited to 'win')
-rw-r--r--win/tkWinKey.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index d46f601..9e3687e 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.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: tkWinKey.c,v 1.7 2000/02/09 02:13:56 hobbs Exp $
+ * RCS: @(#) $Id: tkWinKey.c,v 1.8 2000/04/10 22:43:13 ericm Exp $
*/
#include "tkWinInt.h"
@@ -91,8 +91,6 @@ static Keys keymap[] = {
static KeySym KeycodeToKeysym _ANSI_ARGS_((unsigned int keycode,
int state, int noascii));
-static void InitKeymapInfo _ANSI_ARGS_((TkDisplay *dispPtr));
-
/*
*----------------------------------------------------------------------
@@ -351,7 +349,7 @@ TkpGetKeySym(dispPtr, eventPtr)
*/
if (dispPtr->bindInfoStale) {
- InitKeymapInfo(dispPtr);
+ TkpInitKeymapInfo(dispPtr);
}
sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0);
@@ -375,7 +373,7 @@ TkpGetKeySym(dispPtr, eventPtr)
/*
*--------------------------------------------------------------
*
- * InitKeymapInfo --
+ * TkpInitKeymapInfo --
*
* This procedure is invoked to scan keymap information
* to recompute stuff that's important for binding, such
@@ -391,8 +389,8 @@ TkpGetKeySym(dispPtr, eventPtr)
*--------------------------------------------------------------
*/
-static void
-InitKeymapInfo(dispPtr)
+void
+TkpInitKeymapInfo(dispPtr)
TkDisplay *dispPtr; /* Display for which to recompute keymap
* information. */
{