Index: generic/xotcl.c =================================================================== diff -u -rbc1c78f197db742441e0ab0633bd1e2b2920d10f -re476fd3814e139958bab9cacbd8e2f8def632d00 --- generic/xotcl.c (.../xotcl.c) (revision bc1c78f197db742441e0ab0633bd1e2b2920d10f) +++ generic/xotcl.c (.../xotcl.c) (revision e476fd3814e139958bab9cacbd8e2f8def632d00) @@ -8521,18 +8521,6 @@ } extern int -XOTclCreateClass(Tcl_Interp *interp, Tcl_Obj *name, XOTcl_Class *class) { - XOTclClass *cl = (XOTclClass *) class; - int result; - - INCR_REF_COUNT(name); - result = XOTclCallMethodWithArgs((ClientData)cl, interp, - XOTclGlobalObjects[XOTE_CREATE], name, 1, 0, 0); - DECR_REF_COUNT(name); - return result; -} - -extern int XOTclCreate(Tcl_Interp *interp, XOTcl_Class *class, Tcl_Obj *name, ClientData clientData, int objc, Tcl_Obj *CONST objv[]) { XOTclClass *cl = (XOTclClass *) class; @@ -8560,12 +8548,6 @@ return callDestroyMethod(interp, object, 0); } -int -XOTclDeleteClass(Tcl_Interp *interp, XOTcl_Class *cli) { - XOTclObject *object = (XOTclObject *) cli; - return callDestroyMethod(interp, object, 0); -} - extern int XOTclUnsetInstVar2(XOTcl_Object *object1, Tcl_Interp *interp, char *name1, char *name2, int flgs) { Index: generic/xotcl.decls =================================================================== diff -u -rc942f4e117d2aa3c8594702e0476a3f73a4147df -re476fd3814e139958bab9cacbd8e2f8def632d00 --- generic/xotcl.decls (.../xotcl.decls) (revision c942f4e117d2aa3c8594702e0476a3f73a4147df) +++ generic/xotcl.decls (.../xotcl.decls) (revision e476fd3814e139958bab9cacbd8e2f8def632d00) @@ -46,15 +46,15 @@ #declare 7 generic { # #} -declare 8 generic { - int XOTclCreateClass(Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl) -} +#declare 8 generic { +# int XOTclCreateClass(Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl) +#} declare 9 generic { int XOTclDeleteObject(Tcl_Interp *interp, struct XOTcl_Object *obj) } -declare 10 generic { - int XOTclDeleteClass(Tcl_Interp *interp, struct XOTcl_Class *cl) -} +#declare 10 generic { +# int XOTclDeleteClass(Tcl_Interp *interp, struct XOTcl_Class *cl) +#} #declare 11 generic { # int XOTclAddObjectMethod(Tcl_Interp *interp, struct XOTcl_Object *obj, # CONST char* nm, Tcl_ObjCmdProc* proc, Index: generic/xotclDecls.h =================================================================== diff -u -rc942f4e117d2aa3c8594702e0476a3f73a4147df -re476fd3814e139958bab9cacbd8e2f8def632d00 --- generic/xotclDecls.h (.../xotclDecls.h) (revision c942f4e117d2aa3c8594702e0476a3f73a4147df) +++ generic/xotclDecls.h (.../xotclDecls.h) (revision e476fd3814e139958bab9cacbd8e2f8def632d00) @@ -55,24 +55,14 @@ Tcl_Obj * name, struct XOTcl_Class * cl); #endif /* Slot 7 is reserved */ -#ifndef XOTclCreateClass_TCL_DECLARED -#define XOTclCreateClass_TCL_DECLARED -/* 8 */ -EXTERN int XOTclCreateClass (Tcl_Interp * interp, - Tcl_Obj * name, struct XOTcl_Class * cl); -#endif +/* Slot 8 is reserved */ #ifndef XOTclDeleteObject_TCL_DECLARED #define XOTclDeleteObject_TCL_DECLARED /* 9 */ EXTERN int XOTclDeleteObject (Tcl_Interp * interp, struct XOTcl_Object * obj); #endif -#ifndef XOTclDeleteClass_TCL_DECLARED -#define XOTclDeleteClass_TCL_DECLARED -/* 10 */ -EXTERN int XOTclDeleteClass (Tcl_Interp * interp, - struct XOTcl_Class * cl); -#endif +/* Slot 10 is reserved */ /* Slot 11 is reserved */ /* Slot 12 is reserved */ #ifndef XOTclRemoveObjectMethod_TCL_DECLARED @@ -262,9 +252,9 @@ struct XOTcl_Class * (*xOTclGetClass) (Tcl_Interp * interp, char * name); /* 5 */ int (*xOTclCreateObject) (Tcl_Interp * interp, Tcl_Obj * name, struct XOTcl_Class * cl); /* 6 */ void *reserved7; - int (*xOTclCreateClass) (Tcl_Interp * interp, Tcl_Obj * name, struct XOTcl_Class * cl); /* 8 */ + void *reserved8; int (*xOTclDeleteObject) (Tcl_Interp * interp, struct XOTcl_Object * obj); /* 9 */ - int (*xOTclDeleteClass) (Tcl_Interp * interp, struct XOTcl_Class * cl); /* 10 */ + void *reserved10; void *reserved11; void *reserved12; int (*xOTclRemoveObjectMethod) (Tcl_Interp * interp, struct XOTcl_Object * obj, CONST char * nm); /* 13 */ @@ -337,18 +327,12 @@ (xotclStubsPtr->xOTclCreateObject) /* 6 */ #endif /* Slot 7 is reserved */ -#ifndef XOTclCreateClass -#define XOTclCreateClass \ - (xotclStubsPtr->xOTclCreateClass) /* 8 */ -#endif +/* Slot 8 is reserved */ #ifndef XOTclDeleteObject #define XOTclDeleteObject \ (xotclStubsPtr->xOTclDeleteObject) /* 9 */ #endif -#ifndef XOTclDeleteClass -#define XOTclDeleteClass \ - (xotclStubsPtr->xOTclDeleteClass) /* 10 */ -#endif +/* Slot 10 is reserved */ /* Slot 11 is reserved */ /* Slot 12 is reserved */ #ifndef XOTclRemoveObjectMethod Index: generic/xotclStubInit.c =================================================================== diff -u -r1c11937f4f0aea905fbedfbb9c2d1782b08833f5 -re476fd3814e139958bab9cacbd8e2f8def632d00 --- generic/xotclStubInit.c (.../xotclStubInit.c) (revision 1c11937f4f0aea905fbedfbb9c2d1782b08833f5) +++ generic/xotclStubInit.c (.../xotclStubInit.c) (revision e476fd3814e139958bab9cacbd8e2f8def632d00) @@ -44,9 +44,9 @@ XOTclGetClass, /* 5 */ XOTclCreateObject, /* 6 */ NULL, /* 7 */ - XOTclCreateClass, /* 8 */ + NULL, /* 8 */ XOTclDeleteObject, /* 9 */ - XOTclDeleteClass, /* 10 */ + NULL, /* 10 */ NULL, /* 11 */ NULL, /* 12 */ XOTclRemoveObjectMethod, /* 13 */