From d06599e802a1f92eff177ce5fba74e66fa60afb3 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Sun, 10 Jan 2010 20:27:22 +0000 Subject: CONSTify Tk_SetClassProcs --- ChangeLog | 8 ++++++++ doc/SetClassProcs.3 | 4 ++-- generic/tk.decls | 4 ++-- generic/tkDecls.h | 6 +++--- generic/tkInt.h | 4 ++-- generic/tkWindow.c | 4 ++-- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index aae7b06..a0794f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-01-10 Jan Nijtmans + + * doc/SetClassProcs.3: CONSTify Tk_SetClassProcs + * generic/tk.decls + * generic/tkInt.h + * generic/tkWindow.c + * generic/tkDecls.h: (regenerated) + 2010-01-09 Pat Thoyts * doc/menu.n: [TIP 360]: Remove special handling of diff --git a/doc/SetClassProcs.3 b/doc/SetClassProcs.3 index 70709aa..23567c3 100644 --- a/doc/SetClassProcs.3 +++ b/doc/SetClassProcs.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: SetClassProcs.3,v 1.5 2008/07/08 22:40:51 patthoyts Exp $ +'\" RCS: @(#) $Id: SetClassProcs.3,v 1.6 2010/01/10 20:27:25 nijtmans Exp $ '\" .so man.macros .TH Tk_SetClassProcs 3 8.4 Tk "Tk Library Procedures" @@ -20,7 +20,7 @@ Tk_SetClassProcs \- register widget specific procedures .AS Tk_ClassProc instanceData .AP Tk_Window tkwin in Token for window to modify. -.AP Tk_ClassProcs *procs in +.AP "const Tk_ClassProcs" *procs in Pointer to data structure containing widget specific procedures. The data structure pointed to by \fIprocs\fR must be static: Tk keeps a reference to it as long as the window exists. diff --git a/generic/tk.decls b/generic/tk.decls index c8b9e5e..ffb5291 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -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: tk.decls,v 1.48 2009/06/29 14:35:01 das Exp $ +# RCS: @(#) $Id: tk.decls,v 1.49 2010/01/10 20:27:22 nijtmans Exp $ library tk @@ -929,7 +929,7 @@ declare 241 generic { } declare 242 generic { void Tk_SetClassProcs(Tk_Window tkwin, - Tk_ClassProcs *procs, ClientData instanceData) + const Tk_ClassProcs *procs, ClientData instanceData) } # New in 8.4a4 diff --git a/generic/tkDecls.h b/generic/tkDecls.h index c915db0..a44ca55 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkDecls.h,v 1.42 2009/02/27 23:23:36 nijtmans Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.43 2010/01/10 20:27:23 nijtmans Exp $ */ #ifndef _TKDECLS @@ -1500,7 +1500,7 @@ EXTERN Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp * interp, #define Tk_SetClassProcs_TCL_DECLARED /* 242 */ EXTERN void Tk_SetClassProcs (Tk_Window tkwin, - Tk_ClassProcs * procs, + const Tk_ClassProcs * procs, ClientData instanceData); #endif #ifndef Tk_SetInternalBorderEx_TCL_DECLARED @@ -1962,7 +1962,7 @@ typedef struct TkStubs { void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc * proc); /* 239 */ void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc * proc); /* 240 */ Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp * interp, Tk_Window parent, const char * screenName); /* 241 */ - void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs * procs, ClientData instanceData); /* 242 */ + void (*tk_SetClassProcs) (Tk_Window tkwin, const Tk_ClassProcs * procs, ClientData instanceData); /* 242 */ void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */ void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */ void (*tk_SetCaretPos) (Tk_Window tkwin, int x, int y, int height); /* 245 */ diff --git a/generic/tkInt.h b/generic/tkInt.h index 83ccbae..322f66a 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -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: tkInt.h,v 1.118 2010/01/06 14:58:30 dkf Exp $ + * RCS: $Id: tkInt.h,v 1.119 2010/01/10 20:27:23 nijtmans Exp $ */ #ifndef _TKINT @@ -802,7 +802,7 @@ typedef struct TkWindow { * Information used by widget classes. */ - Tk_ClassProcs *classProcsPtr; + const Tk_ClassProcs *classProcsPtr; ClientData instanceData; /* diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 5080cc0..6dd8165 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.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: tkWindow.c,v 1.107 2010/01/06 14:58:30 dkf Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.108 2010/01/10 20:27:23 nijtmans Exp $ */ #include "tkInt.h" @@ -2280,7 +2280,7 @@ Tk_SetClass( void Tk_SetClassProcs( Tk_Window tkwin, /* Token for window to modify. */ - Tk_ClassProcs *procs, /* Class procs structure. */ + const Tk_ClassProcs *procs, /* Class procs structure. */ ClientData instanceData) /* Data to be passed to class functions. */ { register TkWindow *winPtr = (TkWindow *) tkwin; -- cgit v0.12