From: John L. <jr...@us...> - 2009-10-01 04:21:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4255/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_bind.cpp Log Message: Removed %encapsulate and %noclassinfo tags for %classes in the bindings. No longer encapsulating non wxObjects in a wxObject class for deletion. We now provide delete functions for each class in the wxLuaBindClass structs to be called on the void* we get from Lua. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxluasocket_bind.cpp 27 Sep 2009 03:13:55 -0000 1.36 --- wxluasocket_bind.cpp 1 Oct 2009 04:21:02 -0000 1.37 *************** *** 359,363 **** wxLuaDebuggerServer* returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list ! wxluaO_addgcobject(L, returns); // push the constructed class pointer wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaDebuggerServer); --- 359,363 ---- wxLuaDebuggerServer* returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list ! wxluaO_addgcobject(L, returns, wxluatype_wxLuaDebuggerServer); // push the constructed class pointer wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaDebuggerServer); *************** *** 368,371 **** --- 368,377 ---- + void wxLua_wxLuaDebuggerServer_delete_function(void** p) + { + wxLuaDebuggerServer* o = (wxLuaDebuggerServer*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaDebuggerServer_methods[] = { *************** *** 473,476 **** --- 479,488 ---- + void wxLua_wxLuaDebuggerEvent_delete_function(void** p) + { + wxLuaDebuggerEvent* o = (wxLuaDebuggerEvent*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaDebuggerEvent_methods[] = { *************** *** 621,626 **** --- 633,640 ---- extern wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern int wxLuaDebuggerEvent_methodCount; + extern void wxLua_wxLuaDebuggerEvent_delete_function(void** p); extern wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern int wxLuaDebuggerServer_methodCount; + extern void wxLua_wxLuaDebuggerServer_delete_function(void** p); *************** *** 631,636 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 645,650 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, NULL, NULL, NULL, 0, &wxLua_wxLuaDebuggerEvent_delete_function, }, ! { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, NULL, NULL, NULL, 0, &wxLua_wxLuaDebuggerServer_delete_function, }, { 0, 0, 0, 0, 0, 0, 0 }, |