From 8ec927ee5453686c58261fb86a1789a031b0cf98 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 20 Mar 2002 22:55:16 +0000 Subject: * Updates to handle change in type of part2 argument of Tcl_VarTraceProc typedef. [TIP 27] [Patch 532644]. --- ChangeLog | 13 +++++++++++++ generic/tkButton.c | 10 +++++----- generic/tkCmds.c | 6 +++--- generic/tkEntry.c | 6 +++--- generic/tkListbox.c | 6 +++--- generic/tkMenu.c | 6 +++--- generic/tkMenubutton.c | 6 +++--- generic/tkMessage.c | 6 +++--- generic/tkScale.c | 6 +++--- 9 files changed, 39 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index d63696b..6b5f01d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-03-20 Don Porter + + * generic/tkButton.c (ButtonTextVarProc,ButtonVarProc): + * generic/tkCmds.c (WaitVariableProc): + * generic/tkEntry.c (EntryTextVarProc): + * generic/tkListbox.c (ListboxListVarProc): + * generic/tkMenu.c (MenuVarProc): + * generic/tkMenubutton.c (MenuButtonTextVarProc): + * generic/tkMessage.c (MessageTextVarProc): + * generic/tkScale.c (ScaleVarProc): Updates to handle change in + type of part2 argument of Tcl_VarTraceProc typedef. [TIP 27] + [Patch 532644]. + 2002-03-19 Jeff Hobbs * generic/tkOldConfig.c (Tk_ConfigureValue): prevent leaving diff --git a/generic/tkButton.c b/generic/tkButton.c index 33a0f42..7cc4803 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.15 2002/01/17 05:13:11 dgp Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.16 2002/03/20 22:55:16 dgp Exp $ */ #include "tkButton.h" @@ -520,10 +520,10 @@ 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, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static char * ButtonVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static int ButtonWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, @@ -1539,7 +1539,7 @@ ButtonVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ + CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { register TkButton *butPtr = (TkButton *) clientData; @@ -1618,7 +1618,7 @@ ButtonTextVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Not used. */ - char *name2; /* Not used. */ + CONST char *name2; /* Not used. */ int flags; /* Information about what happened. */ { TkButton *butPtr = (TkButton *) clientData; diff --git a/generic/tkCmds.c b/generic/tkCmds.c index c589f8f..c1b6275 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.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: tkCmds.c,v 1.22 2002/02/02 00:16:05 hobbs Exp $ + * RCS: @(#) $Id: tkCmds.c,v 1.23 2002/03/20 22:55:16 dgp Exp $ */ #include "tkPort.h" @@ -32,7 +32,7 @@ static TkWindow * GetToplevel _ANSI_ARGS_((Tk_Window tkwin)); static char * WaitVariableProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static void WaitVisibilityProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); @@ -856,7 +856,7 @@ WaitVariableProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Pointer to integer to set to 1. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ + CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { int *donePtr = (int *) clientData; diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 9ccc16a..673817b 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.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: tkEntry.c,v 1.26 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkEntry.c,v 1.27 2002/03/20 22:55:16 dgp Exp $ */ #include "tkInt.h" @@ -694,7 +694,7 @@ static void EntrySetValue _ANSI_ARGS_((Entry *entryPtr, static void EntrySelectTo _ANSI_ARGS_(( Entry *entryPtr, int index)); static char * EntryTextVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static void EntryUpdateScrollbar _ANSI_ARGS_((Entry *entryPtr)); static int EntryValidate _ANSI_ARGS_((Entry *entryPtr, @@ -3277,7 +3277,7 @@ EntryTextVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Not used. */ - char *name2; /* Not used. */ + CONST char *name2; /* Not used. */ int flags; /* Information about what happened. */ { Entry *entryPtr = (Entry *) clientData; diff --git a/generic/tkListbox.c b/generic/tkListbox.c index 3eaa135..e6483fd 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.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: tkListbox.c,v 1.25 2002/02/26 01:07:29 hobbs Exp $ + * RCS: @(#) $Id: tkListbox.c,v 1.26 2002/03/20 22:55:16 dgp Exp $ */ #include "tkPort.h" @@ -425,7 +425,7 @@ static void ListboxWorldChanged _ANSI_ARGS_(( static int NearestListboxElement _ANSI_ARGS_((Listbox *listPtr, int y)); static char * ListboxListVarProc _ANSI_ARGS_ ((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static void MigrateHashEntries _ANSI_ARGS_ ((Tcl_HashTable *table, int first, int last, int offset)); @@ -3224,7 +3224,7 @@ ListboxListVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Not used. */ - char *name2; /* Not used. */ + CONST char *name2; /* Not used. */ int flags; /* Information about what happened. */ { Listbox *listPtr = (Listbox *)clientData; diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 070c553..e3e004f 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.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: tkMenu.c,v 1.16 2002/01/31 21:05:27 uid38226 Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.17 2002/03/20 22:55:16 dgp Exp $ */ /* @@ -360,7 +360,7 @@ static void MenuCmdDeletedProc _ANSI_ARGS_(( static TkMenuEntry * MenuNewEntry _ANSI_ARGS_((TkMenu *menuPtr, int index, int type)); static char * MenuVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static int MenuWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, @@ -2464,7 +2464,7 @@ MenuVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about menu entry. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* First part of variable's name. */ - char *name2; /* Second part of variable's name. */ + CONST char *name2; /* Second part of variable's name. */ int flags; /* Describes what just happened. */ { TkMenuEntry *mePtr = (TkMenuEntry *) clientData; diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index dd86ae0..f6a46bf 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMenubutton.c,v 1.10 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkMenubutton.c,v 1.11 2002/03/20 22:55:16 dgp Exp $ */ #include "tkMenubutton.h" @@ -176,7 +176,7 @@ static void MenuButtonImageProc _ANSI_ARGS_((ClientData clientData, int imgHeight)); static char * MenuButtonTextVarProc _ANSI_ARGS_(( ClientData clientData, Tcl_Interp *interp, - char *name1, char *name2, int flags)); + char *name1, CONST char *name2, int flags)); static int MenuButtonWidgetObjCmd _ANSI_ARGS_(( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); @@ -868,7 +868,7 @@ MenuButtonTextVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ + CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { register TkMenuButton *mbPtr = (TkMenuButton *) clientData; diff --git a/generic/tkMessage.c b/generic/tkMessage.c index 648f939..7e7a00e 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.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: tkMessage.c,v 1.12 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkMessage.c,v 1.13 2002/03/20 22:55:16 dgp Exp $ */ #include "tkPort.h" @@ -176,7 +176,7 @@ static void MessageCmdDeletedProc _ANSI_ARGS_(( static void MessageEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); static char * MessageTextVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static int MessageWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, @@ -848,7 +848,7 @@ MessageTextVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about message. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ + CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { register Message *msgPtr = (Message *) clientData; diff --git a/generic/tkScale.c b/generic/tkScale.c index dea11f0..3d4135c 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -18,7 +18,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkScale.c,v 1.15 2002/01/17 05:13:11 dgp Exp $ + * RCS: @(#) $Id: tkScale.c,v 1.16 2002/03/20 22:55:16 dgp Exp $ */ #include "tkPort.h" @@ -171,7 +171,7 @@ static void ScaleCmdDeletedProc _ANSI_ARGS_(( static void ScaleEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); static char * ScaleVarProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, char *name1, char *name2, + Tcl_Interp *interp, char *name1, CONST char *name2, int flags)); static int ScaleWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, @@ -1186,7 +1186,7 @@ ScaleVarProc(clientData, interp, name1, name2, flags) ClientData clientData; /* Information about button. */ Tcl_Interp *interp; /* Interpreter containing variable. */ char *name1; /* Name of variable. */ - char *name2; /* Second part of variable name. */ + CONST char *name2; /* Second part of variable name. */ int flags; /* Information about what happened. */ { register TkScale *scalePtr = (TkScale *) clientData; -- cgit v0.12