summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixKey.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-10 12:20:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-10 12:20:26 (GMT)
commit7e666f982b42472fb5f1e0c2a5ba13795a49a072 (patch)
tree5eb0b4caefdd9dbc80e9ba897eb00d188a37a3d2 /unix/tkUnixKey.c
parentb7a61d63d4aabbd30586eea219f7402f3da61ac6 (diff)
parentb883e880976a068be12cf29c379b97be348ea79c (diff)
downloadtk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.zip
tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.tar.gz
tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.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