[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.41, 1.42

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21726/wxLua/modules/wxluadebug/src

Modified Files:
	wxldebug.cpp 
Log Message:
Simplify the wxLuaWinDestroyCallback to reuse the table of objects instead of it's own
and have windows push into Lua the same as other objects.


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxldebug.cpp	2 Aug 2007 23:08:58 -0000	1.41
--- wxldebug.cpp	3 Aug 2007 22:17:17 -0000	1.42
***************
*** 447,472 ****
      wxString s = wxString::Format(wxT("%p"), lua_touserdata(L, index));
  
!     void* udata = lua_touserdata(L, index);
! 
!     // Convert our known keys to something more readable
!     if (udata == &wxlua_lreg_references_key)
!         s += wxT(" - wxLua References");
!     else if (udata == &wxlua_lreg_classes_key)
!         s += wxT(" - wxLuaBindClasses");
!     else if (udata == &wxlua_lreg_derivedmethods_key)
!         s += wxT(" - wxLua Derived Class Methods");
!     else if (udata == &wxlua_lreg_wxluastaterefdata_key)
!         s += wxT(" - wxLuaStateRefData");
!     else if (udata == &wxlua_lreg_objects_key)
!         s += wxT(" - wxLua Pushed Userdata");
!     else if (udata == &wxlua_lreg_callbaseclassfunc_key)
!         s += wxT(" - CallBaseClassFunc");
  
!     else if (udata == &wxlua_lreg_metatable_tag_key)
!         s += wxT(" - wxLua Metatable Class Tag");
!     else if (udata == &wxlua_lreg_metatable_class_key)
!         s += wxT(" - wxLua Metatable wxLuaBindClass");
  
!     if (full)
      {
          int nTag = wxlua_ttag(L, index);
--- 447,474 ----
      wxString s = wxString::Format(wxT("%p"), lua_touserdata(L, index));
  
!     if (!full)
!     {
!         void* udata = lua_touserdata(L, index);
  
!         // Convert our known keys to something more readable
!         if (udata == &wxlua_lreg_references_key)
!             s += wxT(" - wxLua References");
!         else if (udata == &wxlua_lreg_classes_key)
!             s += wxT(" - wxLuaBindClasses");
!         else if (udata == &wxlua_lreg_derivedmethods_key)
!             s += wxT(" - wxLua Derived Class Methods");
!         else if (udata == &wxlua_lreg_wxluastaterefdata_key)
!             s += wxT(" - wxLuaStateRefData");
!         else if (udata == &wxlua_lreg_objects_key)
!             s += wxT(" - wxLua Pushed Userdata");
!         else if (udata == &wxlua_lreg_callbaseclassfunc_key)
!             s += wxT(" - CallBaseClassFunc");
  
!         else if (udata == &wxlua_lreg_metatable_tag_key)
!             s += wxT(" - wxLua Metatable Class Tag");
!         else if (udata == &wxlua_lreg_metatable_class_key)
!             s += wxT(" - wxLua Metatable wxLuaBindClass");
!     }
!     else // is full userdata
      {
          int nTag = wxlua_ttag(L, index);