diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkInt.h | 3 | ||||
| -rw-r--r-- | generic/tkObj.c | 3 | ||||
| -rw-r--r-- | generic/tkTextIndex.c | 8 |
4 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2003-10-10 Donal K. Fellows <fellowsd@cs.man.ac.uk> + + * generic/tkObj.c (TkRegisterObjTypes): Register the type of text + indexes. + 2003-10-09 Jeff Hobbs <jeffh@ActiveState.com> * win/tkWinButton.c (TkpDisplayButton): correct imageYOffset for diff --git a/generic/tkInt.h b/generic/tkInt.h index 8ef78d9..740320b 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: $Id: tkInt.h,v 1.58 2003/05/19 13:04:23 vincentdarley Exp $ + * RCS: $Id: tkInt.h,v 1.59 2003/10/10 15:56:22 dkf Exp $ */ #ifndef _TKINT @@ -911,6 +911,7 @@ extern Tcl_ObjType tkCursorObjType; extern Tcl_ObjType tkFontObjType; extern Tcl_ObjType tkOptionObjType; extern Tcl_ObjType tkStateKeyObjType; +extern Tcl_ObjType tkTextIndexType; /* * Miscellaneous variables shared among Tk modules but not exported diff --git a/generic/tkObj.c b/generic/tkObj.c index fff25d9..5338cb5 100644 --- a/generic/tkObj.c +++ b/generic/tkObj.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: tkObj.c,v 1.8 2003/01/28 20:39:16 jenglish Exp $ + * RCS: @(#) $Id: tkObj.c,v 1.9 2003/10/10 15:56:22 dkf Exp $ */ #include "tkInt.h" @@ -857,4 +857,5 @@ TkRegisterObjTypes() Tcl_RegisterObjType(&pixelObjType); Tcl_RegisterObjType(&tkStateKeyObjType); Tcl_RegisterObjType(&windowObjType); + Tcl_RegisterObjType(&tkTextIndexType); } diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index cb8cbea..06396db 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextIndex.c,v 1.7 2003/05/19 13:04:23 vincentdarley Exp $ + * RCS: @(#) $Id: tkTextIndex.c,v 1.8 2003/10/10 15:56:22 dkf Exp $ */ #include "default.h" @@ -56,7 +56,7 @@ static void UpdateStringOfTextIndex _ANSI_ARGS_((Tcl_Obj *objPtr)); * Define the 'textindex' object type, which Tk uses to represent * indices in text widgets internally. */ -Tcl_ObjType tclTextIndexType = { +Tcl_ObjType tkTextIndexType = { "textindex", /* name */ FreeTextIndexInternalRep, /* freeIntRepProc */ DupTextIndexInternalRep, /* dupIntRepProc */ @@ -165,7 +165,7 @@ MakeObjIndex(textPtr, objPtr, origPtr) indexPtr->linePtr = origPtr->linePtr; indexPtr->byteIndex = origPtr->byteIndex; SET_TEXTINDEX(objPtr, indexPtr); - objPtr->typePtr = &tclTextIndexType; + objPtr->typePtr = &tkTextIndexType; indexPtr->textPtr = textPtr; if (textPtr != NULL) { @@ -187,7 +187,7 @@ TkTextGetIndexFromObj(interp, textPtr, objPtr) TkTextIndex *indexPtr = NULL; int cache; - if (objPtr->typePtr == &tclTextIndexType) { + if (objPtr->typePtr == &tkTextIndexType) { int epoch; indexPtr = GET_TEXTINDEX(objPtr); |