Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32506/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
update to 2.8 using C++ header files
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** genwxbind.lua 26 Feb 2007 01:57:00 -0000 1.102
--- genwxbind.lua 9 Mar 2007 00:15:11 -0000 1.103
***************
*** 569,572 ****
--- 569,574 ----
result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3])
preprocConditionTable[condition] = result -- cache result
+ elseif string.find(condition, "%wxchkver2", 1, 1) then
+ assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.")
elseif string.find(condition, "%wxcompat_", 1, 1) then
-- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2
***************
*** 576,579 ****
--- 578,583 ----
result = "(defined("..result..") && "..result..")"
preprocConditionTable[condition] = result -- cache result
+ elseif string.find(condition, "%wxcompat2", 1, 1) then
+ assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.")
elseif string.find(condition, "wxLUA_USE_", 1, 1) then
print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'")
***************
*** 635,660 ****
-- ---------------------------------------------------------------------------
function InitKeywords()
- -- wxWidgets version checks
- preprocConditionTable["%wxchkver22"] = "wxCHECK_VERSION(2,2,0)"
- preprocConditionTable["%wxchkver23"] = "wxCHECK_VERSION(2,3,0)"
- preprocConditionTable["%wxchkver24"] = "wxCHECK_VERSION(2,4,0)"
- preprocConditionTable["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)"
- preprocConditionTable["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
- preprocConditionTable["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)"
- preprocConditionTable["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)"
- preprocConditionTable["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)"
- preprocConditionTable["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)"
- preprocConditionTable["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)"
- preprocConditionTable["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)"
- preprocConditionTable["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)"
- preprocConditionTable["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)"
- preprocConditionTable["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)"
- preprocConditionTable["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)"
- -- wxWidgets version compatibility checks
- preprocConditionTable["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)"
- preprocConditionTable["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)"
- preprocConditionTable["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)"
- preprocConditionTable["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)"
- preprocConditionTable["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)"
preprocConditionTable["WXWIN_COMPATIBILITY_2"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)"
--- 639,642 ----
***************
*** 3562,3565 ****
--- 3544,3549 ----
elseif (not member.IsOperator) and (memberPtr == "&") and (memberType ~= "wxString") then
table.insert(codeList, " returns = &"..functor..";\n")
+ elseif (memberPtr == "*") then
+ table.insert(codeList, " returns = ("..memberTypeWithAttrib..")"..functor..";\n")
else
table.insert(codeList, " returns = "..functor..";\n")
|
