Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
uses ugly #define to get to it's private m_nRef member.
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** genwxbind.lua 5 Mar 2008 05:04:58 -0000 1.167
--- genwxbind.lua 17 Mar 2008 03:05:00 -0000 1.168
***************
*** 674,677 ****
--- 674,694 ----
-- ---------------------------------------------------------------------------
+ -- Add a value to or with a string of values
+ -- ---------------------------------------------------------------------------
+ function AddOredValue(value, new_value)
+ local v = value
+
+ if not string.find(value, new_value, 1, 1) then
+ if string.len(v) > 1 then
+ v = value.."|"..new_value
+ else
+ v = new_value
+ end
+ end
+
+ return v
+ end
+
+ -- ---------------------------------------------------------------------------
-- Init all the bindingKeywordTable used for parsing
-- ---------------------------------------------------------------------------
***************
*** 2761,2765 ****
end
! encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
end
--- 2778,2784 ----
end
! if parseObject["%encapsulate"] then
! encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
! end
end
***************
*** 2789,2792 ****
--- 2808,2815 ----
end
+ if parseObject["%encapsulate"] then
+ --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+ end
+
local memberPtr = member.DataTypePointer[1]
local indirectionCount = #member.DataTypePointer
***************
*** 3505,3508 ****
--- 3528,3535 ----
if not funcNameBase then funcNameBase = funcName end
+ if parseObject["%encapsulate"] then
+ --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+ end
+
-- if they declared this, the conditions must be exclusive
-- since the functions will have the same names
***************
*** 3923,3926 ****
--- 3950,3959 ----
RemovewxLuaStateIfNotUsed(codeList)
+ local funcType = "WXLUAMETHOD_METHOD"
+
+ if parseObject["%encapsulate"] then
+ --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+ end
+
local delMethodBinding =
{
***************
*** 3928,3932 ****
CFunctionName = funcName_,
Method = codeList,
! FuncType = "WXLUAMETHOD_METHOD",
FuncMap = "{ "..funcName_..", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, "..overload_argListName.." }",
FuncMapName = funcMapName,
--- 3961,3965 ----
CFunctionName = funcName_,
Method = codeList,
! FuncType = funcType,
FuncMap = "{ "..funcName_..", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, "..overload_argListName.." }",
FuncMapName = funcMapName,
|
