summaryrefslogtreecommitdiffstats
path: root/generic/tkMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-26 00:24:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-26 00:24:07 (GMT)
commit13e6c44129865089d8680474141354555450ae04 (patch)
treecd1af88f02192ab59b05cebb82e886341624241e /generic/tkMain.c
parent8e4cfc592771290d75f559ef2dea0836cc26e7fe (diff)
downloadtk-13e6c44129865089d8680474141354555450ae04.zip
tk-13e6c44129865089d8680474141354555450ae04.tar.gz
tk-13e6c44129865089d8680474141354555450ae04.tar.bz2
Use some more (void *)'s in FreeProc's, a step in the direction getting Tk to work with "novem"
Diffstat (limited to 'generic/tkMain.c')
-rw-r--r--generic/tkMain.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 86f955a..5bfc684 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -318,7 +318,7 @@ Tk_MainEx(
*/
if (appInitProc(interp) != TCL_OK) {
- TkpDisplayWarning(Tcl_GetStringResult(interp),
+ TkpDisplayWarning(Tcl_GetString(Tcl_GetObjResult(interp)),
"application-specific initialization failed");
}
@@ -451,7 +451,7 @@ StdinProc(
Tcl_CreateChannelHandler(isPtr->input, TCL_READABLE, StdinProc, isPtr);
}
Tcl_DStringFree(&isPtr->command);
- if (Tcl_GetStringResult(interp)[0] != '\0') {
+ if (Tcl_GetString(Tcl_GetObjResult(interp))[0] != '\0') {
if ((code != TCL_OK) || (isPtr->tty)) {
chan = Tcl_GetStdChannel((code != TCL_OK) ? TCL_STDERR : TCL_STDOUT);
if (chan) {
@@ -514,7 +514,7 @@ Prompt(
if (code != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (script that generates prompt)");
- if (Tcl_GetStringResult(interp)[0] != '\0') {
+ if (Tcl_GetString(Tcl_GetObjResult(interp))[0] != '\0') {
chan = Tcl_GetStdChannel(TCL_STDERR);
if (chan != NULL) {
Tcl_WriteObj(chan, Tcl_GetObjResult(interp));