summaryrefslogtreecommitdiffstats
path: root/generic/tkAtom.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-08-05 04:30:37 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-08-05 04:30:37 (GMT)
commitb5333ac3910c2299be88875fe833d76136a92fc0 (patch)
tree7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkAtom.c
parent54f11088e5bee7a0f06235e8b67cdde9dfa614d4 (diff)
downloadtk-b5333ac3910c2299be88875fe833d76136a92fc0.zip
tk-b5333ac3910c2299be88875fe833d76136a92fc0.tar.gz
tk-b5333ac3910c2299be88875fe833d76136a92fc0.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 'generic/tkAtom.c')
-rw-r--r--generic/tkAtom.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkAtom.c b/generic/tkAtom.c
index fba9fb8..0137d40 100644
--- a/generic/tkAtom.c
+++ b/generic/tkAtom.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkAtom.c,v 1.2 1998/09/14 18:23:03 stanton Exp $
+ * RCS: @(#) $Id: tkAtom.c,v 1.3 2002/08/05 04:30:38 dgp Exp $
*/
#include "tkPort.h"
@@ -80,7 +80,7 @@ Atom
Tk_InternAtom(tkwin, name)
Tk_Window tkwin; /* Window token; map name to atom
* for this window's display. */
- char *name; /* Name to turn into atom. */
+ CONST char *name; /* Name to turn into atom. */
{
register TkDisplay *dispPtr;
register Tcl_HashEntry *hPtr;
@@ -127,7 +127,7 @@ Tk_InternAtom(tkwin, name)
*--------------------------------------------------------------
*/
-char *
+CONST char *
Tk_GetAtomName(tkwin, atom)
Tk_Window tkwin; /* Window token; map atom to name
* relative to this window's
@@ -168,7 +168,7 @@ Tk_GetAtomName(tkwin, atom)
&new);
Tcl_SetHashValue(hPtr, name);
}
- return (char *) Tcl_GetHashValue(hPtr);
+ return Tcl_GetHashValue(hPtr);
}
/*