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/tkScrollbar.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/tkScrollbar.c')
| -rw-r--r-- | generic/tkScrollbar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c index 71e4e21..dcbb999 100644 --- a/generic/tkScrollbar.c +++ b/generic/tkScrollbar.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: tkScrollbar.c,v 1.5 2000/11/22 01:49:38 ericm Exp $ + * RCS: @(#) $Id: tkScrollbar.c,v 1.6 2002/08/05 04:30:40 dgp Exp $ */ #include "tkPort.h" @@ -102,12 +102,12 @@ Tk_ConfigSpec tkpScrollbarConfigSpecs[] = { */ static int ConfigureScrollbar _ANSI_ARGS_((Tcl_Interp *interp, - TkScrollbar *scrollPtr, int argc, char **argv, + TkScrollbar *scrollPtr, int argc, CONST char **argv, int flags)); static void ScrollbarCmdDeletedProc _ANSI_ARGS_(( ClientData clientData)); static int ScrollbarWidgetCmd _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *, int argc, char **argv)); + Tcl_Interp *, int argc, CONST char **argv)); /* *-------------------------------------------------------------- @@ -133,7 +133,7 @@ Tk_ScrollbarCmd(clientData, interp, argc, argv) * interpreter. */ Tcl_Interp *interp; /* Current interpreter. */ int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + CONST char **argv; /* Argument strings. */ { Tk_Window tkwin = (Tk_Window) clientData; register TkScrollbar *scrollPtr; @@ -231,7 +231,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv) * widget. */ Tcl_Interp *interp; /* Current interpreter. */ int argc; /* Number of arguments. */ - char **argv; /* Argument strings. */ + CONST char **argv; /* Argument strings. */ { register TkScrollbar *scrollPtr = (TkScrollbar *) clientData; int result = TCL_OK; @@ -538,7 +538,7 @@ ConfigureScrollbar(interp, scrollPtr, argc, argv, flags) * may not already have values for * some fields. */ int argc; /* Number of valid entries in argv. */ - char **argv; /* Arguments. */ + CONST char **argv; /* Arguments. */ int flags; /* Flags to pass to * Tk_ConfigureWidget. */ { |