From: John L. <jr...@us...> - 2009-05-14 05:06:30
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: Allow multiple inheritance in the bindings. Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** wxldebug.cpp 24 Jan 2008 00:18:18 -0000 1.65 --- wxldebug.cpp 14 May 2009 05:06:21 -0000 1.66 *************** *** 261,268 **** { wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass")); return wxString::Format(wxT(" (%s, wxluatype=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"), lua2wx(wxlClass->name).c_str(), *wxlClass->wxluatype, wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(), ! lua2wx(wxlClass->baseclassName).c_str(), wxlClass->wxluamethods_n, wxlClass->enums_n); } --- 261,275 ---- { wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass")); + wxString baseClasses; + if (wxlClass->baseclassNames) + { + for (size_t i = 0; wxlClass->baseclassNames[i]; ++i) + baseClasses += lua2wx(wxlClass->baseclassNames[i]) + wxT(","); + } + return wxString::Format(wxT(" (%s, wxluatype=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"), lua2wx(wxlClass->name).c_str(), *wxlClass->wxluatype, wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(), ! baseClasses.c_str(), wxlClass->wxluamethods_n, wxlClass->enums_n); } |