Remove (apparent) unneeded Tk_GetUid() calls

tcltk · Aug 31, 2024 · 0775a7c · 0775a7c
1 parent 1d8ae06
commit 0775a7c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
@@ -1669,7 +1669,7 @@ ParseSubcommandOptions(
 	    }
 	    *optIndexPtr = ++index;
 	    optPtr->background = Tk_GetColor(interp, Tk_MainWindow(interp),
-		    Tk_GetUid(Tcl_GetString(objv[index])));
+		    Tcl_GetString(objv[index]));
 	    if (!optPtr->background) {
 		return TCL_ERROR;
 	    }

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
@@ -3003,7 +3003,7 @@ WmIconbitmapCmd(
 	    wmPtr->hints.flags &= ~IconPixmapHint;
 	}
     } else {
-	pixmap = Tk_GetBitmap(interp, (Tk_Window)winPtr, Tk_GetUid(str));
+	pixmap = Tk_GetBitmap(interp, (Tk_Window)winPtr, str);
 	if (pixmap == None) {
 	    return TCL_ERROR;
 	}

diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
@@ -446,7 +446,7 @@ TkpGetShadows(
 
     if (borderPtr->shadow == None) {
 	borderPtr->shadow = Tk_GetBitmap(NULL, tkwin,
-		Tk_GetUid("gray50"));
+		"gray50");
 	if (borderPtr->shadow == None) {
 	    Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border");
 	}

diff --git a/win/tkWin3d.c b/win/tkWin3d.c
@@ -350,17 +350,17 @@ TkpGetShadows(
     if ((TkWinIndexOfColor(borderPtr->bgColorPtr) == COLOR_3DFACE)
 	    || (TkWinIndexOfColor(borderPtr->bgColorPtr) == COLOR_WINDOW)) {
 	borderPtr->darkColorPtr = Tk_GetColor(NULL, tkwin,
-		Tk_GetUid("SystemButtonShadow"));
+		"SystemButtonShadow");
 	gcValues.foreground = borderPtr->darkColorPtr->pixel;
 	borderPtr->darkGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
 	borderPtr->lightColorPtr = Tk_GetColor(NULL, tkwin,
-		Tk_GetUid("SystemButtonHighlight"));
+		"SystemButtonHighlight");
 	gcValues.foreground = borderPtr->lightColorPtr->pixel;
 	borderPtr->lightGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
 	((WinBorder*)borderPtr)->dark2ColorPtr = Tk_GetColor(NULL, tkwin,
-		Tk_GetUid("System3dDarkShadow"));
+		"System3dDarkShadow");
 	((WinBorder*)borderPtr)->light2ColorPtr = Tk_GetColor(NULL, tkwin,
-		Tk_GetUid("System3dLight"));
+		"System3dLight");
 	return;
     }
     darkColor.red = 0;
@@ -466,8 +466,7 @@ TkpGetShadows(
     }
 
     if (borderPtr->shadow == None) {
-	borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin,
-		Tk_GetUid("gray50"));
+	borderPtr->shadow = Tk_GetBitmap(NULL, tkwin, "gray50");
 	if (borderPtr->shadow == None) {
 	    Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border");
 	}

diff --git a/win/tkWinWm.c b/win/tkWinWm.c
@@ -3080,7 +3080,7 @@ WmAttributesCmd(
 			}
 		    } else {
 			XColor *cPtr =
-			    Tk_GetColor(interp, tkwin, Tk_GetUid(crefstr));
+			    Tk_GetColor(interp, tkwin, crefstr);
 			if (cPtr == NULL) {
 			    return TCL_ERROR;
 			}