diff options
| author | dgp <dgp@users.sourceforge.net> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2002-08-05 04:30:37 (GMT) |
| commit | b5333ac3910c2299be88875fe833d76136a92fc0 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkGet.c | |
| parent | 54f11088e5bee7a0f06235e8b67cdde9dfa614d4 (diff) | |
| download | tk-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/tkGet.c')
| -rw-r--r-- | generic/tkGet.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkGet.c b/generic/tkGet.c index 95d7a54..4d62c27 100644 --- a/generic/tkGet.c +++ b/generic/tkGet.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: tkGet.c,v 1.9 2002/04/12 07:44:45 hobbs Exp $ + * RCS: @(#) $Id: tkGet.c,v 1.10 2002/08/05 04:30:38 dgp Exp $ */ #include "tkInt.h" @@ -107,7 +107,7 @@ Tk_GetAnchorFromObj(interp, objPtr, anchorPtr) int Tk_GetAnchor(interp, string, anchorPtr) Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a direction. */ + CONST char *string; /* String describing a direction. */ Tk_Anchor *anchorPtr; /* Where to store Tk_Anchor corresponding * to string. */ { @@ -181,7 +181,7 @@ Tk_GetAnchor(interp, string, anchorPtr) *-------------------------------------------------------------- */ -char * +CONST char * Tk_NameOfAnchor(anchor) Tk_Anchor anchor; /* Anchor for which identifying string * is desired. */ @@ -223,7 +223,7 @@ Tk_NameOfAnchor(anchor) int Tk_GetJoinStyle(interp, string, joinPtr) Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ + CONST char *string; /* String describing a justification style. */ int *joinPtr; /* Where to store join style corresponding * to string. */ { @@ -269,7 +269,7 @@ Tk_GetJoinStyle(interp, string, joinPtr) *-------------------------------------------------------------- */ -char * +CONST char * Tk_NameOfJoinStyle(join) int join; /* Join style for which identifying string * is desired. */ @@ -305,7 +305,7 @@ Tk_NameOfJoinStyle(join) int Tk_GetCapStyle(interp, string, capPtr) Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ + CONST char *string; /* String describing a justification style. */ int *capPtr; /* Where to store cap style corresponding * to string. */ { @@ -351,7 +351,7 @@ Tk_GetCapStyle(interp, string, capPtr) *-------------------------------------------------------------- */ -char * +CONST char * Tk_NameOfCapStyle(cap) int cap; /* Cap style for which identifying string * is desired. */ @@ -424,7 +424,7 @@ Tk_GetJustifyFromObj(interp, objPtr, justifyPtr) int Tk_GetJustify(interp, string, justifyPtr) Tcl_Interp *interp; /* Use this for error reporting. */ - char *string; /* String describing a justification style. */ + CONST char *string; /* String describing a justification style. */ Tk_Justify *justifyPtr; /* Where to store Tk_Justify corresponding * to string. */ { @@ -470,7 +470,7 @@ Tk_GetJustify(interp, string, justifyPtr) *-------------------------------------------------------------- */ -char * +CONST char * Tk_NameOfJustify(justify) Tk_Justify justify; /* Justification style for which * identifying string is desired. */ |