summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tk.decls4
-rw-r--r--generic/tkCanvLine.c4
-rw-r--r--generic/tkCanvPoly.c4
-rw-r--r--generic/tkCanvUtil.c14
-rw-r--r--generic/tkDecls.h6
-rw-r--r--generic/tkInt.h4
7 files changed, 23 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f7af98..2309308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@
* 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/tkCanvLine.c
+ * generic/tkCanvUtil.c
+ * generic/tkDecls.h: (regenerated)
2008-11-06 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/generic/tk.decls b/generic/tk.decls
index a71c1e8..efd12b6 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.42 2008/10/30 21:39:16 nijtmans Exp $
+# RCS: @(#) $Id: tk.decls,v 1.43 2008/11/09 21:53:39 nijtmans Exp $
library tk
@@ -827,7 +827,7 @@ declare 216 generic {
int Tk_CreateConsoleWindow(Tcl_Interp *interp)
}
declare 217 generic {
- void Tk_CreateSmoothMethod(Tcl_Interp *interp, Tk_SmoothMethod *method)
+ void Tk_CreateSmoothMethod(Tcl_Interp *interp, const Tk_SmoothMethod *method)
}
#declare 218 generic {
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index e04a72a..209076d 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.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: tkCanvLine.c,v 1.25 2008/11/01 16:14:30 dkf Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.26 2008/11/09 21:53:39 nijtmans Exp $
*/
#include <stdio.h>
@@ -61,7 +61,7 @@ typedef struct LineItem {
* point in line (PTS_IN_ARROW points, first
* of which is tip). Malloc'ed. NULL means no
* arrowhead at last point. */
- Tk_SmoothMethod *smooth; /* Non-zero means draw line smoothed (i.e.
+ const Tk_SmoothMethod *smooth; /* Non-zero means draw line smoothed (i.e.
* with Bezier splines). */
int splineSteps; /* Number of steps in each spline segment. */
} LineItem;
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index e8a9f56..bbdf91a 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.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: tkCanvPoly.c,v 1.22 2008/11/09 20:51:28 nijtmans Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.23 2008/11/09 21:53:39 nijtmans Exp $
*/
#include <stdio.h>
@@ -46,7 +46,7 @@ typedef struct PolygonItem {
Pixmap disabledFillStipple; /* Stipple bitmap for filling polygon if state
* is disabled. */
GC fillGC; /* Graphics context for filling polygon. */
- Tk_SmoothMethod *smooth; /* Non-zero means draw shape smoothed (i.e.
+ const Tk_SmoothMethod *smooth; /* Non-zero means draw shape smoothed (i.e.
* with Bezier splines). */
int splineSteps; /* Number of steps in each spline segment. */
int autoClosed; /* Zero means the given polygon was closed,
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c
index 8647975..31e3af6 100644
--- a/generic/tkCanvUtil.c
+++ b/generic/tkCanvUtil.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvUtil.c,v 1.22 2008/10/30 21:39:16 nijtmans Exp $
+ * RCS: @(#) $Id: tkCanvUtil.c,v 1.23 2008/11/09 21:53:39 nijtmans Exp $
*/
#include "tkInt.h"
@@ -27,13 +27,13 @@ typedef struct SmoothAssocData {
* option. */
} SmoothAssocData;
-Tk_SmoothMethod tkBezierSmoothMethod = {
+const Tk_SmoothMethod tkBezierSmoothMethod = {
"true",
TkMakeBezierCurve,
(void (*) (Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr,
int numPoints, int numSteps)) TkMakeBezierPostscript,
};
-static Tk_SmoothMethod tkRawSmoothMethod = {
+static const Tk_SmoothMethod tkRawSmoothMethod = {
"raw",
TkMakeRawCurve,
(void (*) (Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr,
@@ -633,7 +633,7 @@ InitSmoothMethods(
void
Tk_CreateSmoothMethod(
Tcl_Interp *interp,
- Tk_SmoothMethod *smooth)
+ const Tk_SmoothMethod *smooth)
{
SmoothAssocData *methods, *typePtr2, *prevPtr, *ptr;
methods = Tcl_GetAssocData(interp, "smoothMethod", NULL);
@@ -728,9 +728,9 @@ TkSmoothParseProc(
char *widgRec, /* Pointer to record for item. */
int offset) /* Offset into item. */
{
- register Tk_SmoothMethod **smoothPtr =
- (Tk_SmoothMethod **) (widgRec + offset);
- Tk_SmoothMethod *smooth = NULL;
+ register const Tk_SmoothMethod **smoothPtr =
+ (const Tk_SmoothMethod **) (widgRec + offset);
+ const Tk_SmoothMethod *smooth = NULL;
int b;
size_t length;
SmoothAssocData *methods;
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index b51a4a6..7846f60 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.37 2008/10/30 21:39:16 nijtmans Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.38 2008/11/09 21:53:39 nijtmans Exp $
*/
#ifndef _TKDECLS
@@ -1353,7 +1353,7 @@ EXTERN int Tk_CreateConsoleWindow (Tcl_Interp * interp);
#define Tk_CreateSmoothMethod_TCL_DECLARED
/* 217 */
EXTERN void Tk_CreateSmoothMethod (Tcl_Interp * interp,
- Tk_SmoothMethod * method);
+ const Tk_SmoothMethod * method);
#endif
/* Slot 218 is reserved */
/* Slot 219 is reserved */
@@ -1923,7 +1923,7 @@ typedef struct TkStubs {
int (*tk_SetOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr); /* 214 */
void (*tk_InitConsoleChannels) (Tcl_Interp * interp); /* 215 */
int (*tk_CreateConsoleWindow) (Tcl_Interp * interp); /* 216 */
- void (*tk_CreateSmoothMethod) (Tcl_Interp * interp, Tk_SmoothMethod * method); /* 217 */
+ void (*tk_CreateSmoothMethod) (Tcl_Interp * interp, const Tk_SmoothMethod * method); /* 217 */
void *reserved218;
void *reserved219;
int (*tk_GetDash) (Tcl_Interp * interp, const char * value, Tk_Dash * dash); /* 220 */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index e2d7df3..10fff59 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.91 2008/11/05 23:29:58 nijtmans Exp $
+ * RCS: $Id: tkInt.h,v 1.92 2008/11/09 21:53:39 nijtmans Exp $
*/
#ifndef _TKINT
@@ -947,7 +947,7 @@ MODULE_SCOPE const Tcl_ObjType tkTextIndexType;
* outside world:
*/
-MODULE_SCOPE Tk_SmoothMethod tkBezierSmoothMethod;
+MODULE_SCOPE const Tk_SmoothMethod tkBezierSmoothMethod;
MODULE_SCOPE Tk_ImageType tkBitmapImageType;
MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtGIF;
MODULE_SCOPE void (*tkHandleEventProc) (XEvent* eventPtr);