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 /unix | |
| parent | 46d45df76056002dae01fa017aaa17478492ae52 (diff) | |
| parent | c7492578c7af6a586a3797ba790569ac6abacab2 (diff) | |
| download | tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.zip tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.gz tk-d3e4f0bc9405b86444625dede7f676cb3d709df5.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixEvent.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixKey.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 0987129..4d0ccfa 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -646,7 +646,7 @@ OpenIM( } if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr, - (void *) NULL) != NULL) || (stylePtr == NULL)) { + NULL) != NULL) || (stylePtr == NULL)) { goto error; } 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 diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 50642ad..ab2ed4a 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -123,7 +123,7 @@ GetFont( FC_FAMILY, FcTypeString, "sans", FC_SIZE, FcTypeDouble, 12.0, FC_MATRIX, FcTypeMatrix, &mat, - (void *) NULL); + NULL); } if (!ftFont) { /* |