diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-25 12:20:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-25 12:20:04 (GMT) |
| commit | b24734f447464d9b41cb0aaaf478615872427a8e (patch) | |
| tree | a882a27940a7b6b85288d469aac278f99045409d /generic/tkCanvUtil.c | |
| parent | ad1ded4a7f409e06bd6e1b33da463e6c7cd844af (diff) | |
| parent | b3af1ba9a9e88b812152b32edbb39e4ea9d73b06 (diff) | |
| download | tk-b24734f447464d9b41cb0aaaf478615872427a8e.zip tk-b24734f447464d9b41cb0aaaf478615872427a8e.tar.gz tk-b24734f447464d9b41cb0aaaf478615872427a8e.tar.bz2 | |
Use more size_t type internally, when compiling against Tcl 9.0 headers. No change when using Tcl 8.x.
Add C++ travis build for TCL_UTF_MAX=4 (compat with Tcl 8.7) and TCL_UTF_MAX=6 (compat with Tcl 9.0) making sure that C++'s strict typing stays correct.
Diffstat (limited to 'generic/tkCanvUtil.c')
| -rw-r--r-- | generic/tkCanvUtil.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c index 1d6a394..eee1ad2 100644 --- a/generic/tkCanvUtil.c +++ b/generic/tkCanvUtil.c @@ -402,13 +402,13 @@ Tk_CanvasGetTextInfo( */ int -Tk_CanvasTagsParseProc( +TkCanvasTagsParseProc( ClientData dummy, /* Not used.*/ Tcl_Interp *interp, /* Used for reporting errors. */ Tk_Window tkwin, /* Window containing canvas widget. */ const char *value, /* Value of option (list of tag names). */ char *widgRec, /* Pointer to record for item. */ - int offset) /* Offset into item (ignored). */ + TkSizeT offset) /* Offset into item (ignored). */ { Tk_Item *itemPtr = (Tk_Item *) widgRec; int argc, i; @@ -472,11 +472,11 @@ Tk_CanvasTagsParseProc( */ const char * -Tk_CanvasTagsPrintProc( +TkCanvasTagsPrintProc( ClientData dummy, /* Ignored. */ Tk_Window tkwin, /* Window containing canvas widget. */ char *widgRec, /* Pointer to record for item. */ - int offset, /* Ignored. */ + TkSizeT offset, /* Ignored. */ Tcl_FreeProc **freeProcPtr) /* Pointer to variable to fill in with * information about how to reclaim storage * for return string. */ @@ -523,7 +523,7 @@ TkCanvasDashParseProc( Tk_Window tkwin, /* Window containing canvas widget. */ const char *value, /* Value of option. */ char *widgRec, /* Pointer to record for item. */ - int offset) /* Offset into item. */ + TkSizeT offset) /* Offset into item. */ { (void)dummy; (void)tkwin; @@ -558,7 +558,7 @@ TkCanvasDashPrintProc( ClientData dummy, /* Ignored. */ Tk_Window tkwin, /* Window containing canvas widget. */ char *widgRec, /* Pointer to record for item. */ - int offset, /* Offset in record for item. */ + TkSizeT offset, /* Offset in record for item. */ Tcl_FreeProc **freeProcPtr) /* Pointer to variable to fill in with * information about how to reclaim storage * for return string. */ @@ -747,7 +747,7 @@ TkSmoothParseProc( Tk_Window tkwin, /* Window containing canvas widget. */ const char *value, /* Value of option. */ char *widgRec, /* Pointer to record for item. */ - int offset) /* Offset into item. */ + TkSizeT offset) /* Offset into item. */ { const Tk_SmoothMethod **smoothPtr = (const Tk_SmoothMethod **) (widgRec + offset); @@ -839,7 +839,7 @@ TkSmoothPrintProc( ClientData dummy, /* Ignored. */ Tk_Window tkwin, /* Window containing canvas widget. */ char *widgRec, /* Pointer to record for item. */ - int offset, /* Offset into item. */ + TkSizeT offset, /* Offset into item. */ Tcl_FreeProc **freeProcPtr) /* Pointer to variable to fill in with * information about how to reclaim storage * for return string. */ |