diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 15:45:20 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-25 15:45:20 (GMT) |
commit | 7ce9a032b4bbf8ab2859ebff5c2c4b3d39773019 (patch) | |
tree | 2aa09749ca8cab2f47e0ad0bf280020a14110595 /macosx/tkMacOSXSubwindows.c | |
parent | 4b14f3903e949b7e394d794fd296c4de14d423a4 (diff) | |
parent | a2eecbce351c9dc1436c1a7a1582e1df477e7d8d (diff) | |
download | tk-7ce9a032b4bbf8ab2859ebff5c2c4b3d39773019.zip tk-7ce9a032b4bbf8ab2859ebff5c2c4b3d39773019.tar.gz tk-7ce9a032b4bbf8ab2859ebff5c2c4b3d39773019.tar.bz2 |
Merge 8.7
Diffstat (limited to 'macosx/tkMacOSXSubwindows.c')
-rw-r--r-- | macosx/tkMacOSXSubwindows.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 65efb86..32d5436 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -105,7 +105,7 @@ XDestroyWindow( macWin->view = nil; /* - * Delay deletion of a toplevel data structure untill all children have + * Delay deletion of a toplevel data structure until all children have * been deleted. */ @@ -973,7 +973,7 @@ InvalViewRect( void *ref) { static CGAffineTransform t; - TKContentView *view = ref; + TKContentView *view = (TKContentView *)ref; NSRect dirtyRect; if (!view) { @@ -1435,7 +1435,7 @@ Tk_FreePixmap( display->request++; if (macPix->context) { - char *data = CGBitmapContextGetData(macPix->context); + char *data = (char *)CGBitmapContextGetData(macPix->context); if (data) { ckfree(data); |