diff options
| author | dgp@users.sourceforge.net <dgp> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2002-08-05 04:30:37 (GMT) |
| commit | 7f2950e2d95664dad25850185a717df6019c37e7 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /unix/tkUnixWm.c | |
| parent | 6f421c178b9494c37357300d21b54901efcca6d1 (diff) | |
| download | tk-7f2950e2d95664dad25850185a717df6019c37e7.zip tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.gz tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.bz2 | |
Applied companion patch for Tcl Patch 585105,
updating Tk to use Tcl 8.4's fully CONST-ified
interface, and fully CONSTifying Tk at the
same time.
This patch includes purging Tk of its last
direct access to interp->result. [Bug 589853]
The substantial changes include copying
event sequence strings into Tcl_DStrings
in tkBind.c, and copying [text] indices into
Tcl_DStrings because parsing them involved
overwriting them. If this causes performance
trouble, that can be resolved by further
converting them to Tcl_Obj's.
The #defines USE_NON_CONST and USE_COMPAT_CONST
have the same effect for Tk as they do for Tcl.
(They actually change tcl.h)
Diffstat (limited to 'unix/tkUnixWm.c')
| -rw-r--r-- | unix/tkUnixWm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index a3cd0bf..e73d092 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.29 2002/08/02 15:12:23 dgp Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.30 2002/08/05 04:30:41 dgp Exp $ */ #include "tkPort.h" @@ -605,7 +605,7 @@ TkWmMapWindow(winPtr) { register WmInfo *wmPtr = winPtr->wmInfoPtr; XTextProperty textProp; - char *string; + Tk_Uid string; if (wmPtr->flags & WM_NEVER_MAPPED) { Tcl_DString ds; @@ -1856,7 +1856,7 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv) } if (objc == 3) { if (wmPtr->hints.flags & IconPixmapHint) { - Tcl_SetResult(interp, + Tcl_SetResult(interp, (char *) Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_pixmap), TCL_STATIC); } @@ -1976,7 +1976,7 @@ WmIconmaskCmd(tkwin, winPtr, interp, objc, objv) } if (objc == 3) { if (wmPtr->hints.flags & IconMaskHint) { - Tcl_SetResult(interp, + Tcl_SetResult(interp, (char *) Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_mask), TCL_STATIC); } @@ -2928,7 +2928,7 @@ WmTitleCmd(tkwin, winPtr, interp, objc, objv) return TCL_ERROR; } if (objc == 3) { - Tcl_SetResult(interp, + Tcl_SetResult(interp, (char *) ((wmPtr->title != NULL) ? wmPtr->title : winPtr->nameUid), TCL_STATIC); return TCL_OK; @@ -5261,7 +5261,7 @@ TkWmProtocolEventProc(winPtr, eventPtr) register ProtocolHandler *protPtr; Atom protocol; int result; - char *protocolName; + CONST char *protocolName; Tcl_Interp *interp; wmPtr = winPtr->wmInfoPtr; |