Tcl_LinkVar doesn't need typecast any more (starting with Tcl 8.7)

tcltk · Mar 13, 2024 · d769a99 · d769a99
1 parent 1461ef7
commit d769a99
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
@@ -888,15 +888,15 @@ TkCreateMainWindow(
 #if TCL_MAJOR_VERSION > 8
     mainPtr->tclUpdateObjProc2 = NULL;
 #endif
-    if (Tcl_LinkVar(interp, "tk_strictMotif", (char *) &mainPtr->strictMotif,
+    if (Tcl_LinkVar(interp, "tk_strictMotif", &mainPtr->strictMotif,
 	    TCL_LINK_BOOLEAN) != TCL_OK) {
 	Tcl_ResetResult(interp);
     }
     if (Tcl_CreateNamespace(interp, "::tk", NULL, NULL) == NULL) {
 	Tcl_ResetResult(interp);
     }
     if (Tcl_LinkVar(interp, "::tk::AlwaysShowSelection",
-	    (char *) &mainPtr->alwaysShowSelection,
+	    &mainPtr->alwaysShowSelection,
 	    TCL_LINK_BOOLEAN) != TCL_OK) {
 	Tcl_ResetResult(interp);
     }

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
@@ -86,7 +86,7 @@ TkMacOSXInitCGDrawing(
 	}
 
 	if (Tcl_LinkVar(interp, "::tk::mac::CGAntialiasLimit",
-		(char *)&cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
+		&cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	cgAntiAliasLimit = limit;
@@ -96,11 +96,11 @@ TkMacOSXInitCGDrawing(
 	 */
 
 	if (Tcl_LinkVar(interp, "::tk::mac::useThemedToplevel",
-		(char *)&useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
+		&useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	if (Tcl_LinkVar(interp, "::tk::mac::useThemedFrame",
-		(char *)&useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
+		&useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	transparentColor = TkMacOSXClearPixel();

diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
@@ -1556,7 +1556,7 @@ TkMacOSXUseAntialiasedText(
 	    Tcl_ResetResult(interp);
 	}
 	if (Tcl_LinkVar(interp, "::tk::mac::antialiasedtext",
-		(char *) &antialiasedTextEnabled,
+		&antialiasedTextEnabled,
 		TCL_LINK_INT) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}

diff --git a/win/tkWinGDI.c b/win/tkWinGDI.c
@@ -3648,17 +3648,17 @@ static int PrintSelectPrinter(
         *varlink2 = varlink1;
         WideCharToMultiByte(CP_UTF8, 0, localPrinterName, -1, varlink1, 0, NULL, NULL);
 
-        Tcl_LinkVar(interp, "::tk::print::printer_name", (char*)varlink2,
+        Tcl_LinkVar(interp, "::tk::print::printer_name", varlink2,
             TCL_LINK_STRING | TCL_LINK_READ_ONLY);
-        Tcl_LinkVar(interp, "::tk::print::copies", (char*)&copies,
+        Tcl_LinkVar(interp, "::tk::print::copies", &copies,
             TCL_LINK_INT | TCL_LINK_READ_ONLY);
-        Tcl_LinkVar(interp, "::tk::print::dpi_x", (char*)&dpi_x,
+        Tcl_LinkVar(interp, "::tk::print::dpi_x", &dpi_x,
             TCL_LINK_INT | TCL_LINK_READ_ONLY);
-        Tcl_LinkVar(interp, "::tk::print::dpi_y", (char*)&dpi_y,
+        Tcl_LinkVar(interp, "::tk::print::dpi_y", &dpi_y,
             TCL_LINK_INT | TCL_LINK_READ_ONLY);
-        Tcl_LinkVar(interp, "::tk::print::paper_width", (char*)&paper_width,
+        Tcl_LinkVar(interp, "::tk::print::paper_width", &paper_width,
             TCL_LINK_INT | TCL_LINK_READ_ONLY);
-        Tcl_LinkVar(interp, "::tk::print::paper_height", (char*)&paper_height,
+        Tcl_LinkVar(interp, "::tk::print::paper_height", &paper_height,
             TCL_LINK_INT | TCL_LINK_READ_ONLY);
     }