[Wxlua-commit] wxLua/bindings/wxwidgets override.hpp,1.5,1.6 wx.rules,1.8,1.9

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

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

Modified Files:
	override.hpp wx.rules 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** override.hpp	29 Nov 2005 05:45:09 -0000	1.5
--- override.hpp	30 Nov 2005 04:46:16 -0000	1.6
***************
*** 5,10 ****
  static int LUACALL wxPoint_GetX(lua_State *L)
  {
      // get this
!     wxPoint *self = ( wxPoint * ) getuserdatatype(L, 1, s_wxluatag_wxPoint );
      // push the result number
      lua_pushnumber(L, self->x);
--- 5,11 ----
  static int LUACALL wxPoint_GetX(lua_State *L)
  {
+     wxLuaState wxlState(L);
[...5223 lines suppressed...]
***************
*** 4130,4137 ****
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
  {
      // double value
!     long value = (long) getnumbertype(L, 2);
      // get this
!     wxTreeItemId *self = ( wxTreeItemId * ) getuserdatatype(L, 1, s_wxluatag_wxTreeItemId );
      // call SetValue
      self->m_pItem = (void *) value;
--- 4309,4317 ----
  static int LUACALL wxTreeItemId_SetValue(lua_State *L)
  {
+     wxLuaState wxlState(L);
      // double value
!     long value = (long)wxlState.getnumbertype(2);
      // get this
!     wxTreeItemId *self = (wxTreeItemId *)wxlState.getuserdatatype(1, s_wxluatag_wxTreeItemId);
      // call SetValue
      self->m_pItem = (void *) value;

Index: wx.rules
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wx.rules	29 Nov 2005 05:45:09 -0000	1.8
--- wx.rules	30 Nov 2005 04:46:16 -0000	1.9
***************
*** 68,72 ****
  onregister =
  {
!     "    wxLuaState wxLS(L);\n",
      "    wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n",
      "\n",
--- 68,72 ----
  onregister =
  {
!     "    wxLuaState wxLS(wxlState);\n",
      "    wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n",
      "\n",
***************
*** 74,83 ****
      "    if (registerTypes)\n",
      "    {\n",
!     "        wxLS.GetLuaStateRefData()->m_wxLuaNull = tnewtag(L);\n",
      "    }\n",
      "\n",
!     "    tpushwxLuaNull(L);\n",
!     "    tpushusertag(L, NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n",
!     "    lua_rawset(L, luaTable);\n",
  }
  
--- 74,83 ----
      "    if (registerTypes)\n",
      "    {\n",
!     "        wxLS.GetLuaStateRefData()->m_wxLuaNull = wxLS.tnewtag();\n",
      "    }\n",
      "\n",
!     "    tpushwxLuaNull(wxLS.GetLuaState());\n",
!     "    wxLS.tpushusertag(NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n",
!     "    lua_rawset(wxLS.GetLuaState(), luaTable);\n",
  }