From: John L. <jr...@us...> - 2009-09-25 18:48:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_bind.cpp Log Message: Fix multiple inheritance by adding the offset to the vtable for base classes that are second or higher. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluasocket_bind.cpp 19 May 2009 03:20:53 -0000 1.34 --- wxluasocket_bind.cpp 25 Sep 2009 18:47:58 -0000 1.35 *************** *** 631,636 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, g_wxluanumberArray_None, 0, }, ! { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 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 }, |