diff options
| author | dgp@users.sourceforge.net <dgp> | 2002-02-08 02:57:10 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2002-02-08 02:57:10 (GMT) |
| commit | f5cdaf4fcfba2a641a48b5ddff8b24469b544d50 (patch) | |
| tree | 0dce5cb9458a0fe29fd391898aedfe73a6b1a598 /mac | |
| parent | 6d2109f5b1dc886ac858cf87e30c27562dc48eb3 (diff) | |
| download | tk-f5cdaf4fcfba2a641a48b5ddff8b24469b544d50.zip tk-f5cdaf4fcfba2a641a48b5ddff8b24469b544d50.tar.gz tk-f5cdaf4fcfba2a641a48b5ddff8b24469b544d50.tar.bz2 | |
* modified some callers of Tcl routines that
were restored to return (char *) pointing into Tcl_DStrings.
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/tkMacInit.c | 8 | ||||
| -rw-r--r-- | mac/tkMacKeyboard.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/mac/tkMacInit.c b/mac/tkMacInit.c index 277bbc6..9602304 100644 --- a/mac/tkMacInit.c +++ b/mac/tkMacInit.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacInit.c,v 1.7 2002/01/27 11:10:53 das Exp $ + * RCS: @(#) $Id: tkMacInit.c,v 1.8 2002/02/08 02:57:11 dgp Exp $ */ #include <Resources.h> @@ -121,11 +121,9 @@ tkInit"; argv[1] = "Tool Command Language"; Tcl_DStringInit(&libPath); Tcl_DStringAppend(&libPath, "tk", -1); - Tcl_DStringAppend(&libPath, TK_VERSION, -1); - argv[2] = Tcl_DStringValue(&libPath); - Tcl_JoinPath(3, argv, &path); + argv[2] = Tcl_DStringAppend(&libPath, TK_VERSION, -1); + libDir = Tcl_JoinPath(3, argv, &path); Tcl_DStringFree(&libPath); - libDir = Tcl_DStringValue(&path); } } if (libDir == NULL) { diff --git a/mac/tkMacKeyboard.c b/mac/tkMacKeyboard.c index def5b19..2cf8d0a 100644 --- a/mac/tkMacKeyboard.c +++ b/mac/tkMacKeyboard.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacKeyboard.c,v 1.7 2002/01/27 11:10:57 das Exp $ + * RCS: @(#) $Id: tkMacKeyboard.c,v 1.8 2002/02/08 02:57:11 dgp Exp $ */ #include "tkInt.h" @@ -247,8 +247,7 @@ TkpGetString( len = 0; } } - Tcl_ExternalToUtfDString(NULL, string, len, dsPtr); - return Tcl_DStringValue(dsPtr); + return Tcl_ExternalToUtfDString(NULL, string, len, dsPtr); } /* |