Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/bindings
Modified Files:
genidocs.lua genwxbind.lua
Log Message:
Unicode compilation fix for genwxbind
Add wxRenderer to bindings
Index: genidocs.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** genidocs.lua 25 Jun 2007 03:19:37 -0000 1.9
--- genidocs.lua 27 Jun 2007 03:11:26 -0000 1.10
***************
*** 142,146 ****
for k, v in pairs(dataTypeTable) do
-- hack for special classes
! if (v.DefType == "class") or (v.DefType == "wx2lua") then
allClasses[k] = true -- the ones we wrap
end
--- 142,146 ----
for k, v in pairs(dataTypeTable) do
-- hack for special classes
! if (v.DefType == "class") or (v.DefType == "struct") or (v.DefType == "wx2lua") then
allClasses[k] = true -- the ones we wrap
end
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** genwxbind.lua 26 Jun 2007 22:16:38 -0000 1.135
--- genwxbind.lua 27 Jun 2007 03:11:26 -0000 1.136
***************
*** 709,713 ****
preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)"
! preprocConditionTable["wxHAS_POWER_EVENTS"] = "defined(wxHAS_POWER_EVENTS)"
-- wxUSE_ conditions
--- 709,714 ----
preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)"
! preprocConditionTable["wxHAS_POWER_EVENTS"] = "defined(wxHAS_POWER_EVENTS)"
! preprocConditionTable["%wxHAS_NATIVE_RENDERER"] = "defined(wxHAS_NATIVE_RENDERER)"
-- wxUSE_ conditions
***************
*** 1009,1012 ****
--- 1010,1014 ----
preprocConditionTable["wxLUA_USE_wxRegEx"] = "wxLUA_USE_wxRegEx"
preprocConditionTable["wxLUA_USE_wxRegion"] = "wxLUA_USE_wxRegion"
+ preprocConditionTable["wxLUA_USE_wxRenderer"] = "wxLUA_USE_wxRenderer"
preprocConditionTable["wxLUA_USE_wxSashWindow"] = "wxLUA_USE_wxSashWindow"
preprocConditionTable["wxLUA_USE_wxScrollBar"] = "wxLUA_USE_wxScrollBar"
***************
*** 1813,1817 ****
parseState.ObjectStack[1].DeleteRequired = true
! if parseState.ObjectStack[1].DefType ~= "class" then
print("Error: %delete is not used for a %class. "..LineTableErrString(lineTable))
end
--- 1815,1819 ----
parseState.ObjectStack[1].DeleteRequired = true
! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then
print("Error: %delete is not used for a %class. "..LineTableErrString(lineTable))
end
***************
*** 1820,1824 ****
parseState.ObjectStack[1].HasClassInfo = false
! if parseState.ObjectStack[1].DefType ~= "class" then
print("Error: %noclassinfo is not used for a %class. "..LineTableErrString(lineTable))
end
--- 1822,1826 ----
parseState.ObjectStack[1].HasClassInfo = false
! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then
print("Error: %noclassinfo is not used for a %class. "..LineTableErrString(lineTable))
end
***************
*** 1834,1838 ****
parseState.ObjectStack[1].Encapsulate = true
! if parseState.ObjectStack[1].DefType ~= "class" then
print("Error: %encapsulate is not used for a %class. "..LineTableErrString(lineTable))
end
--- 1836,1840 ----
parseState.ObjectStack[1].Encapsulate = true
! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then
print("Error: %encapsulate is not used for a %class. "..LineTableErrString(lineTable))
end
***************
*** 1885,1889 ****
--- 1887,1894 ----
lineState.Action = "structname"
lineState.ActionMandatory = true
+ lineState.ActionAttributes["%delete"] = true
lineState.ActionAttributes["%noclassinfo"] = true
+ lineState.ActionAttributes["%abstract"] = true
+ lineState.ActionAttributes["%encapsulate"] = true
elseif tag == "%endstruct" then
***************
*** 2792,2796 ****
table.insert(interface.objectData[o].BindTable, propertyBinding)
! -- SET MEMBER CODE
codeList = {}
overload_argList = ""
--- 2797,2803 ----
table.insert(interface.objectData[o].BindTable, propertyBinding)
! -- SET MEMBER CODE, not for const members
! if not string.find(member.DataTypeWithAttrib, "const ", 1, 1) then
!
codeList = {}
overload_argList = ""
***************
*** 2881,2884 ****
--- 2888,2892 ----
table.insert(interface.objectData[o].BindTable, propertyBinding)
+ end
-- ---------------------------------------------------------------
-- enum binding
***************
*** 3163,3167 ****
if opt then
if (opt == "\"\"") or (opt == "wxEmptyString") or (opt == "NULL") then
! opt = "wxEmptyString"
elseif string.sub(opt, 1, 1) == "\"" then
opt = "wxT("..opt..")"
--- 3171,3175 ----
if opt then
if (opt == "\"\"") or (opt == "wxEmptyString") or (opt == "NULL") then
! opt = "wxString(wxEmptyString)"
elseif string.sub(opt, 1, 1) == "\"" then
opt = "wxT("..opt..")"
|
