summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvText.c
diff options
context:
space:
mode:
authorwolfsuit <wolfsuit>2002-02-05 02:25:13 (GMT)
committerwolfsuit <wolfsuit>2002-02-05 02:25:13 (GMT)
commitbcdb604e358027dd76ac168778b14546a8019d8a (patch)
tree32f54ef11288f0dd53eb468b143ef224897cdefc /generic/tkCanvText.c
parentefc846c18b6df17d9dfd3b527214ec413d5f175f (diff)
downloadtk-bcdb604e358027dd76ac168778b14546a8019d8a.zip
tk-bcdb604e358027dd76ac168778b14546a8019d8a.tar.gz
tk-bcdb604e358027dd76ac168778b14546a8019d8a.tar.bz2
Merge with current TOT
Added support for the wm stackorder command Fixed crash when selecting Menu items in the Application menu that we didn't put there. Added first bits of the use of CG for low-level drawing. The line-drawing works, the rest doesn't yet. You have to set the file static useCGDrawing to 1 and rebuild to activate this code.
Diffstat (limited to 'generic/tkCanvText.c')
-rw-r--r--generic/tkCanvText.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index ef57473..43730cd 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.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: tkCanvText.c,v 1.10 2001/08/17 21:08:28 drh Exp $
+ * RCS: @(#) $Id: tkCanvText.c,v 1.10.2.1 2002/02/05 02:25:14 wolfsuit Exp $
*/
#include <stdio.h>
@@ -1376,7 +1376,8 @@ GetSelText(canvas, itemPtr, offset, buffer, maxBytes)
{
TextItem *textPtr = (TextItem *) itemPtr;
int byteCount;
- char *text, *selStart, *selEnd;
+ char *text;
+ CONST char *selStart, *selEnd;
Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
if ((textInfoPtr->selectFirst < 0) ||