diff options
| author | dgp <dgp@noemail.net> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2002-08-05 04:30:37 (GMT) |
| commit | 2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkButton.c | |
| parent | 5e3b455efa8d24e25a42bb2b12fb7c4b1496034a (diff) | |
| download | tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.zip tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.tar.gz tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.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)
FossilOrigin-Name: 5603f01aa35a127f83db9bb68f3b1ff9e5bb64de
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 429916f..141f69f 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkButton.c,v 1.18 2002/06/17 10:54:29 drh Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.19 2002/08/05 04:30:38 dgp Exp $ */ #include "tkButton.h" @@ -524,11 +524,11 @@ static void ButtonSelectImageProc _ANSI_ARGS_(( ClientData clientData, int x, int y, int width, int height, int imgWidth, int imgHeight)); static char * ButtonTextVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, CONST char *name2, - int flags)); + Tcl_Interp *interp, CONST char *name1, + CONST char *name2, int flags)); static char * ButtonVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, CONST char *name2, - int flags)); + Tcl_Interp *interp, CONST char *name1, + CONST char *name2, int flags)); static int ButtonWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); @@ -1552,7 +1552,7 @@ static char * ButtonVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Name of variable. */ + CONST char *name1; /* Name of variable. */ CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { @@ -1631,7 +1631,7 @@ static char * ButtonTextVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ - char *name1; /* Not used. */ + CONST char *name1; /* Not used. */ CONST char *name2; /* Not used. */ int flags; /* Information about what happened. */ { |