From: John L. <jr...@us...> - 2006-11-02 23:38:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxldebug.cpp 4 Oct 2006 22:07:23 -0000 1.22 --- wxldebug.cpp 2 Nov 2006 23:38:09 -0000 1.23 *************** *** 327,336 **** { type = wxT("C Function"); ! value.Printf(wxT("0x%p"), lua_tocfunction(L, index)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); } break; --- 327,336 ---- { type = wxT("C Function"); ! value.Printf(wxT("%p"), lua_tocfunction(L, index)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("%p"), lua_topointer(L, index)); } break; *************** *** 348,352 **** case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); break; --- 348,352 ---- case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("%p"), lua_topointer(L, index)); break; *************** *** 391,403 **** { if (nItems == 0) ! return wxString::Format(wxT("0x%p (tag %d)"), pItem, nTag); ! return wxString::Format(wxT("0x%p (approx %d items) (tag %d)"), pItem, nItems, nTag); } if (nItems == 0) ! return wxString::Format(wxT("0x%p"), pItem); ! return wxString::Format(wxT("0x%p (approx %d items)"), pItem, nItems); } --- 391,403 ---- { if (nItems == 0) ! return wxString::Format(wxT("%p (tag %d)"), pItem, nTag); ! return wxString::Format(wxT("%p (approx %d items) (tag %d)"), pItem, nItems, nTag); } if (nItems == 0) ! return wxString::Format(wxT("%p"), pItem); ! return wxString::Format(wxT("%p (approx %d items)"), pItem, nItems); } *************** *** 416,425 **** if (!pTagName.IsEmpty()) ! return wxString::Format(wxT("0x%p (%s)"), lua_touserdata(L, index), pTagName.c_str()); ! return wxString::Format(wxT("0x%p (%d)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("0x%p"), lua_touserdata(L, index)); } --- 416,425 ---- if (!pTagName.IsEmpty()) ! return wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), pTagName.c_str()); ! return wxString::Format(wxT("%p (%d)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("%p"), lua_touserdata(L, index)); } |