Import Tk 8.6.12

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.
      */
 
@@ -982,7 +982,7 @@ InvalViewRect(
     void *ref)
 {
     static CGAffineTransform t;
-    TKContentView *view = ref;
+    TKContentView *view = (TKContentView *)ref;
     NSRect dirtyRect;
 
     if (!view) {
@@ -1467,7 +1467,7 @@ Tk_FreePixmap(
 
     display->request++;
     if (macPix->context) {
-	char *data = CGBitmapContextGetData(macPix->context);
+	char *data = (char *)CGBitmapContextGetData(macPix->context);
 
 	if (data) {
 	    ckfree(data);