summaryrefslogtreecommitdiffstats
path: root/generic/tkColor.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/tkColor.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/tkColor.c')
-rw-r--r--generic/tkColor.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkColor.c b/generic/tkColor.c
index 6c4d4e5..7a9ced2 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
@@ -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: tkColor.c,v 1.7 2000/05/11 22:37:06 hobbs Exp $
+ * RCS: @(#) $Id: tkColor.c,v 1.8 2001/08/15 15:44:36 dkf Exp $
*/
#include "tkColor.h"
@@ -54,7 +54,7 @@ static void InitColorObj _ANSI_ARGS_((Tcl_Obj *objPtr));
* ptr1 field of the Tcl_Obj points to a TkColor object.
*/
-static Tcl_ObjType colorObjType = {
+Tcl_ObjType tkColorObjType = {
"color", /* name */
FreeColorObjProc, /* freeIntRepProc */
DupColorObjProc, /* dupIntRepProc */
@@ -98,7 +98,7 @@ Tk_AllocColorFromObj(interp, tkwin, objPtr)
{
TkColor *tkColPtr;
- if (objPtr->typePtr != &colorObjType) {
+ if (objPtr->typePtr != &tkColorObjType) {
InitColorObj(objPtr);
}
tkColPtr = (TkColor *) objPtr->internalRep.twoPtrValue.ptr1;
@@ -643,7 +643,7 @@ Tk_GetColorFromObj(tkwin, objPtr)
Tcl_HashEntry *hashPtr;
TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
- if (objPtr->typePtr != &colorObjType) {
+ if (objPtr->typePtr != &tkColorObjType) {
InitColorObj(objPtr);
}
@@ -731,7 +731,7 @@ InitColorObj(objPtr)
if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
(*typePtr->freeIntRepProc)(objPtr);
}
- objPtr->typePtr = &colorObjType;
+ objPtr->typePtr = &tkColorObjType;
objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) NULL;
}