[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.19,1.20 wxlstate.cpp,1.10,1.11

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710/wxLua/modules/wxlua/src

Modified Files:
	internal.cpp wxlstate.cpp 
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
   These replace the same functions in wxLuaInterface
   Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
   moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well


Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** internal.cpp	30 Nov 2005 04:46:17 -0000	1.19
--- internal.cpp	1 Dec 2005 06:43:53 -0000	1.20
***************
*** 39,42 ****
--- 39,45 ----
  #include "wxlua/include/wxlintrp.h"
  
+ #include "wxluadebug/include/wxldebug.h" // FIXME for wxLuaDebugData
+ 
+ 
  //#ifdef FindText
  //# undef FindText
***************
*** 504,508 ****
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = MakeNumber(lua_tonumber(L, index));
              break;
  
--- 507,511 ----
          case LUA_TNUMBER:
              type = wxT("Number");
!             value = wxLuaDebugData::MakeNumber(lua_tonumber(L, index));
              break;
  
***************
*** 559,580 ****
  }
  
- wxString wxLuaCheckStack::MakeNumber(double dnum)
- {
-     wxString number;
- 
-     long num = (long) dnum;
-     if ((double) num == dnum)
-     {
-         if (num >= 0)
-             number = wxString::Format(wxT("%lu (0x%lx)"), num, num);
-         else
-             number = wxString::Format(wxT("%ld (0x%lx)"), num, num);
-     }
-     else
-         number = wxString::Format(wxT("%g"), dnum);
- 
-     return number;
- }
- 
  void wxLuaCheckStack::DumpTable(lua_State *L, int index, const wxString& tablename, wxHashTable& dumpList, int indent)
  {
--- 562,565 ----

Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxlstate.cpp	29 Nov 2005 23:52:12 -0000	1.10
--- wxlstate.cpp	1 Dec 2005 06:43:53 -0000	1.11
***************
*** 28,32 ****
  #endif
  
! // For compilers that support precompilation, includes <wx/wx.h>.
  #include "wx/wxprec.h"
  
--- 28,32 ----
  #endif
  
! // For compilers that support precompilation, includes "wx/wx.h"
  #include "wx/wxprec.h"