diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/tk.decls | 4 | ||||
| -rw-r--r-- | generic/tkClipboard.c | 16 | ||||
| -rw-r--r-- | generic/tkDecls.h | 6 |
4 files changed, 20 insertions, 14 deletions
@@ -1,4 +1,10 @@ -2008-12-31 David Gravereaux <davygrvy@pobox.com> +2009-01-03 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tk.decls: CONSTify Tk_ClipboardAppend + * generic/tkClipboard.c: + * generic/tkDecls.h: (regenerated) + +2008-12-31 David Gravereaux <davygrvy@pobox.com> * win/rules.vc: small bug not setting SYMBOLS macro fixed. diff --git a/generic/tk.decls b/generic/tk.decls index 8d3740e..4de7253 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.45 2008/11/12 00:15:24 nijtmans Exp $ +# RCS: @(#) $Id: tk.decls,v 1.46 2009/01/02 23:20:32 nijtmans Exp $ library tk @@ -129,7 +129,7 @@ declare 24 generic { } declare 25 generic { int Tk_ClipboardAppend(Tcl_Interp *interp,Tk_Window tkwin, - Atom target, Atom format, char* buffer) + Atom target, Atom format, const char* buffer) } declare 26 generic { int Tk_ClipboardClear(Tcl_Interp *interp, Tk_Window tkwin) diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index 8649636..138a528 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.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: tkClipboard.c,v 1.22 2008/10/28 22:33:06 nijtmans Exp $ + * RCS: @(#) $Id: tkClipboard.c,v 1.23 2009/01/02 23:20:32 nijtmans Exp $ */ #include "tkInt.h" @@ -326,7 +326,7 @@ Tk_ClipboardAppend( * clipboard item, e.g. STRING or LENGTH. */ Atom format, /* Format in which the selection information * should be returned to the requestor. */ - char *buffer) /* NULL terminated string containing the data + const char *buffer) /* NULL terminated string containing the data * to be added to the clipboard. */ { TkWindow *winPtr = (TkWindow *) tkwin; @@ -423,7 +423,7 @@ Tk_ClipboardObjCmd( Tcl_Obj *const objv[]) /* Argument strings. */ { Tk_Window tkwin = (Tk_Window) clientData; - char *path = NULL; + const char *path = NULL; Atom selection; static const char *const optionStrings[] = { "append", "clear", "get", NULL }; enum options { CLIPBOARD_APPEND, CLIPBOARD_CLEAR, CLIPBOARD_GET }; @@ -442,9 +442,9 @@ Tk_ClipboardObjCmd( switch ((enum options) index) { case CLIPBOARD_APPEND: { Atom target, format; - char *targetName = NULL; - char *formatName = NULL; - char *string; + const char *targetName = NULL; + const char *formatName = NULL; + const char *string; static const char *const appendOptionStrings[] = { "-displayof", "-format", "-type", NULL }; @@ -544,10 +544,10 @@ Tk_ClipboardObjCmd( } case CLIPBOARD_GET: { Atom target; - char *targetName = NULL; + const char *targetName = NULL; Tcl_DString selBytes; int result; - char *string; + const char *string; static const char *const getOptionStrings[] = { "-displayof", "-type", NULL }; diff --git a/generic/tkDecls.h b/generic/tkDecls.h index 16af814..562de77 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.40 2008/11/12 00:15:26 nijtmans Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.41 2009/01/02 23:20:32 nijtmans Exp $ */ #ifndef _TKDECLS @@ -194,7 +194,7 @@ EXTERN void Tk_ClearSelection (Tk_Window tkwin, Atom selection); /* 25 */ EXTERN int Tk_ClipboardAppend (Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, - char* buffer); + const char* buffer); #endif #ifndef Tk_ClipboardClear_TCL_DECLARED #define Tk_ClipboardClear_TCL_DECLARED @@ -1731,7 +1731,7 @@ typedef struct TkStubs { void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes * attsPtr); /* 22 */ int (*tk_CharBbox) (Tk_TextLayout layout, int index, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 23 */ void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */ - int (*tk_ClipboardAppend) (Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, char* buffer); /* 25 */ + int (*tk_ClipboardAppend) (Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, const char* buffer); /* 25 */ int (*tk_ClipboardClear) (Tcl_Interp * interp, Tk_Window tkwin); /* 26 */ int (*tk_ConfigureInfo) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 27 */ int (*tk_ConfigureValue) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 28 */ |