Index: generic/xotclShadow.c =================================================================== diff -u -r09b4e37fc62c4a5fe5514bbcef9c3cdfb8d60470 -r11d5a8a7fab7ba69a94b161bb9c0aae5a2636e7b --- generic/xotclShadow.c (.../xotclShadow.c) (revision 09b4e37fc62c4a5fe5514bbcef9c3cdfb8d60470) +++ generic/xotclShadow.c (.../xotclShadow.c) (revision 11d5a8a7fab7ba69a94b161bb9c0aae5a2636e7b) @@ -1,9 +1,8 @@ /* -*- Mode: c++ -*- - * $Id: xotclShadow.c,v 1.6 2006/10/04 20:40:23 neumann Exp $ * * Extended Object Tcl (XOTcl) * - * Copyright (C) 1999-2008 Gustaf Neumann, Uwe Zdun + * Copyright (C) 1999-2010 Gustaf Neumann, Uwe Zdun * * * xotclShadow.c -- @@ -22,7 +21,7 @@ XOTclShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-XOTE_EXPR]; /*fprintf(stderr," cleanup for %s ti=%p in %p\n", XOTclGlobalStrings[name], ti, interp);*/ - cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjects[name]); + cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjs[name]); if (cmd != NULL) { Tcl_Command_objProc(cmd) = ti->proc; ti->proc = NULL; @@ -37,7 +36,7 @@ XOTclReplaceCommandCheck(Tcl_Interp *interp, XOTclGlobalNames name, Tcl_ObjCmdProc *proc) { Tcl_Command cmd; XOTclShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-XOTE_EXPR]; - cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjects[name]); + cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjs[name]); if (cmd != NULL && ti->proc && Tcl_Command_objProc(cmd) != proc) { /* @@ -58,7 +57,7 @@ int result = TCL_OK; /*fprintf(stderr,"XOTclReplaceCommand %d\n",name);*/ - cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjects[name]); + cmd = Tcl_GetCommandFromObj(interp, XOTclGlobalObjs[name]); if (cmd == NULL) { result = TCL_ERROR; @@ -99,7 +98,7 @@ obj = XOTclGetObjectFromCmdPtr(cmd); if (obj) { return XOTclCallMethodWithArgs((ClientData)obj, interp, - XOTclGlobalObjects[XOTE_MOVE], objv[2], 1, 0, 0); + XOTclGlobalObjs[XOTE_MOVE], objv[2], 1, 0, 0); } } @@ -144,7 +143,7 @@ Tcl_ListObjAppendElement(interp, resultObj, cscPtr->self->cmdName); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("class",5)); Tcl_ListObjAppendElement(interp, resultObj, - cscPtr->cl ? cscPtr->cl->object.cmdName : XOTclGlobalObjects[XOTE_EMPTY]); + cscPtr->cl ? cscPtr->cl->object.cmdName : XOTclGlobalObjs[XOTE_EMPTY]); Tcl_ListObjAppendElement(interp, resultObj, Tcl_NewStringObj("frametype",9)); if (cscPtr->frameType == XOTCL_CSC_TYPE_PLAIN) { frameType = "intrinsic"; @@ -222,7 +221,7 @@ fprintf(stderr,"\n"); } */ - ov[0] = XOTclGlobalObjects[name]; + ov[0] = XOTclGlobalObjs[name]; if (objc > 1) memcpy(ov+1, objv+1, sizeof(Tcl_Obj *)*(objc-1)); result = Tcl_NRCallObjProc(interp, ti->proc, ti->clientData, objc, objv);