Update of /cvsroot/wxlua/wxLua/bindings/wxlua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/bindings/wxlua
Modified Files:
override.hpp
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)
Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** override.hpp 17 Mar 2008 03:05:01 -0000 1.21
--- override.hpp 26 Mar 2008 05:01:29 -0000 1.22
***************
*** 170,176 ****
{
bool ret = false;
! if (wxluaO_isgcobject(L, 1))
{
! ret = wxluaO_undeletegcobject(L, 1);
}
--- 170,184 ----
{
bool ret = false;
!
! int l_type = lua_type(L, 1);
!
! if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
! wxlua_argerror(L, 1, wxT("a 'userdata'"));
!
! void* o = wxlua_touserdata(L, 1, false);
!
! if (wxluaO_isgcobject(L, o))
{
! ret = wxluaO_undeletegcobject(L, o);
}
|
