[Wxlua-commit] wxLua/bindings/wxwidgets wx.rules,1.5,1.6 wxlua.i,1.6,1.7

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25224/wxLua/bindings/wxwidgets

Modified Files:
	wx.rules wxlua.i 
Log Message:
Use the new wxLuaState in place of wxLuaStateVariables (removed)


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlua.i	25 Nov 2005 19:22:57 -0000	1.6
--- wxlua.i	26 Nov 2005 08:46:57 -0000	1.7
***************
*** 11,14 ****
--- 11,16 ----
  // wxLuaInterpreter
  
+ %include "wxlua/include/wxlintrp.h"
+ 
  %class %delete wxLuaInterpreter, wxObject
  %endclass

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wx.rules	25 Nov 2005 02:43:01 -0000	1.5
--- wx.rules	26 Nov 2005 08:46:57 -0000	1.6
***************
*** 67,80 ****
  onregister =
  {
!     "    GET_LUASTATEVARS_RET(L)\n",
      "\n",
      "    // register wxNull\n",
      "    if (registerTypes)\n",
      "    {\n",
!     "        stateVars->m_wxLuaNull = tnewtag(L);\n",
      "    }\n",
      "\n",
      "    tpushliteralstring(L, \"wxNull\");\n",
!     "    tpushusertag(L, NULL, stateVars->m_wxLuaNull);\n",
      "    lua_rawset(L, luaTable);\n",
  }
--- 67,81 ----
  onregister =
  {
!     "    wxLuaState wxLS(L);\n",
!     "    wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n",
      "\n",
      "    // register wxNull\n",
      "    if (registerTypes)\n",
      "    {\n",
!     "        wxLS.GetLuaStateRefData()->m_wxLuaNull = tnewtag(L);\n",
      "    }\n",
      "\n",
      "    tpushliteralstring(L, \"wxNull\");\n",
!     "    tpushusertag(L, NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n",
      "    lua_rawset(L, luaTable);\n",
  }