summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/CrtImgType.36
-rw-r--r--doc/CrtPhImgFmt.38
-rw-r--r--generic/tk.decls6
-rw-r--r--generic/tkDecls.h10
-rw-r--r--generic/tkImgPhoto.c6
6 files changed, 23 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 2309308..58aac75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,11 +12,14 @@
* generic/tkCanvWind.c:
* generic/tkRectOval.c:
* generic/tkScrollbar.c:
- * generic/tk.decls: One more (hopefully the last) signature change
- * generic/tkInt.h: in Tk_CreateSmoothMethod.
+ * generic/tk.decls: Two more (hopefully the last) signature changes
+ * generic/tkInt.h: in Tk_CreateSmoothMethod and Tk_CreatePhotoImageFormat
* generic/tkCanvLine.c
* generic/tkCanvUtil.c
+ * generic/tkImgPhoto.c
* generic/tkDecls.h: (regenerated)
+ * doc/CrtImgType.3 doc updates
+ * doc/CrtPhImgFmt.3
2008-11-06 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index 805eb1c..5b074d2 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: CrtImgType.3,v 1.14 2008/06/30 22:57:01 dkf Exp $
+'\" RCS: @(#) $Id: CrtImgType.3,v 1.15 2008/11/09 23:16:56 nijtmans Exp $
'\"
.so man.macros
.TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures"
@@ -60,7 +60,7 @@ the name of the image type and pointers to five procedures provided
by the image manager to deal with images of this type:
.CS
typedef struct Tk_ImageType {
- char *\fIname\fR;
+ const char *\fIname\fR;
Tk_ImageCreateProc *\fIcreateProc\fR;
Tk_ImageGetProc *\fIgetProc\fR;
Tk_ImageDisplayProc *\fIdisplayProc\fR;
@@ -110,7 +110,7 @@ an image of the new type.
.CS
typedef int \fBTk_ImageCreateProc\fR(
Tcl_Interp *\fIinterp\fR,
- char *\fIname\fR,
+ const char *\fIname\fR,
int \fIobjc\fR,
Tcl_Obj *const \fIobjv\fR[],
Tk_ImageType *\fItypePtr\fR,
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index cd2fc85..6c535a6 100644
--- a/doc/CrtPhImgFmt.3
+++ b/doc/CrtPhImgFmt.3
@@ -9,7 +9,7 @@
'\" Department of Computer Science,
'\" Australian National University.
'\"
-'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.11 2008/06/30 22:57:01 dkf Exp $
+'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.12 2008/11/09 23:16:56 nijtmans Exp $
'\"
.so man.macros
.TH Tk_CreatePhotoImageFormat 3 8.5 Tk "Tk Library Procedures"
@@ -22,8 +22,8 @@ Tk_CreatePhotoImageFormat \- define new file format for photo images
.sp
\fBTk_CreatePhotoImageFormat\fR(\fIformatPtr\fR)
.SH ARGUMENTS
-.AS Tk_PhotoImageFormat *formatPtr
-.AP Tk_PhotoImageFormat *formatPtr in
+.AS "const Tk_PhotoImageFormat" *formatPtr
+.AP "const Tk_PhotoImageFormat" *formatPtr in
Structure that defines the new file format.
.BE
.SH DESCRIPTION
@@ -47,7 +47,7 @@ handler to deal with files and strings in this format. The
Tk_PhotoImageFormat structure contains the following fields:
.CS
typedef struct Tk_PhotoImageFormat {
- char *\fIname\fR;
+ const char *\fIname\fR;
Tk_ImageFileMatchProc *\fIfileMatchProc\fR;
Tk_ImageStringMatchProc *\fIstringMatchProc\fR;
Tk_ImageFileReadProc *\fIfileReadProc\fR;
diff --git a/generic/tk.decls b/generic/tk.decls
index efd12b6..632c85f 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.43 2008/11/09 21:53:39 nijtmans Exp $
+# RCS: @(#) $Id: tk.decls,v 1.44 2008/11/09 23:16:56 nijtmans Exp $
library tk
@@ -191,7 +191,7 @@ declare 39 generic {
void Tk_CreateItemType(Tk_ItemType *typePtr)
}
declare 40 generic {
- void Tk_CreatePhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
+ void Tk_CreatePhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
}
declare 41 generic {
void Tk_CreateSelHandler(Tk_Window tkwin,
@@ -1071,7 +1071,7 @@ declare 272 generic {
void Tk_CreateOldImageType(Tk_ImageType *typePtr)
}
declare 273 generic {
- void Tk_CreateOldPhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
+ void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
}
# Define the platform specific public Tk interface. These functions are
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 7846f60..a105ab0 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.38 2008/11/09 21:53:39 nijtmans Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.39 2008/11/09 23:16:56 nijtmans Exp $
*/
#ifndef _TKDECLS
@@ -295,7 +295,7 @@ EXTERN void Tk_CreateItemType (Tk_ItemType * typePtr);
#define Tk_CreatePhotoImageFormat_TCL_DECLARED
/* 40 */
EXTERN void Tk_CreatePhotoImageFormat (
- Tk_PhotoImageFormat * formatPtr);
+ const Tk_PhotoImageFormat * formatPtr);
#endif
#ifndef Tk_CreateSelHandler_TCL_DECLARED
#define Tk_CreateSelHandler_TCL_DECLARED
@@ -1692,7 +1692,7 @@ EXTERN void Tk_CreateOldImageType (Tk_ImageType * typePtr);
#define Tk_CreateOldPhotoImageFormat_TCL_DECLARED
/* 273 */
EXTERN void Tk_CreateOldPhotoImageFormat (
- Tk_PhotoImageFormat * formatPtr);
+ const Tk_PhotoImageFormat * formatPtr);
#endif
typedef struct TkStubHooks {
@@ -1746,7 +1746,7 @@ typedef struct TkStubs {
void (*tk_CreateGenericHandler) (Tk_GenericProc * proc, ClientData clientData); /* 37 */
void (*tk_CreateImageType) (Tk_ImageType * typePtr); /* 38 */
void (*tk_CreateItemType) (Tk_ItemType * typePtr); /* 39 */
- void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 40 */
+ void (*tk_CreatePhotoImageFormat) (const Tk_PhotoImageFormat * formatPtr); /* 40 */
void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format); /* 41 */
Tk_Window (*tk_CreateWindow) (Tcl_Interp * interp, Tk_Window parent, const char * name, const char * screenName); /* 42 */
Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp * interp, Tk_Window tkwin, const char * pathName, const char * screenName); /* 43 */
@@ -1979,7 +1979,7 @@ typedef struct TkStubs {
void (*tk_ResetUserInactiveTime) (Display * dpy); /* 270 */
Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
void (*tk_CreateOldImageType) (Tk_ImageType * typePtr); /* 272 */
- void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 273 */
+ void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat * formatPtr); /* 273 */
} TkStubs;
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index aefcf50..0c19640 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.84 2008/10/28 22:33:06 nijtmans Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.85 2008/11/09 23:16:56 nijtmans Exp $
*/
#include "tkImgPhoto.h"
@@ -261,7 +261,7 @@ PhotoFormatThreadExitProc(
void
Tk_CreateOldPhotoImageFormat(
- Tk_PhotoImageFormat *formatPtr)
+ const Tk_PhotoImageFormat *formatPtr)
/* Structure describing the format. All of the
* fields except "nextPtr" must be filled in
* by caller. Must not have been passed to
@@ -285,7 +285,7 @@ Tk_CreateOldPhotoImageFormat(
void
Tk_CreatePhotoImageFormat(
- Tk_PhotoImageFormat *formatPtr)
+ const Tk_PhotoImageFormat *formatPtr)
/* Structure describing the format. All of the
* fields except "nextPtr" must be filled in
* by caller. Must not have been passed to