[Wxlua-commit] wxLua/bindings genwxbind.lua,1.11,1.12

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

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

Modified Files:
	genwxbind.lua 
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: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** genwxbind.lua	29 Nov 2005 23:52:11 -0000	1.11
--- genwxbind.lua	30 Nov 2005 04:46:16 -0000	1.12
***************
*** 2511,2520 ****
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n")
                  elseif not intrinsic then
                      if (comment) then
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n")
                  elseif memberType == "BOOL" or memberType == "bool" then
                      if (comment) then
--- 2511,2520 ----
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType)..");\n")
                  elseif not intrinsic then
                      if (comment) then
                          table.insert(codeList, "    // get the data type value\n")
                      end
!                     table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType)..");\n")
                  elseif memberType == "BOOL" or memberType == "bool" then
                      if (comment) then
***************
*** 3133,3137 ****
                          table.insert(codeList, "    // push the constructed class pointer\n")
                      end
!                     table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns );\n")
  
                      table.insert(codeList, "\n    return 1;\n")
--- 3133,3137 ----
                          table.insert(codeList, "    // push the constructed class pointer\n")
                      end
!                     table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns);\n")
  
                      table.insert(codeList, "\n    return 1;\n")
***************
*** 3148,3152 ****
                          end
  
!                         table.insert(codeList, "    "..parseObject.Name.." * self = ( "..parseObject.Name.." * )wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name).." );\n")
  
                          -- static member function?
--- 3148,3152 ----
                          end
  
!                         table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
  
                          -- static member function?
***************
*** 3211,3215 ****
                                  table.insert(codeList, "    // push the result datatype\n")
                              end
!                             table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", returns );\n")
                          elseif member.DataType == "BOOL" or member.DataType == "bool" then
                              if (comment) then
--- 3211,3215 ----
                                  table.insert(codeList, "    // push the result datatype\n")
                              end
!                             table.insert(codeList, "    wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", returns);\n")
                          elseif member.DataType == "BOOL" or member.DataType == "bool" then
                              if (comment) then
***************
*** 3344,3348 ****
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        removeTrackedMemory(L, self);\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
--- 3344,3348 ----
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        wxlState.removeTrackedMemory(self);\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
***************
*** 3372,3376 ****
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        if (removeTrackedMemory(L, self))\n")
                  table.insert(codeList, "        {   // if removed, reset the tag so that gc() is not called on this object.\n")
                  table.insert(codeList, "            lua_pushnil(L);\n")
--- 3372,3376 ----
  
                  table.insert(codeList, "    if (self != 0)\n")
!                 table.insert(codeList, "        if (wxlState.removeTrackedMemory(self))\n")
                  table.insert(codeList, "        {   // if removed, reset the tag so that gc() is not called on this object.\n")
                  table.insert(codeList, "            lua_pushnil(L);\n")
***************
*** 3447,3451 ****
      table.insert(fileData, "\n")
      table.insert(fileData, "protected:\n")
!     table.insert(fileData, "    virtual void OnRegister(lua_State *L, bool registerTypes, int luaTable);\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "    DECLARE_CLASS("..hook_binding_class..")\n")
--- 3447,3451 ----
      table.insert(fileData, "\n")
      table.insert(fileData, "protected:\n")
!     table.insert(fileData, "    virtual void OnRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable);\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "    DECLARE_CLASS("..hook_binding_class..")\n")
***************
*** 3625,3629 ****
      table.insert(fileData, "}\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "void "..hook_binding_class.."::OnRegister(lua_State *L, bool registerTypes, int luaTable)\n")
      table.insert(fileData, "{\n")
  
--- 3625,3629 ----
      table.insert(fileData, "}\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "void "..hook_binding_class.."::OnRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)\n")
      table.insert(fileData, "{\n")