summaryrefslogtreecommitdiffstats
path: root/generic/tkTextDisp.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-06-01 04:01:30 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-06-01 04:01:30 (GMT)
commit4821c67f43947a73c2360bf002f1e5832fe49506 (patch)
tree468162ebc7eb12dc4a3455db2921f461cb0549fd /generic/tkTextDisp.c
parent702b407781f8ca32a92cf1eb1ef46a76d86c15fd (diff)
downloadtk-4821c67f43947a73c2360bf002f1e5832fe49506.zip
tk-4821c67f43947a73c2360bf002f1e5832fe49506.tar.gz
tk-4821c67f43947a73c2360bf002f1e5832fe49506.tar.bz2
merge updates from HEAD
Diffstat (limited to 'generic/tkTextDisp.c')
-rw-r--r--generic/tkTextDisp.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index f42c086..315c190 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkTextDisp.c,v 1.63 2007/04/23 21:15:19 das Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.63.2.1 2007/06/01 04:01:32 dgp Exp $
*/
#include "tkPort.h"
@@ -8450,7 +8450,9 @@ RemoveFromBaseChunk(
BaseCharInfo *bciPtr;
if (chunkPtr->displayProc != CharDisplayProc) {
+#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk type\n");
+#endif
return;
}
@@ -8469,11 +8471,13 @@ RemoveFromBaseChunk(
if ((ciPtr->baseOffset + ciPtr->numBytes)
!= Tcl_DStringLength(&bciPtr->baseChars)) {
+#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk "
"(not last)\n");
+#endif
}
- Tcl_DStringSetLength(&bciPtr->baseChars,ciPtr->baseOffset);
+ Tcl_DStringSetLength(&bciPtr->baseChars, ciPtr->baseOffset);
/*
* Invalidate the stored pixel width of the base chunk.