Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10188/wxLua/modules/wxlua/src
Modified Files:
wxlbind.cpp wxlstate.cpp
Log Message:
Add storage for key and value datatype in wxLuaDebugItem and show it in the stack dialog
Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** wxlstate.cpp 4 Sep 2007 22:21:10 -0000 1.135
--- wxlstate.cpp 8 Nov 2007 23:47:15 -0000 1.136
***************
*** 676,679 ****
--- 676,682 ----
ret = (luatype == LUA_TNUMBER) ? 1 : 0;
break;
+ case WXLUAARG_CFunction :
+ ret = (luatype == LUA_TFUNCTION) ? 1 : 0;
+ break;
}
***************
*** 684,688 ****
{
// try to use wxString's ref counting and return this existing copy
! static wxString s[11] = {
wxT("none"),
wxT("nil"),
--- 687,691 ----
{
// try to use wxString's ref counting and return this existing copy
! static wxString s[12] = {
wxT("none"),
wxT("nil"),
***************
*** 695,699 ****
wxT("userdata"),
wxT("thread"),
! wxT("integer")
};
--- 698,703 ----
wxT("userdata"),
wxT("thread"),
! wxT("integer"),
! wxT("cfunction"),
};
***************
*** 712,715 ****
--- 716,720 ----
case WXLUAARG_Integer : return s[10];
+ case WXLUAARG_CFunction : return s[11];
}
***************
*** 732,735 ****
--- 737,741 ----
case LUA_TTHREAD : return WXLUAARG_Thread;
//case LUA_T??? : return WXLUAARG_Integer;
+ //case LUA_T??? : return WXLUAARG_CFunction;
}
***************
*** 752,755 ****
--- 758,762 ----
case WXLUAARG_Thread : return LUA_TTHREAD;
case WXLUAARG_Integer : return LUA_TNUMBER;
+ case WXLUAARG_CFunction : return LUA_TFUNCTION;
}
Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** wxlbind.cpp 7 Aug 2007 20:23:25 -0000 1.92
--- wxlbind.cpp 8 Nov 2007 23:47:15 -0000 1.93
***************
*** 39,42 ****
--- 39,43 ----
int s_wxluaarg_Thread = WXLUAARG_Thread;
int s_wxluaarg_Integer = WXLUAARG_Integer;
+ int s_wxluaarg_CFunction = WXLUAARG_CFunction;
int g_wxluatag_wxLuaFunction = 0;
|
