summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXKeyboard.c
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 /macosx/tkMacOSXKeyboard.c
parent4f50c7029e01320a12dc647ce7606cf8bc9abe4b (diff)
downloadtk-62d7bec31f12d0c52208a06e39bc891125392a2b.zip
tk-62d7bec31f12d0c52208a06e39bc891125392a2b.tar.gz
tk-62d7bec31f12d0c52208a06e39bc891125392a2b.tar.bz2
Fix some deprecation/unused parameter compiler warnings
Diffstat (limited to 'macosx/tkMacOSXKeyboard.c')
-rw-r--r--macosx/tkMacOSXKeyboard.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index 2780e5b..ca2a9e5 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -529,7 +529,7 @@ TkpGetString(
XModifierKeymap *
XGetModifierMapping(
- Display *display)
+ TCL_UNUSED(Display *))
{
XModifierKeymap *modmap;
@@ -627,7 +627,7 @@ XStringToKeysym(
KeyCode
XKeysymToKeycode(
- Display *display,
+ TCL_UNUSED(Display *),
KeySym keysym)
{
Tcl_HashEntry *hPtr;
@@ -695,7 +695,7 @@ XKeysymToKeycode(
*/
void
TkpSetKeycodeAndState(
- Tk_Window tkwin,
+ TCL_UNUSED(Tk_Window),
KeySym keysym,
XEvent *eventPtr)
{
@@ -827,7 +827,7 @@ TkpGetKeySym(
* First do the straightforward lookup.
*/
- sym = XKeycodeToKeysym(dispPtr->display, macKC.uint, index);
+ sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0, index);
/*
* Special handling: If the key was shifted because of Lock, which is only
@@ -837,7 +837,7 @@ TkpGetKeySym(
if ((index & INDEX_SHIFT) && !(eventPtr->xkey.state & ShiftMask)) {
if ((sym == NoSymbol) || !Tcl_UniCharIsUpper(sym)) {
- sym = XKeycodeToKeysym(dispPtr->display, macKC.uint,
+ sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0,
index & ~INDEX_SHIFT);
}
}
@@ -848,7 +848,7 @@ TkpGetKeySym(
*/
if ((index & INDEX_SHIFT) && (sym == NoSymbol)) {
- sym = XKeycodeToKeysym(dispPtr->display, macKC.uint,
+ sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0,
index & ~INDEX_SHIFT);
}
return sym;