diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 16:07:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 16:07:23 (GMT) |
| commit | 06420ba2fed328cf5559b51d715c8554ff00c69c (patch) | |
| tree | 4352e4ab25a6a1a63247f7c413a465b5d41f2e9a /generic/tkTextDisp.c | |
| parent | 34fbe0438a0f9b87108fb087f3d21c3d01399a58 (diff) | |
| parent | 9c29a905fa4d7ec4c5aa8528475f312dc3d39dab (diff) | |
| download | tk-06420ba2fed328cf5559b51d715c8554ff00c69c.zip tk-06420ba2fed328cf5559b51d715c8554ff00c69c.tar.gz tk-06420ba2fed328cf5559b51d715c8554ff00c69c.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index d14a25d..e6b04cc 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -7656,15 +7656,15 @@ TkTextCharLayoutProc( #ifdef TK_LAYOUT_WITH_BASE_CHUNKS if (baseCharChunkPtr == NULL) { baseCharChunkPtr = chunkPtr; - bciPtr = ckalloc(sizeof(BaseCharInfo)); + bciPtr = (BaseCharInfo *)ckalloc(sizeof(BaseCharInfo)); baseString = &bciPtr->baseChars; Tcl_DStringInit(baseString); bciPtr->width = 0; ciPtr = &bciPtr->ci; } else { - bciPtr = baseCharChunkPtr->clientData; - ciPtr = ckalloc(sizeof(CharInfo)); + bciPtr = (BaseCharInfo *)baseCharChunkPtr->clientData; + ciPtr = (CharInfo *)ckalloc(sizeof(CharInfo)); baseString = &bciPtr->baseChars; } @@ -7988,7 +7988,7 @@ CharDisplayProc( } #ifdef TK_DRAW_IN_CONTEXT - bciPtr = ciPtr->baseChunkPtr->clientData; + bciPtr = (BaseCharInfo *)ciPtr->baseChunkPtr->clientData; numBytes = Tcl_DStringLength(&bciPtr->baseChars); string = Tcl_DStringValue(&bciPtr->baseChars); @@ -8899,7 +8899,7 @@ FinalizeBaseChunk( if (chunkPtr->displayProc != CharDisplayProc) { continue; } - ciPtr = chunkPtr->clientData; + ciPtr = (CharInfo *)chunkPtr->clientData; if (ciPtr->baseChunkPtr != baseCharChunkPtr) { break; } @@ -8916,7 +8916,7 @@ FinalizeBaseChunk( } if (addChunkPtr != NULL) { - ciPtr = addChunkPtr->clientData; + ciPtr = (CharInfo *)addChunkPtr->clientData; ciPtr->chars = baseChars + ciPtr->baseOffset; #ifdef TK_DRAW_IN_CONTEXT @@ -8967,7 +8967,7 @@ FreeBaseChunk( if (chunkPtr->undisplayProc != CharUndisplayProc) { continue; } - ciPtr = chunkPtr->clientData; + ciPtr = (CharInfo *)chunkPtr->clientData; if (ciPtr->baseChunkPtr != baseChunkPtr) { break; } @@ -9087,14 +9087,14 @@ RemoveFromBaseChunk( * Reinstitute this base chunk for re-layout. */ - ciPtr = chunkPtr->clientData; + ciPtr = (CharInfo *)chunkPtr->clientData; baseCharChunkPtr = ciPtr->baseChunkPtr; /* * Remove the chunk data from the base chunk data. */ - bciPtr = baseCharChunkPtr->clientData; + bciPtr = (BaseCharInfo *)baseCharChunkPtr->clientData; #ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS if ((ciPtr->baseOffset + ciPtr->numBytes) |