summaryrefslogtreecommitdiffstats
path: root/generic/tkEvent.c
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2012-08-14 13:38:13 (GMT)
committerdkf <dkf@noemail.net>2012-08-14 13:38:13 (GMT)
commit3a9f0a01a3cf2114eddb2738c44267b88c11b668 (patch)
tree3a70520262576b17a9904999cb72fbf706c5ff24 /generic/tkEvent.c
parent35ed650bb0098d2bc4bb8d06c89fbc2501bd1a3a (diff)
parentee1e910ede566b8e9bc6478ead6ab2bb9b7ff502 (diff)
downloadtk-3a9f0a01a3cf2114eddb2738c44267b88c11b668.zip
tk-3a9f0a01a3cf2114eddb2738c44267b88c11b668.tar.gz
tk-3a9f0a01a3cf2114eddb2738c44267b88c11b668.tar.bz2
merge trunk
FossilOrigin-Name: 2b25ed86782976a3951de56f6251fe323cd27f74
Diffstat (limited to 'generic/tkEvent.c')
-rw-r--r--generic/tkEvent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 7dd2813..463379a 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -337,7 +337,7 @@ CreateXIC(
preedit_attlist = XVaCreateNestedList(0,
XNSpotLocation, &spot,
XNFontSet, dispPtr->inputXfs,
- (void *) NULL);
+ NULL);
}
winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
@@ -345,7 +345,7 @@ CreateXIC(
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
preedit_attname, preedit_attlist,
- (void *) NULL);
+ NULL);
if (preedit_attlist) {
XFree(preedit_attlist);
@@ -360,7 +360,7 @@ CreateXIC(
/*
* Adjust the window's event mask if the IM requires it.
*/
- XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL);
+ XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL);
if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) {
winPtr->atts.event_mask |= im_event_mask;
XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask);