diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-11 12:04:43 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-11 12:04:43 (GMT) |
commit | baa15df1bf04ebc2604a493c6cab48c845c865b4 (patch) | |
tree | 2fe47a0b4246dcd72f227650604fc2ade6ee7883 /xlib/xgc.c | |
parent | e73483a45a8b507ba173e539e3df598a987fd5bd (diff) | |
parent | c28292a3923e7c09df16322a73d4b53eaff74b79 (diff) | |
download | tk-baa15df1bf04ebc2604a493c6cab48c845c865b4.zip tk-baa15df1bf04ebc2604a493c6cab48c845c865b4.tar.gz tk-baa15df1bf04ebc2604a493c6cab48c845c865b4.tar.bz2 |
Merge 8.6
Diffstat (limited to 'xlib/xgc.c')
-rw-r--r-- | xlib/xgc.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -81,7 +81,7 @@ static void FreeClipMask(GC gc) { TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region); } #endif - ckfree((char *) gc->clip_mask); + ckfree((char *)gc->clip_mask); gc->clip_mask = None; } } @@ -847,7 +847,7 @@ XCreateGlyphCursor( (void)foreground_color; (void)background_color; - return 1; + return (Cursor) NULL; } XFontSet @@ -970,8 +970,7 @@ XSetIMValues( return NULL; } - - + /* * Local Variables: * mode: c |