From: John L. <jr...@us...> - 2006-10-04 02:41:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxldtarg.cpp 29 Sep 2006 22:22:06 -0000 1.26 --- wxldtarg.cpp 2 Oct 2006 21:19:24 -0000 1.27 *************** *** 329,333 **** m_wxlState.tremove(iItem); } ! // FIXME - should we also remove the array items break; } --- 329,333 ---- m_wxlState.tremove(iItem); } ! m_references.Clear(); break; } Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxldserv.cpp 29 Sep 2006 22:22:06 -0000 1.24 --- wxldserv.cpp 2 Oct 2006 21:19:24 -0000 1.25 *************** *** 92,113 **** // ---------------------------------------------------------------------------- ! wxLuaDebuggerServerInterface::wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server) :wxLuaInterface(wxNullLuaState) { ! m_pServer = server; ! wxCHECK_RET(m_pServer != NULL, wxT("Invalid wxLuaDebuggerServer in wxLuaDebuggerServerInterface")); } wxLuaDebuggerServerInterface::~wxLuaDebuggerServerInterface() { ! if (m_pServer != NULL) ! { ! m_pServer->CleanupDebugReferences(); ! } } wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStack() { ! m_pServer->EnumerateStack(); return wxLuaDebugData(); } --- 92,112 ---- // ---------------------------------------------------------------------------- ! wxLuaDebuggerServerInterface::wxLuaDebuggerServerInterface(wxLuaDebuggerBase* server) :wxLuaInterface(wxNullLuaState) { ! m_luaDebugger = server; ! wxCHECK_RET(m_luaDebugger != NULL, wxT("Invalid wxLuaDebuggerServer in wxLuaDebuggerServerInterface")); } wxLuaDebuggerServerInterface::~wxLuaDebuggerServerInterface() { ! if (m_luaDebugger != NULL) ! m_luaDebugger->CleanupDebugReferences(); } wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStack() { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateStack(); return wxLuaDebugData(); } *************** *** 115,119 **** wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStackEntry(int nEntry) { ! m_pServer->EnumerateStackEntry(nEntry); return wxLuaDebugData(); } --- 114,119 ---- wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStackEntry(int nEntry) { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateStackEntry(nEntry); return wxLuaDebugData(); } *************** *** 121,125 **** wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateTable(int nRef, int nEntry, long data) { ! m_pServer->EnumerateTable(nRef, nEntry, data); return wxLuaDebugData(); } --- 121,126 ---- wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateTable(int nRef, int nEntry, long data) { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateTable(nRef, nEntry, data); return wxLuaDebugData(); } Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlsock.cpp 29 Sep 2006 20:47:15 -0000 1.16 --- wxlsock.cpp 2 Oct 2006 21:19:24 -0000 1.17 *************** *** 236,254 **** wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); ! try ! { ! bool ok = Write((const char*)&buflen, sizeof(wxUint32)) == sizeof(wxUint32); ! if (ok && (buflen > 0)) ! { ! ok = Write(buf.GetData(), buflen) == (int)buflen; ! } ! ! return ok; ! } ! catch(wxLuaSocketException &) ! { ! } ! return false; } bool wxLuaSocketBase::WriteDebugData(const wxLuaDebugData& debugData) --- 236,244 ---- wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); ! bool ok = Write((const char*)&buflen, sizeof(wxUint32)) == sizeof(wxUint32); ! if (ok && (buflen > 0)) ! ok = Write(buf.GetData(), buflen) == (int)buflen; ! return ok; } bool wxLuaSocketBase::WriteDebugData(const wxLuaDebugData& debugData) |