summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixKey.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-08-14 13:38:13 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-08-14 13:38:13 (GMT)
commitd3e4f0bc9405b86444625dede7f676cb3d709df5 (patch)
tree3a70520262576b17a9904999cb72fbf706c5ff24 /unix/tkUnixKey.c
parent46d45df76056002dae01fa017aaa17478492ae52 (diff)
parentc7492578c7af6a586a3797ba790569ac6abacab2 (diff)
downloadtk-d3e4f0bc9405b86444625dede7f676cb3d709df5.zip
tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.gz
tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.bz2
merge trunk
Diffstat (limited to 'unix/tkUnixKey.c')
-rw-r--r--unix/tkUnixKey.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index f13adf7..d07f13a 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -64,9 +64,9 @@ Tk_SetCaretPos(
spot.x = dispPtr->caret.x;
spot.y = dispPtr->caret.y + dispPtr->caret.height;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
XSetICValues(winPtr->inputContext, XNPreeditAttributes, preedit_attr,
- (void *) NULL);
+ NULL);
XFree(preedit_attr);
}
#endif