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/tkStyle.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/tkStyle.c')
-rw-r--r-- | generic/tkStyle.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tkStyle.c b/generic/tkStyle.c index 30ad2f8..81fb120 100644 --- a/generic/tkStyle.c +++ b/generic/tkStyle.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: tkStyle.c,v 1.2 2002/06/26 22:53:13 davygrvy Exp $ + * RCS: @(#) $Id: tkStyle.c,v 1.3 2002/08/05 04:30:40 dgp Exp $ */ #include "tkInt.h" @@ -128,7 +128,8 @@ static Tcl_ThreadDataKey dataKey; */ /* TODO: sort alpha. */ -static int CreateElement _ANSI_ARGS_((char *name, int create)); +static int CreateElement _ANSI_ARGS_((CONST char *name, + int create)); static void DupStyleObjProc _ANSI_ARGS_((Tcl_Obj *srcObjPtr, Tcl_Obj *dupObjPtr)); static void FreeElement _ANSI_ARGS_((Element *elementPtr)); @@ -316,7 +317,7 @@ TkStylePkgFree(mainPtr) Tk_StyleEngine Tk_RegisterStyleEngine(name, parent) - char *name; /* Name of the engine to create. NULL or empty + CONST char *name; /* Name of the engine to create. NULL or empty * means the default system engine. */ Tk_StyleEngine parent; /* The engine's parent. NULL means the default * system engine. */ @@ -467,7 +468,7 @@ FreeStyleEngine(enginePtr) Tk_StyleEngine Tk_GetStyleEngine(name) - char *name; /* Name of the engine to retrieve. NULL or + CONST char *name; /* Name of the engine to retrieve. NULL or * empty means the default system engine. */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) @@ -615,7 +616,7 @@ FreeStyledElement(elementPtr) static int CreateElement(name, create) - char *name; /* Name of the element. */ + CONST char *name; /* Name of the element. */ int create; /* Boolean, whether the element is being created * explicitly (being registered) or implicitly (by a * derived element). */ @@ -702,7 +703,7 @@ CreateElement(name, create) int Tk_GetElementId(name) - char *name; /* Name of the element. */ + CONST char *name; /* Name of the element. */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); |