diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-14 13:38:13 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-14 13:38:13 (GMT) |
| commit | d3e4f0bc9405b86444625dede7f676cb3d709df5 (patch) | |
| tree | 3a70520262576b17a9904999cb72fbf706c5ff24 /generic/tkEvent.c | |
| parent | 46d45df76056002dae01fa017aaa17478492ae52 (diff) | |
| parent | c7492578c7af6a586a3797ba790569ac6abacab2 (diff) | |
| download | tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.zip tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.gz tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tkEvent.c')
| -rw-r--r-- | generic/tkEvent.c | 6 |
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); |