summaryrefslogtreecommitdiffstats
path: root/win/tkWinWm.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-11 08:49:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-11 08:49:10 (GMT)
commit93c2250b76cfde6cbc1f1401ce8ddbd3a2897399 (patch)
tree7eaf719658cc851ca8f0e2903fd64fad1d4f6948 /win/tkWinWm.c
parent0cbbe5eeb5a312da166ebe21b7800fb47353621b (diff)
downloadtk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.zip
tk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.tar.gz
tk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.tar.bz2
After TIP #481 reaches Tcl9.0, TkGetStringFromObj() becomes obsolete. This commit shows how.
Diffstat (limited to 'win/tkWinWm.c')
-rw-r--r--win/tkWinWm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 89ae912..eb15e9b 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -2809,7 +2809,7 @@ Tk_WmObjCmd(
return TCL_ERROR;
}
- argv1 = TkGetStringFromObj(objv[1], &length);
+ argv1 = Tcl_GetStringFromObj(objv[1], &length);
if ((argv1[0] == 't') && !strncmp(argv1, "tracing", length)
&& (length >= 3)) {
int wmTracing;
@@ -3074,7 +3074,7 @@ WmAttributesCmd(
return TCL_OK;
}
for (i = 3; i < objc; i += 2) {
- string = TkGetStringFromObj(objv[i], &length);
+ string = Tcl_GetStringFromObj(objv[i], &length);
if ((length < 2) || (string[0] != '-')) {
goto configArgs;
}
@@ -3142,7 +3142,7 @@ WmAttributesCmd(
}
wmPtr->alpha = dval;
} else { /* -transparentcolor */
- const char *crefstr = TkGetStringFromObj(objv[i+1], &length);
+ const char *crefstr = Tcl_GetStringFromObj(objv[i+1], &length);
if (length == 0) {
/* reset to no transparent color */
@@ -3335,7 +3335,7 @@ WmClientCmd(
}
return TCL_OK;
}
- argv3 = TkGetStringFromObj(objv[3], &length);
+ argv3 = Tcl_GetStringFromObj(objv[3], &length);
if (argv3[0] == 0) {
if (wmPtr->clientMachine != NULL) {
ckfree(wmPtr->clientMachine);
@@ -3945,7 +3945,7 @@ WmGroupCmd(
}
return TCL_OK;
}
- argv3 = TkGetStringFromObj(objv[3], &length);
+ argv3 = Tcl_GetStringFromObj(objv[3], &length);
if (*argv3 == '\0') {
wmPtr->hints.flags &= ~WindowGroupHint;
if (wmPtr->leaderName != NULL) {
@@ -4272,7 +4272,7 @@ WmIconnameCmd(
if (wmPtr->iconName != NULL) {
ckfree(wmPtr->iconName);
}
- argv3 = TkGetStringFromObj(objv[3], &length);
+ argv3 = Tcl_GetStringFromObj(objv[3], &length);
wmPtr->iconName = (char *)ckalloc(length + 1);
memcpy(wmPtr->iconName, argv3, length + 1);
if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
@@ -5031,7 +5031,7 @@ WmProtocolCmd(
break;
}
}
- cmd = TkGetStringFromObj(objv[4], &cmdLength);
+ cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
if (cmdLength > 0) {
protPtr = (ProtocolHandler *)ckalloc(HANDLER_SIZE(cmdLength));
protPtr->protocol = protocol;
@@ -5507,7 +5507,7 @@ WmTitleCmd(
if (wmPtr->title != NULL) {
ckfree(wmPtr->title);
}
- argv3 = TkGetStringFromObj(objv[3], &length);
+ argv3 = Tcl_GetStringFromObj(objv[3], &length);
wmPtr->title = (char *)ckalloc(length + 1);
memcpy(wmPtr->title, argv3, length + 1);