summaryrefslogtreecommitdiffstats
path: root/generic/tkConfig.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2001-08-15 15:44:35 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2001-08-15 15:44:35 (GMT)
commit0494d6ea369901955402d84ce76a13ddc200957f (patch)
treee817d32e68064c76449930b08bb891ff654501b8 /generic/tkConfig.c
parentfb862db0788d85c6d070781c2cad608e0a470a96 (diff)
downloadtk-0494d6ea369901955402d84ce76a13ddc200957f.zip
tk-0494d6ea369901955402d84ce76a13ddc200957f.tar.gz
tk-0494d6ea369901955402d84ce76a13ddc200957f.tar.bz2
Register Tk's object types with Tcl (Tcl Bug 450545)
Diffstat (limited to 'generic/tkConfig.c')
-rw-r--r--generic/tkConfig.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 338edb9..ab8b55f 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.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: tkConfig.c,v 1.14 2000/10/12 21:14:33 ericm Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.15 2001/08/15 15:44:36 dkf Exp $
*/
/*
@@ -140,7 +140,7 @@ static int SetOptionFromAny _ANSI_ARGS_((Tcl_Interp *interp,
* and the internalPtr2 field points to the entry that matched.
*/
-Tcl_ObjType optionType = {
+Tcl_ObjType tkOptionObjType = {
"option", /* name */
(Tcl_FreeInternalRepProc *) NULL, /* freeIntRepProc */
(Tcl_DupInternalRepProc *) NULL, /* dupIntRepProc */
@@ -1042,7 +1042,7 @@ GetOptionFromObj(interp, objPtr, tablePtr)
* First, check to see if the object already has the answer cached.
*/
- if (objPtr->typePtr == &optionType) {
+ if (objPtr->typePtr == &tkOptionObjType) {
if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
}
@@ -1108,7 +1108,7 @@ GetOptionFromObj(interp, objPtr, tablePtr)
}
objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) tablePtr;
objPtr->internalRep.twoPtrValue.ptr2 = (VOID *) bestPtr;
- objPtr->typePtr = &optionType;
+ objPtr->typePtr = &tkOptionObjType;
return bestPtr;
error: