[Wxlua-commit] wxLua/modules/wxlua/src wxlua_bind.cpp,1.29,1.30

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

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

Modified Files:
	wxlua_bind.cpp 
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: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxlua_bind.cpp	17 Mar 2008 03:05:04 -0000	1.29
--- wxlua_bind.cpp	26 Mar 2008 05:01:33 -0000	1.30
***************
*** 1044,1050 ****
  {
      bool ret = false;
!     if (wxluaO_isgcobject(L, 1))
      {
!         ret = wxluaO_undeletegcobject(L, 1);
      }
  
--- 1044,1058 ----
  {
      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);
      }