diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-10 12:20:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-10 12:20:26 (GMT) |
| commit | 7e666f982b42472fb5f1e0c2a5ba13795a49a072 (patch) | |
| tree | 5eb0b4caefdd9dbc80e9ba897eb00d188a37a3d2 /generic/tkEvent.c | |
| parent | b7a61d63d4aabbd30586eea219f7402f3da61ac6 (diff) | |
| parent | b883e880976a068be12cf29c379b97be348ea79c (diff) | |
| download | tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.zip tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.tar.gz tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.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 dfa46ff..1fbf1dd 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); |