summaryrefslogtreecommitdiffstats
path: root/generic/tkTextWind.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-25 12:20:04 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-25 12:20:04 (GMT)
commitb24734f447464d9b41cb0aaaf478615872427a8e (patch)
treea882a27940a7b6b85288d469aac278f99045409d /generic/tkTextWind.c
parentad1ded4a7f409e06bd6e1b33da463e6c7cd844af (diff)
parentb3af1ba9a9e88b812152b32edbb39e4ea9d73b06 (diff)
downloadtk-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/tkTextWind.c')
-rw-r--r--generic/tkTextWind.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index d9c77d1..b046076 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -57,7 +57,7 @@ static int EmbWinDeleteProc(TkTextSegment *segPtr,
TkTextLine *linePtr, int treeGone);
static int EmbWinLayoutProc(TkText *textPtr,
TkTextIndex *indexPtr, TkTextSegment *segPtr,
- int offset, int maxX, int maxChars,int noCharsYet,
+ TkSizeT offset, int maxX, TkSizeT maxChars,int noCharsYet,
TkWrapMode wrapMode, TkTextDispChunk *chunkPtr);
static void EmbWinStructureProc(ClientData clientData,
XEvent *eventPtr);
@@ -822,11 +822,11 @@ EmbWinLayoutProc(
TkText *textPtr, /* Text widget being layed out. */
TkTextIndex *indexPtr, /* Identifies first character in chunk. */
TkTextSegment *ewPtr, /* Segment corresponding to indexPtr. */
- int offset, /* Offset within segPtr corresponding to
+ TkSizeT offset, /* Offset within segPtr corresponding to
* indexPtr (always 0). */
int maxX, /* Chunk must not occupy pixels at this
* position or higher. */
- int maxChars, /* Chunk must not include more than this many
+ TkSizeT maxChars, /* Chunk must not include more than this many
* characters. */
int noCharsYet, /* Non-zero means no characters have been
* assigned to this line yet. */
@@ -1063,7 +1063,7 @@ EmbWinCheckProc(
Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");
}
if (ewPtr->size != 1) {
- Tcl_Panic("EmbWinCheckProc: embedded window has size %d", ewPtr->size);
+ Tcl_Panic("EmbWinCheckProc: embedded window has size %d", (int)ewPtr->size);
}
}