Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15480/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
Add a simple method to get the binding info, seems small and works well
Addd sample lua program bindings.wx.lua to show them in a listctrl
Fix incircles to work with new bindings
Put the "name" of the struct binding items first always
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** genwxbind.lua 7 Jun 2007 03:21:59 -0000 1.115
--- genwxbind.lua 8 Jun 2007 01:36:21 -0000 1.116
***************
*** 18,24 ****
-- ---------------------------------------------------------------------------
! WXLUA_BINDING_VERSION = 9 -- Used to verify that the bindings are updated
! -- This must match modules/wxlua/include/wxldefs.h
! -- otherwise a compile time error will be generated.
bindingKeywordTable = {} -- Binding keywords used by the generator %XXX
--- 18,24 ----
-- ---------------------------------------------------------------------------
! WXLUA_BINDING_VERSION = 10 -- Used to verify that the bindings are updated
! -- This must match modules/wxlua/include/wxldefs.h
! -- otherwise a compile time error will be generated.
bindingKeywordTable = {} -- Binding keywords used by the generator %XXX
***************
*** 2666,2670 ****
LuaName = member.Name,
FuncType = "WXLUAMETHOD_GETPROP",
! Map = " { WXLUAMETHOD_GETPROP, \""..member.Name.."\", s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 1 },\n",
Condition = propertycondition
}
--- 2666,2670 ----
LuaName = member.Name,
FuncType = "WXLUAMETHOD_GETPROP",
! Map = " { \""..member.Name.."\", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 1 },\n",
Condition = propertycondition
}
***************
*** 2679,2683 ****
LuaName = member.Name,
FuncType = "WXLUAMETHOD_SETPROP",
! Map = " { WXLUAMETHOD_SETPROP, \""..member.Name.."\", s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1 },\n",
Condition = propertycondition
}
--- 2679,2683 ----
LuaName = member.Name,
FuncType = "WXLUAMETHOD_SETPROP",
! Map = " { \""..member.Name.."\", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1 },\n",
Condition = propertycondition
}
***************
*** 2779,2783 ****
FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }",
FuncMapName = funcMapName,
! Map = " { WXLUAMETHOD_METHOD, \""..memberGetFunc.."\", "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
--- 2779,2783 ----
FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }",
FuncMapName = funcMapName,
! Map = " { \""..memberGetFunc.."\", WXLUAMETHOD_METHOD, "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
***************
*** 2788,2792 ****
LuaName = member.Name,
FuncType = "WXLUAMETHOD_GETPROP",
! Map = " { WXLUAMETHOD_GETPROP, \""..member.Name.."\", "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
--- 2788,2792 ----
LuaName = member.Name,
FuncType = "WXLUAMETHOD_GETPROP",
! Map = " { \""..member.Name.."\", WXLUAMETHOD_GETPROP, "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
***************
*** 2868,2872 ****
FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 2, 2, "..overload_argListName.." }", -- FIXME make sure this is right
FuncMapName = funcMapName,
! Map = " { WXLUAMETHOD_METHOD, \""..memberSetFunc.."\", "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
--- 2868,2872 ----
FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 2, 2, "..overload_argListName.." }", -- FIXME make sure this is right
FuncMapName = funcMapName,
! Map = " { \""..memberSetFunc.."\", WXLUAMETHOD_METHOD, "..funcMapName..", 1, NULL },\n",
Condition = membercondition
}
***************
*** 2877,2881 ****
LuaName = member.Name,
FuncType = "WXLUAMETHOD_SETPROP",
! Map = " { WXLUAMETHOD_SETPROP, \""..member.Name.."\", "..funcMapName..", 1, NULL },\n",
Condition = fullcondition
}
--- 2877,2881 ----
LuaName = member.Name,
FuncType = "WXLUAMETHOD_SETPROP",
! Map = " { \""..member.Name.."\", WXLUAMETHOD_SETPROP, "..funcMapName..", 1, NULL },\n",
Condition = fullcondition
}
***************
*** 2961,2964 ****
--- 2961,2965 ----
-- ---------------------------------------------------------------
elseif member.DefType == "define_string" then
+ local luaname = member.AltName or member.Name -- for %rename
local value = member.Value or member.Name
***************
*** 3011,3015 ****
{
LuaName = luaname,
! Map = " { &"..member.Name..", \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
Condition = fullcondition
}
--- 3012,3016 ----
{
LuaName = luaname,
! Map = " { \""..luaname.."\", &"..member.Name..", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
Condition = fullcondition
}
***************
*** 3577,3581 ****
local funcMapName = "s_wxluafunc_"..funcName
local funcMap = "{ "..funcName..", "..funcType..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }"
! local methodMap = " { "..funcType..", \""..funcLuaCall.."\", "..funcMapName..", 1, NULL },\n"
-- build method condition
--- 3578,3582 ----
local funcMapName = "s_wxluafunc_"..funcName
local funcMap = "{ "..funcName..", "..funcType..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }"
! local methodMap = " { \""..funcLuaCall.."\", "..funcType..", "..funcMapName..", 1, NULL },\n"
-- build method condition
***************
*** 3735,3739 ****
ParamCount = 1,
RequiredParamCount = 1,
! Map = " { WXLUAMETHOD_METHOD, \"Delete\", "..funcMapName..", 1, NULL },\n",
Condition = condition
}
--- 3736,3740 ----
ParamCount = 1,
RequiredParamCount = 1,
! Map = " { \"Delete\", WXLUAMETHOD_METHOD, "..funcMapName..", 1, NULL },\n",
Condition = condition
}
***************
*** 4444,4448 ****
table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof(wxLuaBindCFunc);\n")
! local methodMap = " { "..funcType..", \""..methodBindings[1].LuaName.."\", "..funcMapName..", "..funcMapName.."_count, 0 }"
local codeList = {}
--- 4445,4449 ----
table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof(wxLuaBindCFunc);\n")
! local methodMap = " { \""..methodBindings[1].LuaName.."\", "..funcType..", "..funcMapName..", "..funcMapName.."_count, 0 }"
local codeList = {}
|
