Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2508/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
update image.i to wxWidgets 2.8 using headers
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** genwxbind.lua 9 Mar 2007 00:15:11 -0000 1.103
--- genwxbind.lua 13 Mar 2007 05:00:57 -0000 1.104
***************
*** 1221,1227 ****
-- Read all the override files
-- ---------------------------------------------------------------------------
! function ReadOverrideFileTable(overrideTable)
! for i = 1, #overrideTable do
! ReadOverrideFile(overrideTable[i])
end
end
--- 1221,1227 ----
-- Read all the override files
-- ---------------------------------------------------------------------------
! function ReadOverrideFileTable(override_fileTable)
! for i = 1, #override_fileTable do
! ReadOverrideFile(override_fileTable[i])
end
end
***************
*** 2729,2733 ****
-- GET MEMBER CODE
local codeList = {}
! local funcName = "wxLua_"..parseObject.Name.."_"..memberGetFunc
CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
--- 2729,2733 ----
-- GET MEMBER CODE
local codeList = {}
! local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberGetFunc
CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
***************
*** 2763,2769 ****
--- 2763,2771 ----
table.insert(codeList, " return 1;\n")
table.insert(codeList, "}\n\n")
+
-- bind method
local methodBinding =
{
+ CFunctionName = funcName,
Method = codeList,
Map = " { LuaMethod, \""..memberGetFunc.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n",
***************
*** 2778,2781 ****
--- 2780,2789 ----
}
+ -- Override Generated Method Code
+ if overrideTable[methodBinding.CFunctionName] then
+ methodBinding.Method = overrideTable[methodBinding.CFunctionName]
+ overrideTableUsed[methodBinding.CFunctionName] = true
+ end
+
if not interface.objectData[o].BindTable[membercondition] then interface.objectData[o].BindTable[membercondition] = {} end
table.insert(interface.objectData[o].BindTable[membercondition], methodBinding)
***************
*** 2784,2788 ****
-- SET MEMBER CODE
codeList = {}
! local funcName = "wxLua_"..parseObject.Name.."_"..memberSetFunc
CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
--- 2792,2796 ----
-- SET MEMBER CODE
codeList = {}
! local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberSetFunc
CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
***************
*** 2825,2828 ****
--- 2833,2837 ----
methodBinding =
{
+ CFunctionName = funcName,
Method = codeList,
Map = " { LuaMethod, \""..memberSetFunc.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n",
***************
*** 2837,2840 ****
--- 2846,2855 ----
}
+ -- Override Generated Method Code
+ if overrideTable[methodBinding.CFunctionName] then
+ methodBinding.Method = overrideTable[methodBinding.CFunctionName]
+ overrideTableUsed[methodBinding.CFunctionName] = true
+ end
+
if not interface.objectData[o].BindTable[membercondition] then interface.objectData[o].BindTable[membercondition] = {} end
table.insert(interface.objectData[o].BindTable[membercondition], methodBinding)
|
