summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-19 07:36:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-19 07:36:52 (GMT)
commit62d7bec31f12d0c52208a06e39bc891125392a2b (patch)
tree9a781f1640e0c77eabd58ceca5c729260461b667 /win
parent4f50c7029e01320a12dc647ce7606cf8bc9abe4b (diff)
downloadtk-62d7bec31f12d0c52208a06e39bc891125392a2b.zip
tk-62d7bec31f12d0c52208a06e39bc891125392a2b.tar.gz
tk-62d7bec31f12d0c52208a06e39bc891125392a2b.tar.bz2
Fix some deprecation/unused parameter compiler warnings
Diffstat (limited to 'win')
-rw-r--r--win/tkWinKey.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index 2c20b64..83d2b3f 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.c
@@ -415,7 +415,7 @@ TkpGetKeySym(
TkpInitKeymapInfo(dispPtr);
}
- sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0);
+ sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0);
/*
* Special handling: if this is a ctrl-alt or shifted key, and there is no
@@ -424,11 +424,11 @@ TkpGetKeySym(
if ((sym == NoSymbol) && ((state & ControlMask) || (state & Mod2Mask))) {
state &= ~(ControlMask | Mod2Mask);
- sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0);
+ sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0);
}
if ((sym == NoSymbol) && (state & ShiftMask)) {
state &= ~ShiftMask;
- sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0);
+ sym = XkbKeycodeToKeysym(eventPtr->xkey.keycode, state, 0, 0);
}
return sym;
}
@@ -477,7 +477,7 @@ TkpInitKeymapInfo(
if (*codePtr == 0) {
continue;
}
- keysym = KeycodeToKeysym(*codePtr, 0, 1);
+ keysym = XkbKeycodeToKeysym(*codePtr, 0, 0, 1);
if (keysym == XK_Shift_Lock) {
dispPtr->lockUsage = LU_SHIFT;
break;
@@ -503,7 +503,7 @@ TkpInitKeymapInfo(
if (*codePtr == 0) {
continue;
}
- keysym = KeycodeToKeysym(*codePtr, 0, 1);
+ keysym = XkbKeycodeToKeysym(*codePtr, 0, 0, 1);
if (keysym == XK_Mode_switch) {
dispPtr->modeModMask |= ShiftMask << (i/modMapPtr->max_keypermod);
}