From: John L. <jr...@us...> - 2007-08-01 19:15:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2271/wxLua/modules/wxlua/include Modified Files: wxldefs.h wxlstate.h wxlua_bind.h Log Message: Add ored enum DELETE_CLEAR_OBJECT for wxLuaState::RemoveTrackedObject to simplify Apply patch to lparser.c "Too many variables in an assignment may cause a C stack overflow" Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxldefs.h 1 Aug 2007 18:24:46 -0000 1.31 --- wxldefs.h 1 Aug 2007 19:15:37 -0000 1.32 *************** *** 67,71 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 16 // ---------------------------------------------------------------------------- --- 67,71 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 17 // ---------------------------------------------------------------------------- Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** wxlstate.h 26 Jul 2007 18:56:38 -0000 1.88 --- wxlstate.h 1 Aug 2007 19:15:37 -0000 1.89 *************** *** 604,611 **** enum RemoveTrackedObject_flags { ! UNDELETE = 0, // stop tracking for deletion (someone else owns this) DELETE_OBJECT = 0x0001, // delete the object ! CLEAR_LUA_TRACKED = 0x0002, // clear tracking the object in lua reg table ! CLEAR_DERIVED_METHODS = 0x0004 // clear any derived methods in the lua reg table }; --- 604,612 ---- enum RemoveTrackedObject_flags { ! UNDELETE_OBJECT = 0, // stop tracking for deletion (someone else owns this) DELETE_OBJECT = 0x0001, // delete the object ! CLEAR_TRACKED_OBJECT = 0x0002, // clear tracking the object in lua reg table ! CLEAR_DERIVED_METHODS = 0x0004, // clear any derived methods in lua reg table ! DELETE_CLEAR_OBJECT = DELETE_OBJECT|CLEAR_TRACKED_OBJECT|CLEAR_DERIVED_METHODS }; *************** *** 616,620 **** // This is used for encapsulated classes that are wrapped in a wxObject. void AddTrackedObject(long obj_ptr, wxObject *pObject); ! // Remove the object from the tracked memory. // flags are ored values of enum RemoveTrackedObject_flags bool RemoveTrackedObject(void *pObject, int flags); --- 617,621 ---- // This is used for encapsulated classes that are wrapped in a wxObject. void AddTrackedObject(long obj_ptr, wxObject *pObject); ! // Remove the object from the tracked memory and optionally delete it. // flags are ored values of enum RemoveTrackedObject_flags bool RemoveTrackedObject(void *pObject, int flags); Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua_bind.h 22 Jul 2007 04:38:29 -0000 1.4 --- wxlua_bind.h 1 Aug 2007 19:15:37 -0000 1.5 *************** *** 17,23 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 16 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 16 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 17 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 17 // --------------------------------------------------------------------------- |