Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2008-01-23 06:44:09
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/bindings Modified Files: genwxbind.lua Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** genwxbind.lua 17 Jan 2008 22:37:29 -0000 1.159 --- genwxbind.lua 23 Jan 2008 06:43:34 -0000 1.160 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 21 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 22 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 2762,2767 **** else CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList end --- 2762,2767 ---- else CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList end *************** *** 2773,2783 **** -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxluaT_pushuserdatatype(L, "..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") -- else ! table.insert(codeList, " wxluaT_pushuserdatatype(L, &"..self_name..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") -- end elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, "..self_name..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then --- 2773,2783 ---- -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxluaT_pushuserdatatype(L, "..member.Name..", wxluatype_"..MakeClassVar(memberType)..");\n") -- else ! table.insert(codeList, " wxluaT_pushuserdatatype(L, &"..self_name..member.Name..", wxluatype_"..MakeClassVar(memberType)..");\n") -- end elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, "..self_name..member.Name..", wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then *************** *** 2855,2879 **** if memberType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " CommentBindingTable(codeList, " // get the string value\n") table.insert(codeList, " wxString val = wxlua_getwxStringtype(L, "..stack_idx..");\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then ! overload_argList = overload_argList.."&g_wxluatype_TBOOLEAN, " CommentBindingTable(codeList, " // get the boolean value\n") table.insert(codeList, " bool val = wxlua_getbooleantype(L, "..stack_idx..");\n") elseif IsDataTypeEnum(memberType) then ! overload_argList = overload_argList.."&g_wxluatype_TINTEGER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getintegertype(L, "..stack_idx..");\n") else ! overload_argList = overload_argList.."&g_wxluatype_TNUMBER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getnumbertype(L, "..stack_idx..");\n") --- 2855,2879 ---- if memberType == "wxString" then ! overload_argList = overload_argList.."&wxluatype_TSTRING, " CommentBindingTable(codeList, " // get the string value\n") table.insert(codeList, " wxString val = wxlua_getwxStringtype(L, "..stack_idx..");\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", wxluatype_"..MakeClassVar(memberType)..");\n") elseif not numeric then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then ! overload_argList = overload_argList.."&wxluatype_TBOOLEAN, " CommentBindingTable(codeList, " // get the boolean value\n") table.insert(codeList, " bool val = wxlua_getbooleantype(L, "..stack_idx..");\n") elseif IsDataTypeEnum(memberType) then ! overload_argList = overload_argList.."&wxluatype_TINTEGER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getintegertype(L, "..stack_idx..");\n") else ! overload_argList = overload_argList.."&wxluatype_TNUMBER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getnumbertype(L, "..stack_idx..");\n") *************** *** 2888,2893 **** else CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if not numeric and (not memberPtr or (memberPtr == "&")) then --- 2888,2893 ---- else CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if not numeric and (not memberPtr or (memberPtr == "&")) then *************** *** 3045,3049 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &g_wxluatype_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", NULL },\n", Condition = fullcondition } --- 3045,3049 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &wxluatype_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", NULL },\n", Condition = fullcondition } *************** *** 3060,3064 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &g_wxluatype_"..MakeClassVar(parseObject.Name)..", NULL, (const void **) &"..member.Name.." },\n", Condition = fullcondition } --- 3060,3064 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &wxluatype_"..MakeClassVar(parseObject.Name)..", NULL, (const void **) &"..member.Name.." },\n", Condition = fullcondition } *************** *** 3075,3079 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &"..member.Name..", &g_wxluatype_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } --- 3075,3079 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &"..member.Name..", &wxluatype_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } *************** *** 3168,3172 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxArrayString, " argItem = "wxlua_getwxArrayString(L, "..argNum..")" declare = "wxLuaSmartwxArrayString" --- 3168,3172 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&wxluatype_wxArrayString, " argItem = "wxlua_getwxArrayString(L, "..argNum..")" declare = "wxLuaSmartwxArrayString" *************** *** 3174,3178 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxSortedArrayString, " argItem = "wxlua_getwxSortedArrayString(L, "..argNum..")" declare = "wxLuaSmartwxSortedArrayString" --- 3174,3178 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&wxluatype_wxSortedArrayString, " argItem = "wxlua_getwxSortedArrayString(L, "..argNum..")" declare = "wxLuaSmartwxSortedArrayString" *************** *** 3180,3188 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxArrayInt, " argItem = "wxlua_getwxArrayInt(L, "..argNum..")" declare = "wxLuaSmartwxArrayInt" elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "NULL; ptr = "..argName.." = wxlua_getintarray(L, "..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" --- 3180,3188 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&wxluatype_wxArrayInt, " argItem = "wxlua_getwxArrayInt(L, "..argNum..")" declare = "wxLuaSmartwxArrayInt" elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&wxluatype_TTABLE, " argItem = "NULL; ptr = "..argName.." = wxlua_getintarray(L, "..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" *************** *** 3191,3195 **** -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " --- 3191,3195 ---- -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&wxluatype_TTABLE, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " *************** *** 3197,3201 **** -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&g_wxluatype_TFUNCTION, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " --- 3197,3201 ---- -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&wxluatype_TFUNCTION, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " *************** *** 3210,3214 **** end ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "wxlua_getwxStringarray("..argNum..", count)" declare = "int count = 0; wxLuaSmartStringArray " --- 3210,3214 ---- end ! overload_argList = overload_argList.."&wxluatype_TTABLE, " argItem = "wxlua_getwxStringarray("..argNum..", count)" declare = "int count = 0; wxLuaSmartStringArray " *************** *** 3219,3227 **** end ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "wxlua_getintarray(L, "..argNum..", count)" declare = "int count = 0; wxLuaSmartIntArray " elseif not numeric then ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" --- 3219,3227 ---- end ! overload_argList = overload_argList.."&wxluatype_TTABLE, " argItem = "wxlua_getintarray(L, "..argNum..", count)" declare = "int count = 0; wxLuaSmartIntArray " elseif not numeric then ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", wxluatype_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" *************** *** 3229,3233 **** elseif (indirectionCount == 1) and (argPtr == "*") then if (argType == "wxString") or (argType == "wxChar") then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3229,3233 ---- elseif (indirectionCount == 1) and (argPtr == "*") then if (argType == "wxString") or (argType == "wxChar") then ! overload_argList = overload_argList.."&wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3249,3253 **** elseif argType == "char" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getstringtype(L, "..argNum..")" --- 3249,3253 ---- elseif argType == "char" then ! overload_argList = overload_argList.."&wxluatype_TSTRING, " argItem = "wxlua_getstringtype(L, "..argNum..")" *************** *** 3262,3269 **** if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end --- 3262,3269 ---- if not numeric then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end *************** *** 3282,3290 **** elseif (indirectionCount == 2) and (argPtr == "*") then if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argTypeWithAttrib = argTypeWithAttrib.." *" argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" --- 3282,3290 ---- elseif (indirectionCount == 2) and (argPtr == "*") then if not numeric then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", " argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&wxluatype_TLIGHTUSERDATA, " argTypeWithAttrib = argTypeWithAttrib.." *" argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" *************** *** 3292,3296 **** elseif (indirectionCount == 1) and (argPtr == "&") then if argType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3292,3296 ---- elseif (indirectionCount == 1) and (argPtr == "&") then if argType == "wxString" then ! overload_argList = overload_argList.."&wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3308,3315 **** argTypeWithAttrib = argTypeWithAttrib.." *" if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end --- 3308,3315 ---- argTypeWithAttrib = argTypeWithAttrib.." *" if not numeric then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end *************** *** 3322,3326 **** elseif indirectionCount == 0 then if argType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3322,3326 ---- elseif indirectionCount == 0 then if argType == "wxString" then ! overload_argList = overload_argList.."&wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3336,3349 **** end elseif (argType == "bool") or (argType == "BOOL") then ! overload_argList = overload_argList.."&g_wxluatype_TBOOLEAN, " argItem = "wxlua_getbooleantype(L, "..argNum..")" elseif IsDataTypeEnum(argType) then ! overload_argList = overload_argList.."&g_wxluatype_TINTEGER, " argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")" elseif not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "*("..argTypeWithAttrib.."*)wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TNUMBER, " argItem = "("..argType..")wxlua_getnumbertype(L, "..argNum..")" end --- 3336,3349 ---- end elseif (argType == "bool") or (argType == "BOOL") then ! overload_argList = overload_argList.."&wxluatype_TBOOLEAN, " argItem = "wxlua_getbooleantype(L, "..argNum..")" elseif IsDataTypeEnum(argType) then ! overload_argList = overload_argList.."&wxluatype_TINTEGER, " argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")" elseif not numeric then ! overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", " ! argItem = "*("..argTypeWithAttrib.."*)wxluaT_getuserdatatype(L, "..argNum..", wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&wxluatype_TNUMBER, " argItem = "("..argType..")wxlua_getnumbertype(L, "..argNum..")" end *************** *** 3594,3598 **** CommentBindingTable(codeList, " // push the constructed class pointer\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") table.insert(codeList, "\n return 1;\n") --- 3594,3598 ---- CommentBindingTable(codeList, " // push the constructed class pointer\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, wxluatype_"..MakeClassVar(parseObject.Name)..");\n") table.insert(codeList, "\n return 1;\n") *************** *** 3607,3612 **** CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if parseObject["%ungc_this"] then --- 3607,3612 ---- CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if parseObject["%ungc_this"] then *************** *** 3704,3708 **** elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (member.DataType == "BOOL") or (member.DataType == "bool") then CommentBindingTable(codeList, " // push the result flag\n") --- 3704,3708 ---- elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, wxluatype_"..MakeClassVar(memberType)..");\n") elseif (member.DataType == "BOOL") or (member.DataType == "bool") then CommentBindingTable(codeList, " // push the result flag\n") *************** *** 3810,3814 **** local classTypeBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." g_wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", --- 3810,3814 ---- local classTypeBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", *************** *** 3826,3830 **** decl = decl.."// Lua MetaTable Tag for Class '"..parseObject.Name.."'\n" end ! decl = decl.."int g_wxluatype_"..MakeClassVar(parseObject.Name).." = -1;\n" interface.objectData[o].TagDeclaration = decl --- 3826,3830 ---- decl = decl.."// Lua MetaTable Tag for Class '"..parseObject.Name.."'\n" end ! decl = decl.."int wxluatype_"..MakeClassVar(parseObject.Name).." = WXLUA_TUNKNOWN;\n" interface.objectData[o].TagDeclaration = decl *************** *** 3855,3859 **** local overload_argListName = "s_wxluatypeArray_".. funcName ! local overload_argList = "{ &g_wxluatype_"..MakeClassVar(parseObject.Name)..", NULL }" local condition = FixCondition(parseObject.Condition) --- 3855,3859 ---- local overload_argListName = "s_wxluatypeArray_".. funcName ! local overload_argList = "{ &wxluatype_"..MakeClassVar(parseObject.Name)..", NULL }" local condition = FixCondition(parseObject.Condition) *************** *** 3894,3898 **** ..MakeVar(parseObject.Name).."_methodCount, " ..classinfo..", " ! .."&g_wxluatype_"..MakeClassVar(parseObject.Name)..", " ..MakeVar(baseclass)..", " .."NULL ," --- 3894,3898 ---- ..MakeVar(parseObject.Name).."_methodCount, " ..classinfo..", " ! .."&wxluatype_"..MakeClassVar(parseObject.Name)..", " ..MakeVar(baseclass)..", " .."NULL ," *************** *** 4028,4032 **** table.insert(fileData, "// binding class\n") ! table.insert(fileData, "class "..hook_cpp_binding_classname.." : public wxLuaBinding\n") table.insert(fileData, "{\n") table.insert(fileData, "public:\n") --- 4028,4032 ---- table.insert(fileData, "// binding class\n") ! table.insert(fileData, "class "..output_cpp_impexpsymbol.." "..hook_cpp_binding_classname.." : public wxLuaBinding\n") table.insert(fileData, "{\n") table.insert(fileData, "public:\n") *************** *** 4080,4083 **** --- 4080,4084 ---- end + --[[ table.insert(fileData, "\n") *************** *** 4092,4096 **** table.insert(fileData, "extern wxLuaBindObject *"..hook_cpp_object_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindMethod *"..hook_cpp_function_funcname.."(size_t &count);\n\n") ! -- ------------------------------------------------------------------------ -- Class Tag Declaration - sorted by condition for the C++ compiler --- 4093,4097 ---- table.insert(fileData, "extern wxLuaBindObject *"..hook_cpp_object_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindMethod *"..hook_cpp_function_funcname.."(size_t &count);\n\n") ! ]] -- ------------------------------------------------------------------------ -- Class Tag Declaration - sorted by condition for the C++ compiler |
|
From: John L. <jr...@us...> - 2008-01-23 06:44:09
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/apps/wxluacan/src Modified Files: canlua.cpp wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluacan.cpp 22 Dec 2007 06:07:07 -0000 1.38 --- wxluacan.cpp 23 Jan 2008 06:43:34 -0000 1.39 *************** *** 25,31 **** // Lua MetaTable Tag for Class 'wxlCanObj' ! int g_wxluatype_wxlCanObj = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_AddObject[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_AddObject }}; --- 25,31 ---- // Lua MetaTable Tag for Class 'wxlCanObj' ! int wxluatype_wxlCanObj = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_AddObject[] = { &wxluatype_wxlCanObj, &wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_AddObject }}; *************** *** 34,40 **** { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call AddObject self->AddObject(canobj); --- 34,40 ---- { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, wxluatype_wxlCanObj); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call AddObject self->AddObject(canobj); *************** *** 43,47 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetX[] = { &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetX }}; --- 43,47 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetX[] = { &wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetX }}; *************** *** 50,54 **** { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call GetX double returns = (self->GetX()); --- 50,54 ---- { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call GetX double returns = (self->GetX()); *************** *** 59,63 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetY[] = { &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetY }}; --- 59,63 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetY[] = { &wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetY }}; *************** *** 66,70 **** { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call GetY double returns = (self->GetY()); --- 66,70 ---- { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call GetY double returns = (self->GetY()); *************** *** 77,81 **** #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetBrush[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetBrush }}; --- 77,81 ---- #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetBrush[] = { &wxluatype_wxlCanObj, &wxluatype_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetBrush }}; *************** *** 84,90 **** { // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxBrush); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetBrush self->SetBrush(*brush); --- 84,90 ---- { // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, wxluatype_wxBrush); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call SetBrush self->SetBrush(*brush); *************** *** 93,97 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPen[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPen }}; --- 93,97 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPen[] = { &wxluatype_wxlCanObj, &wxluatype_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPen }}; *************** *** 100,106 **** { // const wxPen pen ! const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPen); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPen self->SetPen(*pen); --- 100,106 ---- { // const wxPen pen ! const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, wxluatype_wxPen); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call SetPen self->SetPen(*pen); *************** *** 111,115 **** #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPending[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TBOOLEAN, NULL }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPending }}; --- 111,115 ---- #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPending[] = { &wxluatype_wxlCanObj, &wxluatype_TBOOLEAN, NULL }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPending }}; *************** *** 122,126 **** bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPending self->SetPending(pending); --- 122,126 ---- bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call SetPending self->SetPending(pending); *************** *** 129,133 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPos[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxlCanObj_SetPos }}; --- 129,133 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPos[] = { &wxluatype_wxlCanObj, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxlCanObj_SetPos }}; *************** *** 140,144 **** double x = (double)wxlua_getnumbertype(L, 2); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPos self->SetPos(x, y); --- 140,144 ---- double x = (double)wxlua_getnumbertype(L, 2); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObj); // call SetPos self->SetPos(x, y); *************** *** 147,151 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxlCanObj_constructor }}; --- 147,151 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxlCanObj_constructor }}; *************** *** 162,166 **** wxlCanObj* returns = new wxlCanObj(x, y); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObj); return 1; --- 162,166 ---- wxlCanObj* returns = new wxlCanObj(x, y); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCanObj); return 1; *************** *** 194,200 **** // Lua MetaTable Tag for Class 'wxlCanObjRect' ! int g_wxluatype_wxlCanObjRect = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjRect_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxlCanObjRect_constructor }}; --- 194,200 ---- // Lua MetaTable Tag for Class 'wxlCanObjRect' ! int wxluatype_wxlCanObjRect = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjRect_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxlCanObjRect_constructor }}; *************** *** 213,217 **** wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjRect); return 1; --- 213,217 ---- wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCanObjRect); return 1; *************** *** 234,240 **** // Lua MetaTable Tag for Class 'wxlCanObjCircle' ! int g_wxluatype_wxlCanObjCircle = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor }}; --- 234,240 ---- // Lua MetaTable Tag for Class 'wxlCanObjCircle' ! int wxluatype_wxlCanObjCircle = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor }}; *************** *** 251,255 **** wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjCircle); return 1; --- 251,255 ---- wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCanObjCircle); return 1; *************** *** 272,278 **** // Lua MetaTable Tag for Class 'wxlCanObjScript' ! int g_wxluatype_wxlCanObjScript = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjScript_constructor }}; --- 272,278 ---- // Lua MetaTable Tag for Class 'wxlCanObjScript' ! int wxluatype_wxlCanObjScript = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjScript_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjScript_constructor }}; *************** *** 289,293 **** wxlCanObjScript* returns = new wxlCanObjScript(x, y, name); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjScript); return 1; --- 289,293 ---- wxlCanObjScript* returns = new wxlCanObjScript(x, y, name); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCanObjScript); return 1; *************** *** 310,316 **** // Lua MetaTable Tag for Class 'wxlCanObjAddScript' ! int g_wxluatype_wxlCanObjAddScript = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript[] = { &g_wxluatype_wxlCanObjAddScript, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript }}; --- 310,316 ---- // Lua MetaTable Tag for Class 'wxlCanObjAddScript' ! int wxluatype_wxlCanObjAddScript = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript[] = { &wxluatype_wxlCanObjAddScript, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript }}; *************** *** 321,325 **** const wxString script = wxlua_getwxStringtype(L, 2); // get this ! wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObjAddScript); // call SetScript self->SetScript(script); --- 321,325 ---- const wxString script = wxlua_getwxStringtype(L, 2); // get this ! wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCanObjAddScript); // call SetScript self->SetScript(script); *************** *** 328,332 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor }}; --- 328,332 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor }}; *************** *** 343,347 **** wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjAddScript); return 1; --- 343,347 ---- wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCanObjAddScript); return 1; *************** *** 365,371 **** // Lua MetaTable Tag for Class 'wxlCan' ! int g_wxluatype_wxlCan = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_AddObject[] = { &g_wxluatype_wxlCan, &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCan_AddObject }}; --- 365,371 ---- // Lua MetaTable Tag for Class 'wxlCan' ! int wxluatype_wxlCan = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_AddObject[] = { &wxluatype_wxlCan, &wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCan_AddObject }}; *************** *** 374,380 **** { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj); // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call AddObject self->AddObject(canobj); --- 374,380 ---- { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, wxluatype_wxlCanObj); // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCan); // call AddObject self->AddObject(canobj); *************** *** 383,387 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetCmdh[] = { &g_wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetCmdh }}; --- 383,387 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetCmdh[] = { &wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetCmdh }}; *************** *** 390,403 **** { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call GetCmdh wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetYaxis[] = { &g_wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetYaxis }}; --- 390,403 ---- { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCan); // call GetCmdh wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlLuaCanCmd); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetYaxis[] = { &wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetYaxis }}; *************** *** 406,410 **** { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call GetYaxis bool returns = (self->GetYaxis()); --- 406,410 ---- { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCan); // call GetYaxis bool returns = (self->GetYaxis()); *************** *** 417,421 **** #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_constructor[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, NULL }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatypeArray_wxLua_wxlCan_constructor }}; --- 417,421 ---- #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_constructor[] = { &wxluatype_wxWindow, &wxluatype_TNUMBER, &wxluatype_wxPoint, &wxluatype_wxSize, NULL }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatypeArray_wxLua_wxlCan_constructor }}; *************** *** 426,440 **** int argCount = lua_gettop(L); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow); // call constructor wxlCan* returns = new wxlCan(parent, id, *pos, *size); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan); return 1; --- 426,440 ---- int argCount = lua_gettop(L); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWindow); // call constructor wxlCan* returns = new wxlCan(parent, id, *pos, *size); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCan); return 1; *************** *** 466,472 **** // Lua MetaTable Tag for Class 'wxlLuaCanCmd' ! int g_wxluatype_wxlLuaCanCmd = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &g_wxluatype_wxlLuaCanCmd, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject }}; --- 466,472 ---- // Lua MetaTable Tag for Class 'wxlLuaCanCmd' ! int wxluatype_wxlLuaCanCmd = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &wxluatype_wxlLuaCanCmd, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject }}; *************** *** 481,485 **** int index = (int)wxlua_getnumbertype(L, 2); // get this ! wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlLuaCanCmd); // call MoveObject self->MoveObject(index, x, y); --- 481,485 ---- int index = (int)wxlua_getnumbertype(L, 2); // get this ! wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlLuaCanCmd); // call MoveObject self->MoveObject(index, x, y); *************** *** 488,492 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor[] = { &g_wxluatype_wxlCan, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor }}; --- 488,492 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor[] = { &wxluatype_wxlCan, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor }}; *************** *** 499,507 **** int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas ! wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call constructor wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; --- 499,507 ---- int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas ! wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, wxluatype_wxlCan); // call constructor wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlLuaCanCmd); return 1; Index: canlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/canlua.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** canlua.cpp 25 Dec 2007 18:11:27 -0000 1.14 --- canlua.cpp 23 Jan 2008 06:43:34 -0000 1.15 *************** *** 224,228 **** lua_getglobal( L, wx2lua(m_objectname + wxT("Draw")) ); ! lst.wxluaT_PushUserDataType(&dc, g_wxluatype_wxDC, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); --- 224,228 ---- lua_getglobal( L, wx2lua(m_objectname + wxT("Draw")) ); ! lst.wxluaT_PushUserDataType(&dc, wxluatype_wxDC, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); *************** *** 299,303 **** { lua_getglobal( L, wx2lua( wxT("AddChilds") ) ); ! lst.wxluaT_PushUserDataType(this, g_wxluatype_wxlCanObj, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); --- 299,303 ---- { lua_getglobal( L, wx2lua( wxT("AddChilds") ) ); ! lst.wxluaT_PushUserDataType(this, wxluatype_wxlCanObj, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluacan_bind.cpp 22 Dec 2007 06:07:07 -0000 1.28 --- wxluacan_bind.cpp 23 Jan 2008 06:43:34 -0000 1.29 *************** *** 91,95 **** wxlCan* returns = (wxlCan*)GetCan(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan); return 1; --- 91,95 ---- wxlCan* returns = (wxlCan*)GetCan(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCan); return 1; *************** *** 103,107 **** wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; --- 103,107 ---- wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxlLuaCanCmd); return 1; *************** *** 136,146 **** static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &g_wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &g_wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &g_wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &g_wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &g_wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &g_wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &g_wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 136,146 ---- static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxluacan.h 22 Dec 2007 06:07:07 -0000 1.39 --- wxluacan.h 23 Jan 2008 06:43:34 -0000 1.40 *************** *** 18,28 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxluacan : public wxLuaBinding { public: --- 18,28 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXLUA_NO_DLLIMPEXP wxLuaBinding_wxluacan : public wxLuaBinding { public: *************** *** 52,90 **** #include "wx/gdicmn.h" - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxluacan(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxluacan(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxluacan(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxluacan(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxluacan(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCan; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; --- 52,78 ---- #include "wx/gdicmn.h" // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCan; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; |
|
From: John L. <jr...@us...> - 2008-01-23 06:44:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxadv_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxadv_bind.h 23 Jan 2008 06:43:35 -0000 1.10 *************** *** 21,31 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxadv : public wxLuaBinding { public: --- 21,31 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_BINDWXADV wxLuaBinding_wxadv : public wxLuaBinding { public: *************** *** 107,122 **** #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxadv(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxadv(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxadv(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxadv(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxadv(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxadv(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class --- 107,110 ---- *************** *** 124,128 **** #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWave; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWave_methodCount; --- 112,116 ---- #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWave; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWave_methodCount; *************** *** 130,134 **** #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSound; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSound_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSound_methodCount; --- 118,122 ---- #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSound; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSound_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSound_methodCount; *************** *** 136,143 **** #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAnimation; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAnimationCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimationCtrl_methodCount; --- 124,131 ---- #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAnimation; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAnimationCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimationCtrl_methodCount; *************** *** 145,149 **** #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAboutDialogInfo; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAboutDialogInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAboutDialogInfo_methodCount; --- 133,137 ---- #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAboutDialogInfo; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAboutDialogInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAboutDialogInfo_methodCount; *************** *** 151,158 **** #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxHyperlinkCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxHyperlinkEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkEvent_methodCount; --- 139,146 ---- #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxHyperlinkCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxHyperlinkEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkEvent_methodCount; *************** *** 160,164 **** #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxBitmapComboBox; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxBitmapComboBox_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxBitmapComboBox_methodCount; --- 148,152 ---- #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxBitmapComboBox; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxBitmapComboBox_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxBitmapComboBox_methodCount; *************** *** 166,179 **** #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarDateAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarDateAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarDateAttr_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxDateEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxDateEvent_methodCount; --- 154,167 ---- #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarDateAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarDateAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarDateAttr_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxDateEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxDateEvent_methodCount; *************** *** 181,270 **** #if wxLUA_USE_wxGrid && wxUSE_GRID ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGrid; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGrid_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_methodCount; extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_methodCount; extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAttrProvider; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttrProvider_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAutoWrapStringEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAutoWrapStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellBoolEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellBoolRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellChoiceEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellChoiceEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellChoiceEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellCoords; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoords_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoords_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellDateTimeRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellDateTimeRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEnumEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEnumRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellFloatEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellFloatRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellNumberEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellNumberRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellTextEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellTextEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellTextEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellWorker; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellWorker_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellWorker_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridEditorCreatedEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEditorCreatedEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridRangeSelectEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridRangeSelectEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridRangeSelectEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridSizeEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridSizeEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridSizeEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridStringTable; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridStringTable_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridStringTable_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridTableBase; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridTableMessage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableMessage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableMessage_methodCount; --- 169,258 ---- #if wxLUA_USE_wxGrid && wxUSE_GRID ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGrid; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGrid_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_methodCount; extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_methodCount; extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAttrProvider; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttrProvider_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAutoWrapStringEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAutoWrapStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellBoolEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellBoolRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellChoiceEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellChoiceEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellChoiceEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellCoords; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoords_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoords_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellDateTimeRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellDateTimeRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEnumEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEnumRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellFloatEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellFloatRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellNumberEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellNumberRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellTextEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellTextEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellTextEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellWorker; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellWorker_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellWorker_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridEditorCreatedEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEditorCreatedEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridRangeSelectEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridRangeSelectEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridRangeSelectEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridSizeEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridSizeEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridSizeEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridStringTable; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridStringTable_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridStringTable_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridTableBase; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridTableMessage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableMessage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableMessage_methodCount; *************** *** 272,279 **** #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxJoystick; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystick_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxJoystickEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystickEvent_methodCount; --- 260,267 ---- #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxJoystick; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystick_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxJoystickEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystickEvent_methodCount; *************** *** 281,300 **** #if wxLUA_USE_wxSashWindow && wxUSE_SASH ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalculateLayoutEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalculateLayoutEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalculateLayoutEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxLayoutAlgorithm; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLayoutAlgorithm_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLayoutAlgorithm_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxQueryLayoutInfoEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxQueryLayoutInfoEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashLayoutWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashLayoutWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashLayoutWindow_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashWindow_methodCount; --- 269,288 ---- #if wxLUA_USE_wxSashWindow && wxUSE_SASH ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalculateLayoutEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalculateLayoutEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalculateLayoutEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxLayoutAlgorithm; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLayoutAlgorithm_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLayoutAlgorithm_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxQueryLayoutInfoEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxQueryLayoutInfoEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashLayoutWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashLayoutWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashLayoutWindow_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashWindow_methodCount; *************** *** 302,309 **** #if wxLUA_USE_wxSplashScreen ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSplashScreen; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreen_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreen_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSplashScreenWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreenWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreenWindow_methodCount; --- 290,297 ---- #if wxLUA_USE_wxSplashScreen ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSplashScreen; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreen_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreen_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSplashScreenWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreenWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreenWindow_methodCount; *************** *** 311,318 **** #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxTaskBarIcon; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIcon_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIcon_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxTaskBarIconEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIconEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIconEvent_methodCount; --- 299,306 ---- #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxTaskBarIcon; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIcon_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIcon_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxTaskBarIconEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIconEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIconEvent_methodCount; *************** *** 320,333 **** #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizard; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizard_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardPage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardPageSimple; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPageSimple_methodCount; --- 308,321 ---- #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizard; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizard_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardPage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardPageSimple; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPageSimple_methodCount; Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_bind.h 10 Jan 2008 23:06:26 -0000 1.10 --- wxcore_bind.h 23 Jan 2008 06:43:35 -0000 1.11 *************** *** 38,48 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxcore : public wxLuaBinding { [...2703 lines suppressed...] extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxProgressDialog_methodCount; *************** *** 1811,1818 **** #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) g_wxluatype_wxPasswordEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxPasswordEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxPasswordEntryDialog_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) g_wxluatype_wxTextEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxTextEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxTextEntryDialog_methodCount; --- 1799,1806 ---- #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPasswordEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxPasswordEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxPasswordEntryDialog_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxTextEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxTextEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxTextEntryDialog_methodCount; Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxrichtext_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxrichtext_bind.h 23 Jan 2008 06:43:35 -0000 1.10 *************** *** 21,31 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxrichtext : public wxLuaBinding { public: --- 21,31 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_BINDWXRICHTEXT wxLuaBinding_wxrichtext : public wxLuaBinding { public: *************** *** 50,65 **** // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxrichtext(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxrichtext(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxrichtext(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxrichtext(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxrichtext(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxrichtext(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class --- 50,53 ---- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxxrc_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxxrc_bind.h 23 Jan 2008 06:43:35 -0000 1.10 *************** *** 21,31 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxxrc : public wxLuaBinding { public: --- 21,31 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_BINDWXXRC wxLuaBinding_wxxrc : public wxLuaBinding { public: *************** *** 54,69 **** #endif // wxLUA_USE_wxXRC && wxUSE_XRC - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxxrc(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxxrc(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxxrc(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxxrc(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxxrc(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxxrc(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class --- 54,57 ---- *************** *** 71,75 **** #if wxLUA_USE_wxXRC && wxUSE_XRC ! extern WXDLLIMPEXP_DATA_BINDWXXRC(int) g_wxluatype_wxXmlResource; extern WXDLLIMPEXP_BINDWXXRC wxLuaBindMethod wxXmlResource_methods[]; extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxXmlResource_methodCount; --- 59,63 ---- #if wxLUA_USE_wxXRC && wxUSE_XRC ! extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxluatype_wxXmlResource; extern WXDLLIMPEXP_BINDWXXRC wxLuaBindMethod wxXmlResource_methods[]; extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxXmlResource_methodCount; Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxnet_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxnet_bind.h 23 Jan 2008 06:43:35 -0000 1.10 *************** *** 21,31 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxnet : public wxLuaBinding { public: --- 21,31 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_BINDWXNET wxLuaBinding_wxnet : public wxLuaBinding { public: *************** *** 71,86 **** #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxnet(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxnet(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxnet(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxnet(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxnet(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxnet(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class --- 71,74 ---- *************** *** 88,92 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxProtocol; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxProtocol_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxProtocol_methodCount; --- 76,80 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxProtocol; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxProtocol_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxProtocol_methodCount; *************** *** 94,98 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxFTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxFTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_methodCount; --- 82,86 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxFTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxFTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_methodCount; *************** *** 102,106 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxHTTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxHTTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxHTTP_methodCount; --- 90,94 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxHTTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxHTTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxHTTP_methodCount; *************** *** 108,112 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxURL; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURL_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURL_methodCount; --- 96,100 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxURL; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURL_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURL_methodCount; *************** *** 114,139 **** #if wxLUA_USE_wxSocket && wxUSE_SOCKETS ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxIPV4address; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPV4address_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPV4address_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxIPaddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPaddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPaddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSockAddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSockAddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSockAddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketBase; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketClient; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketClient_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketClient_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketEvent; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketServer; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketServer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketServer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxURI; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURI_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURI_methodCount; --- 102,127 ---- #if wxLUA_USE_wxSocket && wxUSE_SOCKETS ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxIPV4address; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPV4address_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPV4address_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxIPaddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPaddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPaddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSockAddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSockAddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSockAddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketBase; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketClient; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketClient_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketClient_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketEvent; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketServer; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketServer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketServer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxURI; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURI_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURI_methodCount; Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxbase_bind.h 22 Dec 2007 06:07:11 -0000 1.10 --- wxbase_bind.h 23 Jan 2008 06:43:35 -0000 1.11 *************** *** 20,30 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxbase : public wxLuaBinding { public: --- 20,30 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_BINDWXBASE wxLuaBinding_wxbase : public wxLuaBinding { public: *************** *** 154,221 **** #endif // wxUSE_STREAMS - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxbase(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxbase(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxbase(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxbase(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxbase(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxbase(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClientDataContainer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientDataContainer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientDataContainer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibrary; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibrary_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibrary_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibraryDetails; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetails_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetails_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibraryDetailsArray; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetailsArray_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileType; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileType_MessageParameters; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_MessageParameters_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_MessageParameters_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileTypeInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileTypeInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileTypeInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxIconLocation; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxIconLocation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxIconLocation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxMimeTypesManager; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMimeTypesManager_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMimeTypesManager_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxPathList; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPathList_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPathList_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxPlatformInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPlatformInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPlatformInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStringClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStringTokenizer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringTokenizer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringTokenizer_methodCount; #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStandardPaths; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStandardPaths_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_methodCount; --- 154,209 ---- #endif // wxUSE_STREAMS // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientDataContainer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientDataContainer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientDataContainer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibrary; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibrary_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibrary_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetails; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetails_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetails_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetailsArray; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetailsArray_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType_MessageParameters; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_MessageParameters_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_MessageParameters_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileTypeInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileTypeInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileTypeInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxIconLocation; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxIconLocation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxIconLocation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxMimeTypesManager; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMimeTypesManager_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMimeTypesManager_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxPathList; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPathList_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPathList_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxPlatformInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPlatformInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPlatformInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringTokenizer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringTokenizer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringTokenizer_methodCount; #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStandardPaths; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStandardPaths_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_methodCount; *************** *** 225,229 **** #if wxLUA_USE_wxArrayInt ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxArrayInt; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayInt_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayInt_methodCount; --- 213,217 ---- #if wxLUA_USE_wxArrayInt ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArrayInt; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayInt_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayInt_methodCount; *************** *** 231,238 **** #if wxLUA_USE_wxArrayString ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxSortedArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSortedArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSortedArrayString_methodCount; --- 219,226 ---- #if wxLUA_USE_wxArrayString ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxSortedArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSortedArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSortedArrayString_methodCount; *************** *** 240,244 **** #if wxLUA_USE_wxClassInfo ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClassInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClassInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClassInfo_methodCount; --- 228,232 ---- #if wxLUA_USE_wxClassInfo ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClassInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClassInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClassInfo_methodCount; *************** *** 246,264 **** #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfigBase; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_methodCount; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfigPathChanger; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigPathChanger_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigPathChanger_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxMemoryConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMemoryConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMemoryConfig_methodCount; --- 234,252 ---- #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfigBase; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_methodCount; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfigPathChanger; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigPathChanger_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigPathChanger_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(in... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-23 06:44:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/bindings/wxlua Modified Files: override.hpp wxlua_rules.lua Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** override.hpp 5 Jan 2008 00:15:45 -0000 1.17 --- override.hpp 23 Jan 2008 06:43:34 -0000 1.18 *************** *** 727,731 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaObject); // return the number of parameters return 1; --- 727,731 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaObject); // return the number of parameters return 1; *************** *** 738,742 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call SetObject self->SetObject(1); --- 738,742 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject self->SetObject(1); *************** *** 751,755 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) --- 751,755 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) Index: wxlua_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua_rules.lua 16 Jul 2007 19:34:15 -0000 1.2 --- wxlua_rules.lua 23 Jan 2008 06:43:34 -0000 1.3 *************** *** 125,129 **** -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. ! --wxLuaBinding_PostRegister = --============================================================================= --- 125,137 ---- -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PostRegister = ! [[ ! wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); ! lua_State* L = wxlState.GetLuaState(); ! ! lua_pushlstring(L, "NULL", 4); ! wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); ! lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ! ]] --============================================================================= |
|
From: John L. <jr...@us...> - 2008-01-23 06:44:08
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/apps/wxluafreeze/src Modified Files: wxluafreeze.cpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluafreeze.cpp 20 Jan 2008 19:23:00 -0000 1.16 --- wxluafreeze.cpp 23 Jan 2008 06:43:34 -0000 1.17 *************** *** 105,124 **** // Initialize the wxLua bindings we want to use. // See notes for WXLUA_DECLARE_BIND_ALL above. ! //WXLUA_IMPLEMENT_BIND_ALL ! ! WXLUA_IMPLEMENT_BIND_WXLUA ! //WXLUA_IMPLEMENT_BIND_WXLUASOCKET ! WXLUA_IMPLEMENT_BIND_WXBASE ! WXLUA_IMPLEMENT_BIND_WXCORE ! WXLUA_IMPLEMENT_BIND_WXADV ! WXLUA_IMPLEMENT_BIND_WXNET ! WXLUA_IMPLEMENT_BIND_WXXML ! WXLUA_IMPLEMENT_BIND_WXXRC ! WXLUA_IMPLEMENT_BIND_WXHTML ! WXLUA_IMPLEMENT_BIND_WXAUI ! WXLUA_IMPLEMENT_BIND_WXMEDIA ! WXLUA_IMPLEMENT_BIND_WXGL ! //WXLUA_IMPLEMENT_BIND_WXSTC ! m_fileName = argv[0]; // the filename of 'this' program --- 105,109 ---- // Initialize the wxLua bindings we want to use. // See notes for WXLUA_DECLARE_BIND_ALL above. ! WXLUA_IMPLEMENT_BIND_ALL m_fileName = argv[0]; // the filename of 'this' program |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_bind.cpp wxadv_grid.cpp wxaui_aui.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.cpp wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp wxcore_sizer.cpp wxcore_windows.cpp wxcore_wxlcore.cpp wxgl_bind.cpp wxgl_gl.cpp wxhtml_bind.cpp wxhtml_html.cpp wxhtml_wxlhtml.cpp wxmedia_bind.cpp wxmedia_media.cpp wxnet_bind.cpp wxnet_net.cpp wxstc_bind.cpp wxstc_stc.cpp wxxml_bind.cpp wxxml_xml.cpp wxxrc_bind.cpp wxxrc_xrc.cpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxxrc_xrc.cpp 22 Dec 2007 06:07:15 -0000 1.10 --- wxxrc_xrc.cpp 23 Jan 2008 06:43:38 -0000 1.11 *************** *** 27,33 **** // Lua MetaTable Tag for Class 'wxXmlResource' ! int g_wxluatype_wxXmlResource = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, &g_wxluatype_wxWindow, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl }}; --- 27,33 ---- // Lua MetaTable Tag for Class 'wxXmlResource' ! int wxluatype_wxXmlResource = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, &wxluatype_wxWindow, &wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl }}; *************** *** 38,48 **** int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); --- 38,48 ---- int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, wxluatype_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, wxluatype_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); *************** *** 53,57 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers }}; --- 53,57 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers[] = { &wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers }}; *************** *** 60,64 **** { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call ClearHandlers self->ClearHandlers(); --- 60,64 ---- { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call ClearHandlers self->ClearHandlers(); *************** *** 67,71 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion }}; --- 67,71 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion[] = { &wxluatype_wxXmlResource, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion }}; *************** *** 82,86 **** int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); --- 82,86 ---- int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); *************** *** 99,108 **** wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetFlags[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetFlags }}; --- 99,108 ---- wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetFlags[] = { &wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetFlags }}; *************** *** 111,115 **** { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); --- 111,115 ---- { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); *************** *** 120,124 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetVersion[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetVersion }}; --- 120,124 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetVersion[] = { &wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetVersion }}; *************** *** 127,131 **** { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); --- 127,131 ---- { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); *************** *** 136,140 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID }}; --- 136,140 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID[] = { &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID }}; *************** *** 156,160 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers }}; --- 156,160 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers[] = { &wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers }}; *************** *** 163,167 **** { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); --- 163,167 ---- { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); *************** *** 170,174 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Load[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Load }}; --- 170,174 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Load[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Load }}; *************** *** 179,183 **** const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Load bool returns = (self->Load(filemask)); --- 179,183 ---- const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call Load bool returns = (self->Load(filemask)); *************** *** 190,194 **** #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap }}; --- 190,194 ---- #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap }}; *************** *** 199,203 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor --- 199,203 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor *************** *** 206,210 **** wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxBitmap); return 1; --- 206,210 ---- wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap); return 1; *************** *** 214,218 **** #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxDialog, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }}; --- 214,218 ---- #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1[] = { &wxluatype_wxXmlResource, &wxluatype_wxDialog, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }}; *************** *** 223,231 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); --- 223,231 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, wxluatype_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, wxluatype_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); *************** *** 236,240 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }}; --- 236,240 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog[] = { &wxluatype_wxXmlResource, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }}; *************** *** 245,255 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxDialog); return 1; --- 245,255 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxDialog); return 1; *************** *** 259,263 **** #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxFrame, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame }}; --- 259,263 ---- #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame[] = { &wxluatype_wxXmlResource, &wxluatype_wxFrame, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame }}; *************** *** 268,276 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); --- 268,276 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, wxluatype_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, wxluatype_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); *************** *** 284,288 **** #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon }}; --- 284,288 ---- #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon }}; *************** *** 293,297 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor --- 293,297 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor *************** *** 300,304 **** wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxIcon); return 1; --- 300,304 ---- wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxIcon); return 1; *************** *** 308,312 **** #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu }}; --- 308,312 ---- #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu }}; *************** *** 317,330 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenu); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }}; --- 317,330 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxMenu); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }}; *************** *** 335,348 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }}; --- 335,348 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxMenuBar); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar[] = { &wxluatype_wxXmlResource, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }}; *************** *** 353,363 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; --- 353,363 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxMenuBar); return 1; *************** *** 366,370 **** #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxPanel, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }}; --- 366,370 ---- #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1[] = { &wxluatype_wxXmlResource, &wxluatype_wxPanel, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }}; *************** *** 375,383 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); --- 375,383 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, wxluatype_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, wxluatype_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); *************** *** 388,392 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }}; --- 388,392 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel[] = { &wxluatype_wxXmlResource, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }}; *************** *** 397,407 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxPanel); return 1; --- 397,407 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxPanel); return 1; *************** *** 410,414 **** #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar }}; --- 410,414 ---- #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar[] = { &wxluatype_wxXmlResource, &wxluatype_wxWindow, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar }}; *************** *** 419,429 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxToolBar); return 1; --- 419,429 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxToolBar); return 1; *************** *** 432,436 **** #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Set[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_Set }}; --- 432,436 ---- #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Set[] = { &wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_Set }}; *************** *** 439,443 **** { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set --- 439,443 ---- { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set *************** *** 445,454 **** if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetDomain[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetDomain }}; --- 445,454 ---- if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetDomain[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetDomain }}; *************** *** 459,463 **** const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetDomain self->SetDomain(domain); --- 459,463 ---- const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call SetDomain self->SetDomain(domain); *************** *** 466,470 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetFlags[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetFlags }}; --- 466,470 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetFlags[] = { &wxluatype_wxXmlResource, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetFlags }}; *************** *** 475,479 **** int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetFlags self->SetFlags(flags); --- 475,479 ---- int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call SetFlags self->SetFlags(flags); *************** *** 482,486 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Unload[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Unload }}; --- 482,486 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Unload[] = { &wxluatype_wxXmlResource, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Unload }}; *************** *** 491,495 **** const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); --- 491,495 ---- const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); *************** *** 500,507 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_delete[] = { &g_wxluatype_wxXmlResource, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor1[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }}; --- 500,507 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_delete[] = { &wxluatype_wxXmlResource, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor1[] = { &wxluatype_TSTRING, &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }}; *************** *** 522,531 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }}; --- 522,531 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }}; *************** *** 544,548 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; --- 544,548 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxXmlResource); return 1; Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxstc_stc.cpp 22 Dec 2007 06:07:15 -0000 1.11 --- wxstc_stc.cpp 23 Jan 2008 06:43:38 -0000 1.12 *************** *** 25,31 **** // Lua MetaTable Tag for Class 'wxStyledTextCtrl' ! int g_wxluatype_wxStyledTextCtrl = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &g_wxluatype_wxStyledTextCtrl, &g_wxluatype_TLIGHTUSERDATA, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; --- 25,31 ---- // Lua MetaTable Tag for Class 'wxStyledTextCtrl' [...13009 lines suppressed...] ! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextEvent_delete[] = { &wxluatype_wxStyledTextEvent, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxStyledTextEvent_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_constructor[1] = {{ wxLua_wxStyledTextEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor }}; *************** *** 8680,8684 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStyledTextEvent); return 1; --- 8680,8684 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxStyledTextEvent); return 1; Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxnet_net.cpp 22 Dec 2007 06:07:14 -0000 1.9 --- wxnet_net.cpp 23 Jan 2008 06:43:38 -0000 1.10 *************** *** 27,33 **** // Lua MetaTable Tag for Class 'wxSocketBase' ! int g_wxluatype_wxSocketBase = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Close[] = { &g_wxluatype_wxSocketBase, NULL }; static int LUACALL wxLua_wxSocketBase_Close(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Close[1] = {{ wxLua_wxSocketBase_Close, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxSocketBase_Close }}; --- 27,33 ---- // Lua MetaTable Tag for Class 'wxSocketBase' [...3366 lines suppressed...] // static wxLuaBindCFunc s_wxluafunc_wxLua_wxURL_constructor[1] = {{ wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor }}; --- 2660,2664 ---- #endif // ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxURL_constructor[] = { &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxURL_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxURL_constructor[1] = {{ wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor }}; *************** *** 2673,2677 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxURL); return 1; --- 2673,2677 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxURL); return 1; Index: wxhtml_html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_html.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxhtml_html.cpp 22 Dec 2007 06:07:14 -0000 1.10 --- wxhtml_html.cpp 23 Jan 2008 06:43:38 -0000 1.11 *************** *** 27,34 **** // Lua MetaTable Tag for Class 'wxHtmlCell' ! int g_wxluatype_wxHtmlCell = -1; #if (wxLUA_USE_wxArrayInt) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxHtmlCell_AdjustPagebreak[] = { &g_wxluatype_wxHtmlCell, &g_wxluatype_TNUMBER, &g_wxluatype_wxArrayInt, NULL }; static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlCell_AdjustPagebreak[1] = {{ wxLua_wxHtmlCell_AdjustPagebreak, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxHtmlCell_AdjustPagebreak }}; --- 27,34 ---- [...5800 lines suppressed...] ! static wxLuaArgType s_wxluatypeArray_wxLua_wxHtmlHelpController_delete[] = { &wxluatype_wxHtmlHelpController, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlHelpController_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxHtmlHelpController_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxHtmlHelpController_constructor[] = { &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxHtmlHelpController_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlHelpController_constructor[1] = {{ wxLua_wxHtmlHelpController_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatypeArray_wxLua_wxHtmlHelpController_constructor }}; *************** *** 4639,4643 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxHtmlHelpController); return 1; --- 4639,4643 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxHtmlHelpController); return 1; Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_clipdrag.cpp 22 Dec 2007 06:07:12 -0000 1.10 --- wxcore_clipdrag.cpp 23 Jan 2008 06:43:36 -0000 1.11 *************** *** 33,40 **** // Lua MetaTable Tag for Class 'wxClipboard' ! int g_wxluatype_wxClipboard = -1; #if (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxClipboard_AddData[] = { &g_wxluatype_wxClipboard, &g_wxluatype_wxDataObject, NULL }; static int LUACALL wxLua_wxClipboard_AddData(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboard_AddData[1] = {{ wxLua_wxClipboard_AddData, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxClipboard_AddData }}; --- 33,40 ---- [...2080 lines suppressed...] ! static wxLuaArgType s_wxluatypeArray_wxLua_wxMetafileDC_delete[] = { &wxluatype_wxMetafileDC, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafileDC_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxMetafileDC_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxMetafileDC_constructor[] = { &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxMetafileDC_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafileDC_constructor[1] = {{ wxLua_wxMetafileDC_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatypeArray_wxLua_wxMetafileDC_constructor }}; *************** *** 1861,1865 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMetafileDC); return 1; --- 1861,1865 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxMetafileDC); return 1; Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_help.cpp 22 Dec 2007 06:07:13 -0000 1.10 --- wxcore_help.cpp 23 Jan 2008 06:43:38 -0000 1.11 *************** *** 33,39 **** // Lua MetaTable Tag for Class 'wxContextHelp' ! int g_wxluatype_wxContextHelp = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxContextHelp_BeginContextHelp[] = { &g_wxluatype_wxContextHelp, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxContextHelp_BeginContextHelp(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxContextHelp_BeginContextHelp[1] = {{ wxLua_wxContextHelp_BeginContextHelp, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxContextHelp_BeginContextHelp }}; --- 33,39 ---- // Lua MetaTable Tag for Class 'wxContextHelp' [...1079 lines suppressed...] // Lua MetaTable Tag for Class 'wxExtHelpController' ! int wxluatype_wxExtHelpController = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxExtHelpController_delete[] = { &wxluatype_wxExtHelpController, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxExtHelpController_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxExtHelpController_delete }}; *************** *** 977,981 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxExtHelpController); return 1; --- 977,981 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxExtHelpController); return 1; Index: wxadv_adv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_adv.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxadv_adv.cpp 17 Jan 2008 22:37:29 -0000 1.12 --- wxadv_adv.cpp 23 Jan 2008 06:43:35 -0000 1.13 *************** *** 27,33 **** // Lua MetaTable Tag for Class 'wxAboutDialogInfo' ! int g_wxluatype_wxAboutDialogInfo = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxAboutDialogInfo_AddArtist[] = { &g_wxluatype_wxAboutDialogInfo, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxAboutDialogInfo_AddArtist(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAboutDialogInfo_AddArtist[1] = {{ wxLua_wxAboutDialogInfo_AddArtist, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAboutDialogInfo_AddArtist }}; --- 27,33 ---- // Lua MetaTable Tag for Class 'wxAboutDialogInfo' [...8627 lines suppressed...] return 1; --- 6821,6825 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxWave); return 1; *************** *** 6836,6840 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxWave); return 1; --- 6836,6840 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxWave); return 1; Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxaui_bind.cpp 17 Jan 2008 18:26:28 -0000 1.6 --- wxaui_bind.cpp 23 Jan 2008 06:43:35 -0000 1.7 *************** *** 29,68 **** { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_AUI_FIND_MANAGER", &wxEVT_AUI_FIND_MANAGER, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_BUTTON", &wxEVT_AUI_PANE_BUTTON, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_CLOSE", &wxEVT_AUI_PANE_CLOSE, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_MAXIMIZE", &wxEVT_AUI_PANE_MAXIMIZE, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_RESTORE", &wxEVT_AUI_PANE_RESTORE, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_RENDER", &wxEVT_AUI_RENDER, &g_wxluatype_wxAuiManagerEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", &wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, &g_wxluatype_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) ! { "wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK", &wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, &g_wxluatype_wxAuiNotebookEvent }, #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", &wxEVT_COMMAND_AUINOTEBOOK_BUTTON, &g_wxluatype_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) ! { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, &g_wxluatype_wxAuiNotebookEvent }, #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, &g_wxluatype_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN", &wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP", &wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN", &wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, &g_wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP", &wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, &g_wxluatype_wxAuiNotebookEvent }, #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) --- 29,68 ---- { #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_AUI_FIND_MANAGER", &wxEVT_AUI_FIND_MANAGER, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_BUTTON", &wxEVT_AUI_PANE_BUTTON, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_CLOSE", &wxEVT_AUI_PANE_CLOSE, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_MAXIMIZE", &wxEVT_AUI_PANE_MAXIMIZE, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_PANE_RESTORE", &wxEVT_AUI_PANE_RESTORE, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_AUI_RENDER", &wxEVT_AUI_RENDER, &wxluatype_wxAuiManagerEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", &wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, &wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, &wxluatype_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) ! { "wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK", &wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, &wxluatype_wxAuiNotebookEvent }, #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", &wxEVT_COMMAND_AUINOTEBOOK_BUTTON, &wxluatype_wxAuiNotebookEvent }, #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) ! { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, &wxluatype_wxAuiNotebookEvent }, #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI ! { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, &wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, &wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, &wxluatype_wxAuiNotebookEvent }, ! { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, &wxluatype_wxAuiNotebook... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-23 06:43:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua.cpp wxlua_bind.cpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlua.cpp 22 Dec 2007 06:07:16 -0000 1.10 --- wxlua.cpp 23 Jan 2008 06:43:40 -0000 1.11 *************** *** 31,37 **** // Lua MetaTable Tag for Class 'wxLuaState' ! int g_wxluatype_wxLuaState = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaState_delete[] = { &g_wxluatype_wxLuaState, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaState_delete }}; --- 31,37 ---- // Lua MetaTable Tag for Class 'wxLuaState' ! int wxluatype_wxLuaState = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaState_delete[] = { &wxluatype_wxLuaState, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaState_delete }}; *************** *** 52,58 **** // Lua MetaTable Tag for Class 'wxLuaObject' ! int g_wxluatype_wxLuaObject = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlag[1] = {{ wxLua_wxLuaObject_GetAllocationFlag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag }}; --- 52,58 ---- // Lua MetaTable Tag for Class 'wxLuaObject' ! int wxluatype_wxLuaObject = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag[] = { &wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlag[1] = {{ wxLua_wxLuaObject_GetAllocationFlag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag }}; *************** *** 61,65 **** { // get this ! wxLuaObject * self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetAllocationFlag int returns = (self->GetAllocationFlag()); --- 61,65 ---- { // get this ! wxLuaObject * self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetAllocationFlag int returns = (self->GetAllocationFlag()); *************** *** 70,74 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetObject[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetObject }}; --- 70,74 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetObject[] = { &wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetObject }}; *************** *** 78,82 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) --- 78,82 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) *************** *** 87,91 **** ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_SetObject[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_SetObject }}; --- 87,91 ---- ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_SetObject[] = { &wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_SetObject }}; *************** *** 95,99 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call SetObject self->SetObject(1); --- 95,99 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject self->SetObject(1); *************** *** 103,107 **** ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_delete[] = { &g_wxluatype_wxLuaObject, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_delete }}; --- 103,107 ---- ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_delete[] = { &wxluatype_wxLuaObject, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_delete }}; *************** *** 120,124 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaObject); // return the number of parameters return 1; --- 120,124 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaObject); // return the number of parameters return 1; Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** wxlstate.cpp 20 Jan 2008 19:23:02 -0000 1.164 --- wxlstate.cpp 23 Jan 2008 06:43:39 -0000 1.165 *************** *** 884,903 **** // ---------------------------------------------------------------------------- ! int wxluaT_newmetatable(lua_State* L) { ! lua_newtable(L); // create a table for our new type ! int wxl_type = wxluaR_ref(L, -1, &wxlua_lreg_types_key); // insert the table into the registry table ! lua_pushlightuserdata(L, &wxlua_metatable_type_key); // push key lua_pushnumber(L, wxl_type); // push value lua_rawset(L, -3); // set t[key] = value; pop key and value return wxl_type; // leave the table on the stack } ! bool LUACALL wxluaT_setmetatable(lua_State *L, int wxl_type) { if (wxluaR_getref(L, wxl_type, &wxlua_lreg_types_key)) // get the metatable { // set it as the metatable of the object at the top of the stack if (lua_setmetatable(L, -2)) // pops table --- 884,936 ---- // ---------------------------------------------------------------------------- ! int wxluaT_newmetatable(lua_State* L, int wxl_type) { ! lua_newtable(L); // create a table for our new type lua_pushlightuserdata(L, &wxlua_metatable_type_key); // push key lua_pushnumber(L, wxl_type); // push value lua_rawset(L, -3); // set t[key] = value; pop key and value + lua_pushlightuserdata(L, &wxlua_lreg_types_key); // push key + lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push value (table) + + // make sure that the Lua table array is contiguous + int len = (int)lua_objlen(L, -1); // get the length of the table + while (++len < wxl_type) + { + lua_pushnumber(L, 0); + lua_rawseti(L, -2, len); + } + + // It is not allowed to reregister this type + lua_rawgeti(L, -1, wxl_type); + int t = lua_type(L, -1); + wxCHECK_MSG((t == LUA_TNUMBER) || (t == LUA_TNIL), WXLUA_TUNKNOWN, wxT("Attempting to reregister wxLua type")); + lua_pop(L, 1); + + // Add the metatable to the wxlua_lreg_types_key table + lua_pushvalue(L, -2); // copy the metatable + lua_rawseti(L, -2, wxl_type); // add it, pops table + lua_pop(L, 1); // pop wxlua_lreg_types_key table + return wxl_type; // leave the table on the stack } ! bool LUACALL wxluaT_getmetatable(lua_State* L, int wxl_type) { if (wxluaR_getref(L, wxl_type, &wxlua_lreg_types_key)) // get the metatable { + if (lua_type(L, -1) == LUA_TTABLE) + return true; + + lua_pop(L, 1); // pop nil or 0 placeholder + } + + return false; + } + + bool LUACALL wxluaT_setmetatable(lua_State *L, int wxl_type) + { + if (wxluaT_getmetatable(L, wxl_type)) // get the metatable + { // set it as the metatable of the object at the top of the stack if (lua_setmetatable(L, -2)) // pops table *************** *** 980,984 **** else { ! if (wxl_type == g_wxluatag_NULL) // FIXME NEEDED since there isn't a wxLuaBindClass return wxT("NULL"); --- 1013,1017 ---- else { ! if (wxl_type == wxluatype_NULL) // FIXME NEEDED since there isn't a wxLuaBindClass return wxT("NULL"); *************** *** 1014,1018 **** { // note: wxluaR_getref() doesn't leave anything on the stack on failure ! if (wxluaR_getref(L, wxl_type, &wxlua_lreg_types_key)) { // t[wxluatype] = { [bindclass_key] = lightuserdata wxLuaBindClass... (or nil if not a wxLua class type) --- 1047,1051 ---- { // note: wxluaR_getref() doesn't leave anything on the stack on failure ! if (wxluaT_getmetatable(L, wxl_type)) { // t[wxluatype] = { [bindclass_key] = lightuserdata wxLuaBindClass... (or nil if not a wxLua class type) *************** *** 1048,1053 **** if (wxlua_iswxuserdatatype(stack_type) && ! ((g_wxluatag_NULL == stack_type) || // FIXME, how to check when NULL is valid or not? ! ((wxl_type == WXLUA_TSTRING) && (wxluaT_isderivedtype(L, stack_type, g_wxluatag_wxString) >= 0)) || (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0))) return true; --- 1081,1086 ---- if (wxlua_iswxuserdatatype(stack_type) && ! ((wxluatype_NULL == stack_type) || // FIXME, how to check when NULL is valid or not? ! ((wxl_type == WXLUA_TSTRING) && (wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxString) >= 0)) || (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0))) return true; *************** *** 1060,1064 **** int stack_type = wxluaT_type(L, stack_idx); ! if (g_wxluatag_NULL == stack_type) return NULL; else if (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0) --- 1093,1097 ---- int stack_type = wxluaT_type(L, stack_idx); ! if (wxluatype_NULL == stack_type) return NULL; else if (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0) *************** *** 1086,1090 **** // if the object we are referencing is derived from wxWindow ! if (obj_ptr && (wxluaT_isderivedtype(L, wxl_type, g_wxluatag_wxWindow) >= 0)) { wxWindow* win = wxDynamicCast(obj_ptr, wxWindow); // double check that it's a wxWindow --- 1119,1123 ---- // if the object we are referencing is derived from wxWindow ! if (obj_ptr && (wxluaT_isderivedtype(L, wxl_type, *p_wxluatype_wxWindow) >= 0)) { wxWindow* win = wxDynamicCast(obj_ptr, wxWindow); // double check that it's a wxWindow *************** *** 1122,1126 **** *ptr = obj_ptr; // try to get the object's references table and set the metatable to the object ! if (wxluaR_getref(L, wxl_type, &wxlua_lreg_types_key)) { // pop the table and set it as the metatable for the newuserdata --- 1155,1159 ---- *ptr = obj_ptr; // try to get the object's references table and set the metatable to the object ! if (wxluaT_getmetatable(L, wxl_type)) { // pop the table and set it as the metatable for the newuserdata *************** *** 1318,1322 **** { int wxl_type = wxluaT_type(L, stack_idx); ! return (wxluaT_isderivedtype(L, wxl_type, g_wxluatag_wxString) >= 0); } --- 1351,1355 ---- { int wxl_type = wxluaT_type(L, stack_idx); ! return (wxluaT_isderivedtype(L, wxl_type, *p_wxluatype_wxString) >= 0); } *************** *** 1340,1344 **** int stack_type = wxluaT_type(L, stack_idx); ! if (wxluaT_isderivedtype(L, stack_type, g_wxluatag_wxString) >= 0) { wxString* wxstr = (wxString*)wxlua_touserdata(L, stack_idx, false); --- 1373,1377 ---- int stack_type = wxluaT_type(L, stack_idx); ! if (wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxString) >= 0) { wxString* wxstr = (wxString*)wxlua_touserdata(L, stack_idx, false); *************** *** 2354,2357 **** --- 2387,2393 ---- RegisterFunction(wxlua_printFunction, "print"); + // register our NULL type + wxluatype_NULL = wxluaT_newmetatable(L, wxluatype_NULL); + // now register bindings if (WXLUA_HASBIT(state_type, wxLUASTATE_OPENBINDINGS)) *************** *** 2757,2770 **** M_WXLSTATEDATA->m_wxlStateData->m_bindings_registered = true; - - lua_State* L = M_WXLSTATEDATA->m_lua_State; - - // Finally - set the global types from the bindings we've just installed - g_wxluatag_wxEvent = wxluaT_gettype(L, "wxEvent"); - g_wxluatag_wxString = wxluaT_gettype(L, "wxString"); - g_wxluatag_wxWindow = wxluaT_gettype(L, "wxWindow"); - g_wxluatag_wxArrayString = wxluaT_gettype(L, "wxArrayString"); - g_wxluatag_wxSortedArrayString = wxluaT_gettype(L, "wxSortedArrayString"); - g_wxluatag_wxArrayInt = wxluaT_gettype(L, "wxArrayInt"); } --- 2793,2796 ---- *************** *** 3054,3061 **** // ---------------------------------------------------------------------------- ! int wxLuaState::wxluaT_NewMetatable() { wxCHECK_MSG(Ok(), WXLUA_TUNKNOWN, wxT("Invalid wxLuaState")); ! return wxluaT_newmetatable(M_WXLSTATEDATA->m_lua_State); } --- 3080,3087 ---- // ---------------------------------------------------------------------------- ! int wxLuaState::wxluaT_NewMetatable(int wxl_type) { wxCHECK_MSG(Ok(), WXLUA_TUNKNOWN, wxT("Invalid wxLuaState")); ! return wxluaT_newmetatable(M_WXLSTATEDATA->m_lua_State, wxl_type); } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** wxlbind.cpp 17 Jan 2008 22:37:30 -0000 1.116 --- wxlbind.cpp 23 Jan 2008 06:43:39 -0000 1.117 *************** *** 32,55 **** wxLuaBindNumber g_wxluanumberArray_None[1] = {{0, 0}}; ! int g_wxluatype_TNONE = WXLUA_TNONE; ! int g_wxluatype_TNIL = WXLUA_TNIL; ! int g_wxluatype_TBOOLEAN = WXLUA_TBOOLEAN; ! int g_wxluatype_TLIGHTUSERDATA = WXLUA_TLIGHTUSERDATA; // raw data ! int g_wxluatype_TNUMBER = WXLUA_TNUMBER; ! int g_wxluatype_TSTRING = WXLUA_TSTRING; ! int g_wxluatype_TTABLE = WXLUA_TTABLE; ! int g_wxluatype_TFUNCTION = WXLUA_TFUNCTION; ! int g_wxluatype_TUSERDATA = WXLUA_TUSERDATA; // raw data ! int g_wxluatype_TTHREAD = WXLUA_TTHREAD; ! int g_wxluatype_TINTEGER = WXLUA_TINTEGER; ! int g_wxluatype_TCFUNCTION = WXLUA_TCFUNCTION; ! int g_wxluatag_NULL = WXLUA_TUNKNOWN; ! int g_wxluatag_wxEvent = WXLUA_TUNKNOWN; ! int g_wxluatag_wxWindow = WXLUA_TUNKNOWN; ! int g_wxluatag_wxString = WXLUA_TUNKNOWN; ! int g_wxluatag_wxArrayString = WXLUA_TUNKNOWN; ! int g_wxluatag_wxSortedArrayString = WXLUA_TUNKNOWN; ! int g_wxluatag_wxArrayInt = WXLUA_TUNKNOWN; //----------------------------------------------------------------------------- --- 32,57 ---- wxLuaBindNumber g_wxluanumberArray_None[1] = {{0, 0}}; ! int wxluatype_TNONE = WXLUA_TNONE; ! int wxluatype_TNIL = WXLUA_TNIL; ! int wxluatype_TBOOLEAN = WXLUA_TBOOLEAN; ! int wxluatype_TLIGHTUSERDATA = WXLUA_TLIGHTUSERDATA; // raw data ! int wxluatype_TNUMBER = WXLUA_TNUMBER; ! int wxluatype_TSTRING = WXLUA_TSTRING; ! int wxluatype_TTABLE = WXLUA_TTABLE; ! int wxluatype_TFUNCTION = WXLUA_TFUNCTION; ! int wxluatype_TUSERDATA = WXLUA_TUSERDATA; // raw data ! int wxluatype_TTHREAD = WXLUA_TTHREAD; ! int wxluatype_TINTEGER = WXLUA_TINTEGER; ! int wxluatype_TCFUNCTION = WXLUA_TCFUNCTION; ! int wxluatype_NULL = WXLUA_TNULL; ! ! static int wxluatype_dummy = WXLUA_TUNKNOWN; ! int* p_wxluatype_wxEvent = &wxluatype_dummy; ! int* p_wxluatype_wxWindow = &wxluatype_dummy; ! int* p_wxluatype_wxString = &wxluatype_dummy; ! int* p_wxluatype_wxArrayString = &wxluatype_dummy; ! int* p_wxluatype_wxSortedArrayString = &wxluatype_dummy; ! int* p_wxluatype_wxArrayInt = &wxluatype_dummy; //----------------------------------------------------------------------------- *************** *** 393,397 **** lua_pop(L, 1); // remove the name of the function ! result = (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L); } else --- 395,399 ---- lua_pop(L, 1); // remove the name of the function ! result = (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L); } else *************** *** 583,587 **** { lua_pop(L, 2); // remove the table and the name of the function ! result = (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L); } else --- 585,589 ---- { lua_pop(L, 2); // remove the table and the name of the function ! result = (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L); } else *************** *** 703,707 **** { is_ok = (wxluaT_isuserdatatype(L, arg_lua, wxl_type) || ! (wxl_type == g_wxluatag_NULL)) ? 1 : 0; } --- 705,709 ---- { is_ok = (wxluaT_isuserdatatype(L, arg_lua, wxl_type) || ! (wxl_type == wxluatype_NULL)) ? 1 : 0; } *************** *** 940,943 **** --- 942,946 ---- wxLuaBindingList wxLuaBinding::sm_bindingList; bool wxLuaBinding::sm_bindingList_initialized = false; + int wxLuaBinding::sm_wxluatype_counter = WXLUA_T_MAX+1; wxLuaBinding::wxLuaBinding() *************** *** 966,969 **** --- 969,976 ---- for (size_t i = 0; i < m_classCount; ++i, ++wxlClass) { + // initialize types only once + if (*wxlClass->wxluatype == WXLUA_TUNKNOWN) + *wxlClass->wxluatype = wxLuaBinding::sm_wxluatype_counter++; + // Also sort the member functions for each class if (wxlClass->wxluamethods && (wxlClass->wxluamethods_n > 0)) *************** *** 1095,1100 **** // ------------------------------------------------------------------ // Create a new metatable for this class with a numerical wxLua type index ! wxl_type = wxluaT_newmetatable(L); // create metatable, is on top of stack ! *wxlClass->wxluatype = wxl_type; if (n == 0) --- 1102,1106 ---- // ------------------------------------------------------------------ // Create a new metatable for this class with a numerical wxLua type index ! wxl_type = wxluaT_newmetatable(L, *wxlClass->wxluatype); // create metatable, is on top of stack if (n == 0) Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wxlcallb.cpp 15 Jan 2008 01:04:04 -0000 1.57 --- wxlcallb.cpp 23 Jan 2008 06:43:39 -0000 1.58 *************** *** 90,97 **** wxString wxLuaEventCallback::GetInfo() const { ! return wxString::Format(wxT("%s(%d) -> wxLuaEventCallback(%p, ids %d, %d)|wxEvtHandler(%p) -> %s"), lua2wx(m_wxlBindEvent ? m_wxlBindEvent->name : "?").c_str(), (int)GetEventType(), this, m_id, m_last_id, ! m_evtHandler, m_evtHandler->GetClassInfo()->GetClassName()); } --- 90,98 ---- wxString wxLuaEventCallback::GetInfo() const { ! return wxString::Format(wxT("%s(%d) -> wxLuaEventCallback(%p, ids %d, %d)|wxEvtHandler(%p) -> %s : %s"), lua2wx(m_wxlBindEvent ? m_wxlBindEvent->name : "?").c_str(), (int)GetEventType(), this, m_id, m_last_id, ! m_evtHandler, m_evtHandler->GetClassInfo()->GetClassName(), ! m_wxlState.GetwxLuaTypeName(*m_wxlBindEvent->wxluatype).c_str()); } *************** *** 147,155 **** event_wxl_type = *wxlClass->wxluatype; else ! event_wxl_type = g_wxluatag_wxEvent; // get the g_wxluatag_wxEvent } } else ! event_wxl_type = g_wxluatag_wxEvent; // get the g_wxluatag_wxEvent // Should never get here, but error out in case we do --- 148,156 ---- event_wxl_type = *wxlClass->wxluatype; else ! event_wxl_type = *p_wxluatype_wxEvent; // get the wxluatype_wxEvent } } else ! event_wxl_type = *p_wxluatype_wxEvent; // get the wxluatype_wxEvent // Should never get here, but error out in case we do Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlua_bind.cpp 5 Jan 2008 00:15:46 -0000 1.20 --- wxlua_bind.cpp 23 Jan 2008 06:43:40 -0000 1.21 *************** *** 131,135 **** // --------------------------------------------------------------------------- ! static wxLuaArgType s_wxluatypeArray_wxLua_function_CompileLuaScript[] = { &g_wxluatype_TSTRING, &g_wxluatype_TSTRING, NULL }; // %override wxLua_function_CompileLuaScript // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) --- 131,135 ---- // --------------------------------------------------------------------------- ! static wxLuaArgType s_wxluatypeArray_wxLua_function_CompileLuaScript[] = { &wxluatype_TSTRING, &wxluatype_TSTRING, NULL }; // %override wxLua_function_CompileLuaScript // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) *************** *** 724,728 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetBindings[1] = {{ wxLua_function_GetBindings, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetGCUserdataInfo[] = { &g_wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetGCUserdataInfo // %function LuaTable GetGCUserdataInfo(bool as_string = false) --- 724,728 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetBindings[1] = {{ wxLua_function_GetBindings, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetGCUserdataInfo[] = { &wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetGCUserdataInfo // %function LuaTable GetGCUserdataInfo(bool as_string = false) *************** *** 740,744 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetGCUserdataInfo[1] = {{ wxLua_function_GetGCUserdataInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetGCUserdataInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedEventCallbackInfo[] = { &g_wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedEventCallbackInfo // %function LuaTable GetTrackedEventCallbackInfo(bool as_string = false) --- 740,744 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetGCUserdataInfo[1] = {{ wxLua_function_GetGCUserdataInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetGCUserdataInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedEventCallbackInfo[] = { &wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedEventCallbackInfo // %function LuaTable GetTrackedEventCallbackInfo(bool as_string = false) *************** *** 757,761 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedEventCallbackInfo[1] = {{ wxLua_function_GetTrackedEventCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedEventCallbackInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedObjectInfo[] = { &g_wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedObjectInfo // %function LuaTable GetTrackedObjectInfo(bool as_string = false) --- 757,761 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedEventCallbackInfo[1] = {{ wxLua_function_GetTrackedEventCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedEventCallbackInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedObjectInfo[] = { &wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedObjectInfo // %function LuaTable GetTrackedObjectInfo(bool as_string = false) *************** *** 773,777 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedObjectInfo[1] = {{ wxLua_function_GetTrackedObjectInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedObjectInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedWinDestroyCallbackInfo[] = { &g_wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedWinDestroyCallbackInfo // %function LuaTable GetTrackedWinDestroyCallbackInfo(bool as_string = false) --- 773,777 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedObjectInfo[1] = {{ wxLua_function_GetTrackedObjectInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedObjectInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedWinDestroyCallbackInfo[] = { &wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedWinDestroyCallbackInfo // %function LuaTable GetTrackedWinDestroyCallbackInfo(bool as_string = false) *************** *** 790,794 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWinDestroyCallbackInfo[1] = {{ wxLua_function_GetTrackedWinDestroyCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedWinDestroyCallbackInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedWindowInfo[] = { &g_wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedWindowInfo // %function LuaTable GetTrackedWindowInfo(bool as_string = false) --- 790,794 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWinDestroyCallbackInfo[1] = {{ wxLua_function_GetTrackedWinDestroyCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedWinDestroyCallbackInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_GetTrackedWindowInfo[] = { &wxluatype_TBOOLEAN, NULL }; // %override wxLua_function_GetTrackedWindowInfo // %function LuaTable GetTrackedWindowInfo(bool as_string = false) *************** *** 806,810 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindowInfo[1] = {{ wxLua_function_GetTrackedWindowInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedWindowInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_iswxluatype[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) static int LUACALL wxLua_function_iswxluatype(lua_State *L) --- 806,810 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindowInfo[1] = {{ wxLua_function_GetTrackedWindowInfo, WXLUAMETHOD_CFUNCTION, 0, 1, s_wxluatypeArray_wxLua_function_GetTrackedWindowInfo }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_iswxluatype[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; // %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) static int LUACALL wxLua_function_iswxluatype(lua_State *L) *************** *** 823,827 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_iswxluatype[1] = {{ wxLua_function_iswxluatype, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatypeArray_wxLua_function_iswxluatype }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_type[] = { &g_wxluatype_TLIGHTUSERDATA, NULL }; // %override wxLua_function_type // %function int type(int wxluaarg_tag) --- 823,827 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_iswxluatype[1] = {{ wxLua_function_iswxluatype, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatypeArray_wxLua_function_iswxluatype }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_type[] = { &wxluatype_TLIGHTUSERDATA, NULL }; // %override wxLua_function_type // %function int type(int wxluaarg_tag) *************** *** 846,850 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_type[1] = {{ wxLua_function_type, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_type }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_typename[] = { &g_wxluatype_TNUMBER, NULL }; // %override wxLua_function_typename // %function wxString typename(int wxluaarg_tag) --- 846,850 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_type[1] = {{ wxLua_function_type, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_type }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_typename[] = { &wxluatype_TNUMBER, NULL }; // %override wxLua_function_typename // %function wxString typename(int wxluaarg_tag) *************** *** 863,867 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_typename[1] = {{ wxLua_function_typename, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_typename }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION(lua_State *L) --- 863,867 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_typename[1] = {{ wxLua_function_typename, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_typename }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION(lua_State *L) *************** *** 882,886 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION[1] = {{ wxLua_function_wxLUA_CHECK_VERSION, WXLUAMETHOD_CFUNCTION, 3, 3, s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION_FULL[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION_FULL(lua_State *L) --- 882,886 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION[1] = {{ wxLua_function_wxLUA_CHECK_VERSION, WXLUAMETHOD_CFUNCTION, 3, 3, s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION_FULL[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION_FULL(lua_State *L) *************** *** 940,945 **** static wxLuaBindClass classList[] = { ! { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &g_wxluatype_wxLuaObject, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &g_wxluatype_wxLuaState, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 940,945 ---- static wxLuaBindClass classList[] = { ! { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &wxluatype_wxLuaObject, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &wxluatype_wxLuaState, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, *************** *** 972,977 **** { } ! void wxLuaBinding_wxlua::PostRegister(const wxLuaState&, int ) { } --- 972,983 ---- { } ! void wxLuaBinding_wxlua::PostRegister(const wxLuaState& wxlState, int luaTable) { + wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); + lua_State* L = wxlState.GetLuaState(); + + lua_pushlstring(L, "NULL", 4); + wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); + lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag } |
|
From: John L. <jr...@us...> - 2008-01-23 06:43:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluasocket_bind.cpp 22 Dec 2007 06:07:17 -0000 1.25 --- wxluasocket_bind.cpp 23 Jan 2008 06:43:40 -0000 1.26 *************** *** 28,41 **** static wxLuaBindEvent eventList[] = { ! { "wxEVT_WXLUA_DEBUGGER_BREAK", &wxEVT_WXLUA_DEBUGGER_BREAK, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_ERROR", &wxEVT_WXLUA_DEBUGGER_ERROR, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EXIT", &wxEVT_WXLUA_DEBUGGER_EXIT, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_PRINT", &wxEVT_WXLUA_DEBUGGER_PRINT, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_TABLE_ENUM", &wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, { 0, 0, 0 }, --- 28,41 ---- static wxLuaBindEvent eventList[] = { ! { "wxEVT_WXLUA_DEBUGGER_BREAK", &wxEVT_WXLUA_DEBUGGER_BREAK, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_ERROR", &wxEVT_WXLUA_DEBUGGER_ERROR, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EXIT", &wxEVT_WXLUA_DEBUGGER_EXIT, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_PRINT", &wxEVT_WXLUA_DEBUGGER_PRINT, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENUM, &wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_TABLE_ENUM", &wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, &wxluatype_wxLuaDebuggerEvent }, { 0, 0, 0 }, *************** *** 135,140 **** static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &g_wxluatype_wxLuaDebuggerEvent, "wxEvent", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &g_wxluatype_wxLuaDebuggerServer, "wxEvtHandler", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 135,140 ---- static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, "wxEvent", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, "wxEvtHandler", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluasocket.cpp 22 Dec 2007 06:07:17 -0000 1.37 --- wxluasocket.cpp 23 Jan 2008 06:43:40 -0000 1.38 *************** *** 25,31 **** // Lua MetaTable Tag for Class 'wxLuaDebuggerServer' ! int g_wxluatype_wxLuaDebuggerServer = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; --- 25,31 ---- // Lua MetaTable Tag for Class 'wxLuaDebuggerServer' ! int wxluatype_wxLuaDebuggerServer = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &wxluatype_wxLuaDebuggerServer, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; *************** *** 38,42 **** const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call AddBreakPoint bool returns = (self->AddBreakPoint(fileName, lineNumber)); --- 38,42 ---- const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call AddBreakPoint bool returns = (self->AddBreakPoint(fileName, lineNumber)); *************** *** 47,51 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break }}; --- 47,51 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break }}; *************** *** 54,58 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Break bool returns = (self->Break()); --- 54,58 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call Break bool returns = (self->Break()); *************** *** 63,67 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; --- 63,67 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; *************** *** 70,74 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call ClearAllBreakPoints bool returns = (self->ClearAllBreakPoints()); --- 70,74 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call ClearAllBreakPoints bool returns = (self->ClearAllBreakPoints()); *************** *** 79,83 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue }}; --- 79,83 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue }}; *************** *** 86,90 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Continue bool returns = (self->Continue()); --- 86,90 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call Continue bool returns = (self->Continue()); *************** *** 95,99 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; --- 95,99 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &wxluatype_wxLuaDebuggerServer, &wxluatype_wxWindow, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; *************** *** 106,112 **** wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call DisplayStackDialog self->DisplayStackDialog(pParent, id); --- 106,112 ---- wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call DisplayStackDialog self->DisplayStackDialog(pParent, id); *************** *** 115,119 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; --- 115,119 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &wxluatype_wxLuaDebuggerServer, &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; *************** *** 126,130 **** int exprRef = (int)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call EvaluateExpr bool returns = (self->EvaluateExpr(exprRef, expr)); --- 126,130 ---- int exprRef = (int)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call EvaluateExpr bool returns = (self->EvaluateExpr(exprRef, expr)); *************** *** 135,139 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; --- 135,139 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; *************** *** 142,146 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call GetDebuggeeProcessId long returns = (self->GetDebuggeeProcessId()); --- 142,146 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call GetDebuggeeProcessId long returns = (self->GetDebuggeeProcessId()); *************** *** 177,181 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; --- 177,181 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; *************** *** 184,188 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call KillDebuggee bool returns = (self->KillDebuggee()); --- 184,188 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call KillDebuggee bool returns = (self->KillDebuggee()); *************** *** 193,197 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; --- 193,197 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &wxluatype_wxLuaDebuggerServer, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; *************** *** 204,208 **** const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call RemoveBreakPoint bool returns = (self->RemoveBreakPoint(fileName, lineNumber)); --- 204,208 ---- const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call RemoveBreakPoint bool returns = (self->RemoveBreakPoint(fileName, lineNumber)); *************** *** 213,217 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset }}; --- 213,217 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset }}; *************** *** 220,224 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Reset bool returns = (self->Reset()); --- 220,224 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call Reset bool returns = (self->Reset()); *************** *** 229,233 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run }}; --- 229,233 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run[] = { &wxluatype_wxLuaDebuggerServer, &wxluatype_TSTRING, &wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run }}; *************** *** 240,244 **** const wxString file = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Run bool returns = (self->Run(file, fileName)); --- 240,244 ---- const wxString file = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call Run bool returns = (self->Run(file, fileName)); *************** *** 249,253 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient }}; --- 249,253 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient }}; *************** *** 256,260 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StartClient long returns = (self->StartClient()); --- 256,260 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call StartClient long returns = (self->StartClient()); *************** *** 265,269 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer }}; --- 265,269 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer }}; *************** *** 272,276 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StartServer bool returns = (self->StartServer()); --- 272,276 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call StartServer bool returns = (self->StartServer()); *************** *** 281,285 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step }}; --- 281,285 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step }}; *************** *** 288,292 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Step bool returns = (self->Step()); --- 288,292 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call Step bool returns = (self->Step()); *************** *** 297,301 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut }}; --- 297,301 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut }}; *************** *** 304,308 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StepOut bool returns = (self->StepOut()); --- 304,308 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call StepOut bool returns = (self->StepOut()); *************** *** 313,317 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver }}; --- 313,317 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver }}; *************** *** 320,324 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StepOver bool returns = (self->StepOver()); --- 320,324 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call StepOver bool returns = (self->StepOver()); *************** *** 329,333 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer }}; --- 329,333 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer }}; *************** *** 336,340 **** { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StopServer bool returns = (self->StopServer()); --- 336,340 ---- { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer); // call StopServer bool returns = (self->StopServer()); *************** *** 345,352 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor[] = { &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor }}; --- 345,352 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete[] = { &wxluatype_wxLuaDebuggerServer, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor[] = { &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor }}; *************** *** 361,365 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaDebuggerServer); return 1; --- 361,365 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaDebuggerServer); return 1; *************** *** 402,408 **** // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent' ! int g_wxluatype_wxLuaDebuggerEvent = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; --- 402,408 ---- // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent' ! int wxluatype_wxLuaDebuggerEvent = WXLUA_TUNKNOWN; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; *************** *** 411,415 **** { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetFileName wxString returns = (self->GetFileName()); --- 411,415 ---- { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerEvent); // call GetFileName wxString returns = (self->GetFileName()); *************** *** 420,424 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; --- 420,424 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; *************** *** 427,431 **** { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetLineNumber int returns = (self->GetLineNumber()); --- 427,431 ---- { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerEvent); // call GetLineNumber int returns = (self->GetLineNumber()); *************** *** 436,440 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; --- 436,440 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; *************** *** 443,447 **** { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetMessage wxString returns = (self->GetMessage()); --- 443,447 ---- { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerEvent); // call GetMessage wxString returns = (self->GetMessage()); *************** *** 452,456 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference }}; --- 452,456 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference }}; *************** *** 459,463 **** { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetReference int returns = (self->GetReference()); --- 459,463 ---- { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerEvent); // call GetReference int returns = (self->GetReference()); *************** *** 468,472 **** } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete }}; --- 468,472 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete[] = { &wxluatype_wxLuaDebuggerEvent, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete }}; |
|
From: John L. <jr...@us...> - 2008-01-23 06:43:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluasocket_bind.h 22 Dec 2007 06:07:16 -0000 1.31 --- wxluasocket_bind.h 23 Jan 2008 06:43:40 -0000 1.32 *************** *** 21,31 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxluasocket : public wxLuaBinding { public: --- 21,31 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_WXLUASOCKET wxLuaBinding_wxluasocket : public wxLuaBinding { public: *************** *** 56,79 **** #include "wxluasocket/include/wxldserv.h" - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxluasocket(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxluasocket(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxluasocket(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxluasocket(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxluasocket(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxluasocket(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) g_wxluatype_wxLuaDebuggerEvent; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) g_wxluatype_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; --- 56,67 ---- #include "wxluasocket/include/wxldserv.h" // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxluatype_wxLuaDebuggerEvent; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxluatype_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; |
|
From: John L. <jr...@us...> - 2008-01-23 06:43:43
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/samples Modified Files: controls.wx.lua unittest.wx.lua Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** controls.wx.lua 22 Jan 2008 04:45:39 -0000 1.16 --- controls.wx.lua 23 Jan 2008 06:43:40 -0000 1.17 *************** *** 270,274 **** -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable) local t = {} --- 270,274 ---- -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable, evtClassName) local t = {} *************** *** 280,288 **** local typ_name, typ = wxlua.type(v) ! if typ == wxlua.WXLUAARG_String then s = s.."'"..tostring(v).."'" ! elseif typ == wxlua.WXLUAARG_Table then s = s.."("..table.concat(v, ",")..")" ! elseif typ <= 0 then -- the rest of generic lua types s = s..tostring(v) elseif typ_name == "wxPoint" then --- 280,288 ---- local typ_name, typ = wxlua.type(v) ! if typ == wxlua.WXLUA_TSTRING then s = s.."'"..tostring(v).."'" ! elseif typ == wxlua.WXLUA_TTABLE then s = s.."("..table.concat(v, ",")..")" ! elseif typ <= wxlua.WXLUA_TCFUNCTION then -- the rest of generic lua types s = s..tostring(v) elseif typ_name == "wxPoint" then *************** *** 315,319 **** --v:delete() -- If we haven't handled it yet, we probably should ! print("Unhandled wxLua data type in FuncsToString from ", wxlua.type(event), typ_name) end --- 315,319 ---- --v:delete() -- If we haven't handled it yet, we probably should ! print("Unhandled wxLua data type in FuncsToString from ", wxlua.type(event), typ_name, s, evtClassName) end *************** *** 365,369 **** while wxEvent_GetFuncs[evtClassName] do if type(wxEvent_GetFuncs[evtClassName]) == "table" then ! s = s.."\n\t"..evtClassName.." - "..FuncsToString(event, wxEvent_GetFuncs[evtClassName]) else s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event) --- 365,369 ---- while wxEvent_GetFuncs[evtClassName] do if type(wxEvent_GetFuncs[evtClassName]) == "table" then ! s = s.."\n\t"..evtClassName.." - "..FuncsToString(event, wxEvent_GetFuncs[evtClassName], evtClassName) else s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event) Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** unittest.wx.lua 22 Jan 2008 04:45:39 -0000 1.21 --- unittest.wx.lua 23 Jan 2008 06:43:40 -0000 1.22 *************** *** 94,98 **** end ! PrintOk(wxlua.WXLUA_TNIL == -2, "Test wxlua bindings wxlua.WXLUA_TNIL == -2") -- --------------------------------------------------------------------------- --- 94,98 ---- end ! PrintOk(wxlua.WXLUA_TNIL == 2, "Test wxlua bindings wxlua.WXLUA_TNIL == 2") -- --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-23 06:43:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv692/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: Use positive values for WXLUA_TXXX types not negative. Initialize the wxLua types when the bindings are initialized not when installed into Lua so we can install the bindings in any order or number for multiple wxLuaStates. Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxldefs.h 4 Jan 2008 00:21:08 -0000 1.41 --- wxldefs.h 23 Jan 2008 06:43:38 -0000 1.42 *************** *** 65,69 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 21 // ---------------------------------------------------------------------------- --- 65,69 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 22 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** wxlbind.h 17 Jan 2008 22:37:30 -0000 1.79 --- wxlbind.h 23 Jan 2008 06:43:38 -0000 1.80 *************** *** 24,30 **** // ---------------------------------------------------------------------------- ! // Binding wxLua types are positive integers generated automatically when initialized ! // and the inbuilt wxLua types (WXLUA_TXXX) corresponding to Lua types ! // (LUA_TXXX) are negative values. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. --- 24,31 ---- // ---------------------------------------------------------------------------- ! // The inbuilt wxLua types (WXLUA_TXXX) corresponding to Lua types (LUA_TXXX) ! // are shifted to be positive values. ! // The Binding wxLua types are positive integers generated automatically when ! // initialized and start at WXLUA_T_MAX+1. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. *************** *** 32,85 **** // Note that WXLUA_TUNKNOWN is used as an initialiser for class types // and is used as an end marker for the wxLuaArgType array that ! // represents function prototype argument types in the wxLuaBindCFunc struct. // wxLua types for Lua types #define WXLUA_TUNKNOWN 0 // unset and invalid, not a LUA_TXXX ! #define WXLUA_TNONE -1 // LUA_TNONE -1 ! #define WXLUA_TNIL -2 // LUA_TNIL 0 ! #define WXLUA_TBOOLEAN -3 // LUA_TBOOLEAN 1 ! #define WXLUA_TLIGHTUSERDATA -4 // LUA_TLIGHTUSERDATA 2 ! #define WXLUA_TNUMBER -5 // LUA_TNUMBER 3 ! #define WXLUA_TSTRING -6 // LUA_TSTRING 4 ! #define WXLUA_TTABLE -7 // LUA_TTABLE 5 ! #define WXLUA_TFUNCTION -8 // LUA_TFUNCTION 6 ! #define WXLUA_TUSERDATA -9 // LUA_TUSERDATA 7 ! #define WXLUA_TTHREAD -10 // LUA_TTHREAD 8 ! #define WXLUA_TINTEGER -11 // LUA_TNUMBER but integer only, not a LUA_TXXX ! #define WXLUA_TCFUNCTION -12 // LUA_TFUNCTION & lua_iscfunction(), not a LUA_TXXX ! #define WXLUA_T_MAX 0 // Max of the WXLUA_TXXX values ! #define WXLUA_T_MIN -12 // Min of the WXLUA_TXXX values ! // Blindly convert the lua_type to the wxlua_type. Note: WXLUA_TXXX = -1*LUA_TXXX - 2 // *** See wxlua_luatowxluatype() for a better function *** ! #define LUAT_TO_WXLUAT(luatype) (-1*(luatype) - 2) // Variables used in the wxLuaArgType member of the wxLuaBindCFunc for // Lua types. The binding generator uses these and generates new ones for // classes and structs as specified in the bindings. ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNONE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNIL; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TBOOLEAN; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TLIGHTUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNUMBER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TSTRING; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TTABLE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TFUNCTION; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TTHREAD; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TINTEGER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TCFUNCTION; // Copies of wxLua types that are used very often. // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_NULL; // wxLua type for NULL pointer ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxEvent; // wxLua type for wxEvents ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxWindow; // wxLua type for wxWindows ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxString; // wxLua type for wxStrings ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayString; // wxLua type for wxArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxSortedArrayString; // wxLua type for wxSortedArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayInt; // wxLua type for wxArrayInt // ---------------------------------------------------------------------------- --- 33,95 ---- // Note that WXLUA_TUNKNOWN is used as an initialiser for class types // and is used as an end marker for the wxLuaArgType array that ! // represents function prototype argument types in the wxLuaBindCFunc struct ! // and it must always be 0. // wxLua types for Lua types #define WXLUA_TUNKNOWN 0 // unset and invalid, not a LUA_TXXX ! #define WXLUA_TNONE 1 // LUA_TNONE -1 ! #define WXLUA_TNIL 2 // LUA_TNIL 0 ! #define WXLUA_TBOOLEAN 3 // LUA_TBOOLEAN 1 ! #define WXLUA_TLIGHTUSERDATA 4 // LUA_TLIGHTUSERDATA 2 ! #define WXLUA_TNUMBER 5 // LUA_TNUMBER 3 ! #define WXLUA_TSTRING 6 // LUA_TSTRING 4 ! #define WXLUA_TTABLE 7 // LUA_TTABLE 5 ! #define WXLUA_TFUNCTION 8 // LUA_TFUNCTION 6 ! #define WXLUA_TUSERDATA 9 // LUA_TUSERDATA 7 ! #define WXLUA_TTHREAD 10 // LUA_TTHREAD 8 ! #define WXLUA_TINTEGER 11 // LUA_TNUMBER but integer only, not a LUA_TXXX ! #define WXLUA_TCFUNCTION 12 // LUA_TFUNCTION & lua_iscfunction(), not a LUA_TXXX ! #define WXLUA_TNULL 13 // C++ NULL ! #define WXLUA_T_MAX 13 // Max of the WXLUA_TXXX values ! #define WXLUA_T_MIN 0 // Min of the WXLUA_TXXX values ! ! // Blindly convert the lua_type to the wxlua_type. Note: WXLUA_TXXX = LUA_TXXX - 2 // *** See wxlua_luatowxluatype() for a better function *** ! #define LUAT_TO_WXLUAT(luatype) ((luatype) - 2) ! ! // Returns true if the wxLua type is for a wxLua binding type and not a ! // generic WXLUA_TXXX type. This means that there might be a metatable for ! // this type in the wxlua_lreg_types_key of the LUA_REGISTRYINDEX table. ! #define wxlua_iswxuserdatatype(wxl_type) ((wxl_type) >= WXLUA_TNULL) // Variables used in the wxLuaArgType member of the wxLuaBindCFunc for // Lua types. The binding generator uses these and generates new ones for // classes and structs as specified in the bindings. ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TNONE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TNIL; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TBOOLEAN; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TLIGHTUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TNUMBER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TSTRING; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TTABLE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TFUNCTION; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TTHREAD; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TINTEGER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TCFUNCTION; ! ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_NULL; // wxLua type for NULL pointer // Copies of wxLua types that are used very often. // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxEvent; // wxLua type for wxEvents ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxWindow; // wxLua type for wxWindows ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxString; // wxLua type for wxStrings ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayString; // wxLua type for wxArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxSortedArrayString; // wxLua type for wxSortedArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayInt; // wxLua type for wxArrayInt // ---------------------------------------------------------------------------- *************** *** 176,180 **** const wxEventType* eventType; // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED int* wxluatype; // wxLua class type that wxWidgets uses for this wxEventType, ! // e.g. &g_wxluatype_wxCommandEvent }; --- 186,190 ---- const wxEventType* eventType; // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED int* wxluatype; // wxLua class type that wxWidgets uses for this wxEventType, ! // e.g. &wxluatype_wxCommandEvent }; *************** *** 625,628 **** --- 635,639 ---- static wxLuaBindingList sm_bindingList; static bool sm_bindingList_initialized; + static int sm_wxluatype_counter; DECLARE_ABSTRACT_CLASS(wxLuaBinding) Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** wxlstate.h 20 Jan 2008 19:23:01 -0000 1.116 --- wxlstate.h 23 Jan 2008 06:43:38 -0000 1.117 *************** *** 199,204 **** // Get information from the return value of lua_pcall(), luaL_loadbuffer(), etc ! // and builds an errMsg with wxlua_LUA_ERR_msg() and if the current top ! // is > than top it tries to get Lua's error string from the top of the stack. // Returns true if status != 0 and the errMsg and line_num are filled. // If errMsg and line_num aren't null then fill them with the msg and line. --- 199,204 ---- // Get information from the return value of lua_pcall(), luaL_loadbuffer(), etc ! // and builds an errMsg with wxlua_LUA_ERR_msg() and if the current top ! // is > than top it tries to get Lua's error string from the top of the stack. // Returns true if status != 0 and the errMsg and line_num are filled. // If errMsg and line_num aren't null then fill them with the msg and line. *************** *** 315,319 **** WXDLLIMPEXP_WXLUA bool LUACALL wxluaO_istrackedweakobject(lua_State *L, void *obj_ptr, int wxl_type, bool push_on_stack); // Get a wxArrayString of the info in the wxlua_lreg_weakobjects_key LUA_REGISTRYINDEX table. ! // Strings are of the form "&obj_ptr = wxLuaTypeName1(&udata, type=wxLuaType), ..." // If the object is casted to multiple types there will be wxLuaTypeName2(...) and so on. WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaO_gettrackedweakobjectinfo(lua_State *L); --- 315,319 ---- WXDLLIMPEXP_WXLUA bool LUACALL wxluaO_istrackedweakobject(lua_State *L, void *obj_ptr, int wxl_type, bool push_on_stack); // Get a wxArrayString of the info in the wxlua_lreg_weakobjects_key LUA_REGISTRYINDEX table. ! // Strings are of the form "&obj_ptr = wxLuaTypeName1(&udata, type=wxLuaType), ..." // If the object is casted to multiple types there will be wxLuaTypeName2(...) and so on. WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaO_gettrackedweakobjectinfo(lua_State *L); *************** *** 350,354 **** // Returns the index into the wxLua types table which is a new wxLua type. // Leaves the new table on the top of the stack. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_newmetatable(lua_State* L); // Set the metatable of the userdata at top of stack to the table stored in the // wxlua_lreg_types_key LUA_REGISTRYINDEX table. --- 350,359 ---- // Returns the index into the wxLua types table which is a new wxLua type. // Leaves the new table on the top of the stack. ! WXDLLIMPEXP_WXLUA int LUACALL wxluaT_newmetatable(lua_State* L, int wxl_type); ! // Get the metatable for the wxLua type stored in the ! // wxlua_lreg_types_key LUA_REGISTRYINDEX table. ! // Returns true if the type's metatable was found and is on the stack, nothing ! // is left on the stack on failure. ! WXDLLIMPEXP_WXLUA bool LUACALL wxluaT_getmetatable(lua_State* L, int wxl_type); // Set the metatable of the userdata at top of stack to the table stored in the // wxlua_lreg_types_key LUA_REGISTRYINDEX table. *************** *** 365,375 **** WXDLLIMPEXP_WXLUA int LUACALL wxluaT_type(lua_State* L, int stack_idx); - // Returns true if the wxLua type is for a wxLua binding type and not a - // generic WXLUA_TXXX type. This means that there is a metatable for this - // type in the wxlua_lreg_types_key of the LUA_REGISTRYINDEX table. - #define wxlua_iswxuserdatatype(wxl_type) ((wxl_type) > 0) - // Get a human readable name for the predefined WXLUA_TXXX or binding ! // g_wxluatype_XXX wxLua types stored in the wxlua_lreg_types_key // of the LUA_REGISTRYINDEX table. // This is the wxLua equivalent of lua_typename(L, luatype). --- 370,375 ---- WXDLLIMPEXP_WXLUA int LUACALL wxluaT_type(lua_State* L, int stack_idx); // Get a human readable name for the predefined WXLUA_TXXX or binding ! // wxluatype_XXX wxLua types stored in the wxlua_lreg_types_key // of the LUA_REGISTRYINDEX table. // This is the wxLua equivalent of lua_typename(L, luatype). *************** *** 654,658 **** // enum wxLuaState_Type is for the function // wxLuaState::Create(lua_State* L, int state_type = wxLUASTATE_GETSTATE); ! enum wxLuaState_Type { wxLUASTATE_GETSTATE = 1, // Attach to a previously created wxLuaState's --- 654,658 ---- // enum wxLuaState_Type is for the function // wxLuaState::Create(lua_State* L, int state_type = wxLUASTATE_GETSTATE); ! enum wxLuaState_Type { wxLUASTATE_GETSTATE = 1, // Attach to a previously created wxLuaState's *************** *** 666,671 **** wxLUASTATE_STATICSTATE = 0x10, // The lua_State is static and the wxLuaState // will not lua_close() it when Destroy()ed. ! wxLUASTATE_OPENBINDINGS = 0x20, // Install all the bindings in ! // wxLuaBinding::GetBindingList() into the // lua_State. }; --- 666,671 ---- wxLUASTATE_STATICSTATE = 0x10, // The lua_State is static and the wxLuaState // will not lua_close() it when Destroy()ed. ! wxLUASTATE_OPENBINDINGS = 0x20, // Install all the bindings in ! // wxLuaBinding::GetBindingList() into the // lua_State. }; *************** *** 677,681 **** { public: ! // Default constructor or if create=true then // call the function Create(wxEvtHandler=NULL, id=wxID_ANY). wxLuaState(bool create = false) { if (create) Create(); } --- 677,681 ---- { public: ! // Default constructor or if create=true then // call the function Create(wxEvtHandler=NULL, id=wxID_ANY). wxLuaState(bool create = false) { if (create) Create(); } *************** *** 755,768 **** // ----------------------------------------------------------------------- ! // In order for wxLua scripts to work from a C++ program's wxApp::OnInit() // and the Lua module you may have to set this variable to force the wxLua // code "wx.wxGetApp:MainLoop()" to not call wxApp::MainLoop(). ! // The issue is that within the function wxApp::OnInit() wxApp::IsMainLoopRunning() // returns false, but it will be running after OnInit() returns so we should // silently ignore the Lua code wanting to prematurely start the MainLoop. // Initialized to false, meaning not set. ! // Set to true for the Lua code "wx.wxGetApp:MainLoop()" to not call // the app's MainLoop() function. ! // // See the wxLua apps for usage. static bool sm_wxAppMainLoop_will_run; --- 755,768 ---- // ----------------------------------------------------------------------- ! // In order for wxLua scripts to work from a C++ program's wxApp::OnInit() // and the Lua module you may have to set this variable to force the wxLua // code "wx.wxGetApp:MainLoop()" to not call wxApp::MainLoop(). ! // The issue is that within the function wxApp::OnInit() wxApp::IsMainLoopRunning() // returns false, but it will be running after OnInit() returns so we should // silently ignore the Lua code wanting to prematurely start the MainLoop. // Initialized to false, meaning not set. ! // Set to true for the Lua code "wx.wxGetApp:MainLoop()" to not call // the app's MainLoop() function. ! // // See the wxLua apps for usage. static bool sm_wxAppMainLoop_will_run; *************** *** 810,819 **** // Sends a wxEVT_LUA_ERROR wxLuaEvent on error. // narg is the number of args to the function to call. ! // nresults is the number of values expected to be returned and Lua ! // will adjust the stack to match. // Use LUA_MULTRET for a variable number of returns. int LuaPCall(int narg, int nresults); ! // bool SendLuaErrorEvent(int status, int top); --- 810,819 ---- // Sends a wxEVT_LUA_ERROR wxLuaEvent on error. // narg is the number of args to the function to call. ! // nresults is the number of values expected to be returned and Lua ! // will adjust the stack to match. // Use LUA_MULTRET for a variable number of returns. int LuaPCall(int narg, int nresults); ! // bool SendLuaErrorEvent(int status, int top); *************** *** 974,978 **** bool wxluaR_GetRef(int wxlref_index, void* lightuserdata_reg_key); ! int wxluaT_NewMetatable(); bool wxluaT_SetMetatable(int wxl_type); int wxluaT_Type(int stack_idx) const; --- 974,978 ---- bool wxluaR_GetRef(int wxlref_index, void* lightuserdata_reg_key); ! int wxluaT_NewMetatable(int wxl_type); bool wxluaT_SetMetatable(int wxl_type); int wxluaT_Type(int stack_idx) const; Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlua_bind.h 22 Dec 2007 06:07:15 -0000 1.10 --- wxlua_bind.h 23 Jan 2008 06:43:38 -0000 1.11 *************** *** 17,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- // binding class ! class wxLuaBinding_wxlua : public wxLuaBinding { public: --- 17,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 22 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 22 // --------------------------------------------------------------------------- // binding class ! class WXDLLIMPEXP_WXLUA wxLuaBinding_wxlua : public wxLuaBinding { public: *************** *** 48,71 **** #include "wxlua/include/wxlstate.h" - - // --------------------------------------------------------------------------- - // Functions to access wxLuaBindXXX structs - // --------------------------------------------------------------------------- - - extern wxLuaBindClass *wxLuaGetClassList_wxlua(size_t &count); - extern wxLuaBindNumber *wxLuaGetDefineList_wxlua(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxlua(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxlua(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxlua(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxlua(size_t &count); - // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_wxLuaObject; extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaObject_methods[]; extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaObject_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_wxLuaState; extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaState_methods[]; extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaState_methodCount; --- 48,59 ---- #include "wxlua/include/wxlstate.h" // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaObject; extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaObject_methods[]; extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaObject_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaState; extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaState_methods[]; extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaState_methodCount; |
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9444/wxLua/samples Modified Files: auidemo.wx.lua bindings.wx.lua calculator.wx.lua choices.wx.lua controls.wx.lua coroutine.wx.lua dialog.wx.lua editor.wx.lua grid.wx.lua htmlwin.wx.lua luamodule.wx.lua mdi.wx.lua media.wx.lua minimal.wx.lua picker.wx.lua printing.wx.lua scribble.wx.lua settings.wx.lua sizer.wx.lua tree.wx.lua unittest.wx.lua validator.wx.lua veryminimal.wx.lua wxluasudoku.wx.lua Log Message: Add require("wx") and wx.wxGetApp():MainLoop() to the samples so they work with the wxLua module. Index: validator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/validator.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** validator.wx.lua 22 Jul 2007 04:38:31 -0000 1.5 --- validator.wx.lua 22 Jan 2008 04:45:39 -0000 1.6 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- NOTES about validators! -- The controls apparently must be in a wxDialog and they must also *************** *** 185,186 **** --- 189,196 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** dialog.wx.lua 22 Jul 2007 04:38:30 -0000 1.14 --- dialog.wx.lua 22 Jan 2008 04:45:39 -0000 1.15 *************** *** 9,12 **** --- 9,16 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- IDs of the controls in the dialog ID_CELSIUS_BUTTON = 1 -- NOTE: We use the fact that the textctrl ids *************** *** 205,206 **** --- 209,216 ---- -- Show the dialog dialog:Show(true) + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** unittest.wx.lua 22 Dec 2007 06:07:17 -0000 1.20 --- unittest.wx.lua 22 Jan 2008 04:45:39 -0000 1.21 *************** *** 11,14 **** --- 11,18 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + tests_run = 0 failed_tests = 0 *************** *** 351,352 **** --- 355,362 ---- print("Tests that failed : "..tostring(failed_tests)) print("Warnings : "..tostring(warnings).."\n") + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + --wx.wxGetApp():MainLoop() Index: printing.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** printing.wx.lua 16 Jul 2007 19:35:31 -0000 1.17 --- printing.wx.lua 22 Jan 2008 04:45:39 -0000 1.18 *************** *** 11,14 **** --- 11,18 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + local ID_PRINT = wx.wxID_HIGHEST + 1 local ID_PRINTPREVIEW = wx.wxID_HIGHEST + 2 *************** *** 289,290 **** --- 293,300 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** scribble.wx.lua 4 Jan 2008 05:36:07 -0000 1.24 --- scribble.wx.lua 22 Jan 2008 04:45:39 -0000 1.25 *************** *** 11,14 **** --- 11,18 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil -- the main wxFrame scrollwin = nil -- the child of the frame *************** *** 694,695 **** --- 698,705 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** bindings.wx.lua 17 Jan 2008 05:32:05 -0000 1.20 --- bindings.wx.lua 22 Jan 2008 04:45:39 -0000 1.21 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- ---------------------------------------------------------------------------- -- ---------------------------------------------------------------------------- *************** *** 1318,1319 **** --- 1322,1329 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** choices.wx.lua 5 Jun 2007 21:07:26 -0000 1.12 --- choices.wx.lua 22 Jan 2008 04:45:39 -0000 1.13 *************** *** 8,11 **** --- 8,15 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil *************** *** 58,63 **** wx.wxDefaultPosition, wx.wxDefaultSize, choices) ! -- Test the binding generator to properly overload ! -- wxComboBox::SetSelection(int from, int to) (to mark text) and -- wxControlWithItems::SetSelection(int sel) comboBox:SetSelection(2) --- 62,67 ---- wx.wxDefaultPosition, wx.wxDefaultSize, choices) ! -- Test the binding generator to properly overload ! -- wxComboBox::SetSelection(int from, int to) (to mark text) and -- wxControlWithItems::SetSelection(int sel) comboBox:SetSelection(2) *************** *** 107,108 **** --- 111,118 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: minimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/minimal.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** minimal.wx.lua 16 Jul 2007 19:35:31 -0000 1.10 --- minimal.wx.lua 22 Jan 2008 04:45:39 -0000 1.11 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil *************** *** 85,86 **** --- 89,96 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tree.wx.lua 16 Jul 2007 19:35:32 -0000 1.11 --- tree.wx.lua 22 Jan 2008 04:45:39 -0000 1.12 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- create a nice string using the wxTreeItemId and our table of "data" function CreateLogString(treeitem_id) *************** *** 124,127 **** main() ! ! --- 128,134 ---- main() ! -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, ! -- otherwise the wxLua program will exit immediately. ! -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the ! -- MainLoop is already running or will be started by the C++ program. ! wx.wxGetApp():MainLoop() Index: coroutine.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/coroutine.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** coroutine.wx.lua 16 Jul 2007 19:35:31 -0000 1.7 --- coroutine.wx.lua 22 Jan 2008 04:45:39 -0000 1.8 *************** *** 8,11 **** --- 8,15 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + ------------------------------------------------------------------------------- -- ProgressWindow *************** *** 149,150 **** --- 153,160 ---- -- Show the main frame frame:Show(true) + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: media.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/media.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** media.wx.lua 16 Jul 2007 19:35:31 -0000 1.3 --- media.wx.lua 22 Jan 2008 04:45:39 -0000 1.4 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil -- main wxFrame mediaCtrl = nil -- wxMediaCtrl player *************** *** 300,301 **** --- 304,311 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: picker.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/picker.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** picker.wx.lua 16 Jul 2007 19:35:31 -0000 1.2 --- picker.wx.lua 22 Jan 2008 04:45:39 -0000 1.3 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil textCtrl = nil *************** *** 385,386 **** --- 389,396 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: sizer.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/sizer.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sizer.wx.lua 31 May 2007 17:18:56 -0000 1.7 --- sizer.wx.lua 22 Jan 2008 04:45:39 -0000 1.8 *************** *** 9,12 **** --- 9,16 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua sizer test frame") *************** *** 33,34 **** --- 37,44 ---- wx.wxGetApp():SetTopWindow(frame) frame:Show(true) + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** wxluasudoku.wx.lua 5 Dec 2007 05:54:11 -0000 1.76 --- wxluasudoku.wx.lua 22 Jan 2008 04:45:39 -0000 1.77 *************** *** 8,11 **** --- 8,15 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- Coding notes: -- All non gui sudoku functions are in the "sudoku" table and all gui related *************** *** 5200,5201 **** --- 5204,5211 ---- end ]] + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** htmlwin.wx.lua 16 Jul 2007 19:35:31 -0000 1.14 --- htmlwin.wx.lua 22 Jan 2008 04:45:39 -0000 1.15 *************** *** 8,11 **** --- 8,15 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil -- the main frame of the program html = nil -- the wxLuaHtmlWindow child of the frame (subclassed wxHtmlWindow) *************** *** 162,163 **** --- 166,173 ---- wx.wxGetApp().TopWindow = frame frame:Show(true) + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** editor.wx.lua 16 Jul 2007 19:35:31 -0000 1.56 --- editor.wx.lua 22 Jan 2008 04:45:39 -0000 1.57 *************** *** 8,11 **** --- 8,15 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- Equivalent to C's "cond ? a : b", all terms will be evaluated function iff(cond, a, b) if cond then return a else return b end end *************** *** 2371,2372 **** --- 2375,2382 ---- --frame:SetIcon(wxLuaEditorIcon) --FIXME add this back frame:Show(true) + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: settings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/settings.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** settings.wx.lua 16 Jul 2007 19:35:32 -0000 1.4 --- settings.wx.lua 22 Jan 2008 04:45:39 -0000 1.5 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil listCtrl = nil *************** *** 295,296 **** --- 299,306 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** controls.wx.lua 8 Jan 2008 00:55:36 -0000 1.15 --- controls.wx.lua 22 Jan 2008 04:45:39 -0000 1.16 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil textCtrl = nil *************** *** 1108,1109 **** --- 1112,1119 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mdi.wx.lua 16 Jul 2007 19:35:31 -0000 1.14 --- mdi.wx.lua 22 Jan 2008 04:45:39 -0000 1.15 *************** *** 9,12 **** --- 9,17 ---- -- Licence: wxWidgets licence ----------------------------------------------------------------------------- + + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil childList = {} *************** *** 73,74 **** --- 78,84 ---- frame:Show(true) + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: veryminimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/veryminimal.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** veryminimal.wx.lua 31 May 2007 17:18:56 -0000 1.6 --- veryminimal.wx.lua 22 Jan 2008 04:45:39 -0000 1.7 *************** *** 10,13 **** --- 10,17 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + frame = nil *************** *** 24,25 **** --- 28,35 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: auidemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/auidemo.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** auidemo.wx.lua 22 Dec 2007 06:07:17 -0000 1.2 --- auidemo.wx.lua 22 Jan 2008 04:45:39 -0000 1.3 *************** *** 12,15 **** --- 12,18 ---- --]] + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") --/* XPM */ *************** *** 1626,1627 **** --- 1629,1635 ---- + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: grid.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/grid.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** grid.wx.lua 16 Jul 2007 19:35:31 -0000 1.10 --- grid.wx.lua 22 Jan 2008 04:45:39 -0000 1.11 *************** *** 8,11 **** --- 8,14 ---- ----------------------------------------------------------------------------- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") local frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua wxGrid Sample", *************** *** 55,56 **** --- 58,64 ---- frame:Show(true) + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** luamodule.wx.lua 4 Jul 2007 05:39:22 -0000 1.6 --- luamodule.wx.lua 22 Jan 2008 04:45:39 -0000 1.7 *************** *** 36,41 **** frame:Show(true) ! -- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active ! -- otherwise the lua program will exit immediately wx.wxGetApp():MainLoop() --- 36,43 ---- frame:Show(true) ! -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, ! -- otherwise the wxLua program will exit immediately. ! -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the ! -- MainLoop is already running or will be started by the C++ program. wx.wxGetApp():MainLoop() Index: calculator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/calculator.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** calculator.wx.lua 16 Jul 2007 19:35:31 -0000 1.11 --- calculator.wx.lua 22 Jan 2008 04:45:39 -0000 1.12 *************** *** 10,13 **** --- 10,17 ---- -------------------------------------------------------------------------=--- + -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit + package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" + require("wx") + -- --------------------------------------------------------------------------- -- Global variables *************** *** 351,352 **** --- 355,362 ---- main() + + -- Call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop, + -- otherwise the wxLua program will exit immediately. + -- Does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit since the + -- MainLoop is already running or will be started by the C++ program. + wx.wxGetApp():MainLoop() |
|
From: John L. <jr...@us...> - 2008-01-22 04:45:42
|
Update of /cvsroot/wxlua/wxLua/samples/image In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9444/wxLua/samples/image Modified Files: image.wx.lua Log Message: Add require("wx") and wx.wxGetApp():MainLoop() to the samples so they work with the wxLua module. Index: image.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/image/image.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** image.wx.lua 22 Jan 2008 04:03:33 -0000 1.2 --- image.wx.lua 22 Jan 2008 04:45:39 -0000 1.3 *************** *** 12,26 **** --]] ! ! --[[ ! win32: ! lua5.1.exe -e "package.cpath = './?.dll'" ./image.wx.lua ! ! linux: ! export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ! lua5.1 -e "package.cpath = './?.so'" ./image.wx.lua ! ! --wx = require("ds287u") ! --]] --- 12,18 ---- --]] ! -- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit ! package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" ! wx = require("wx") |
|
From: John L. <jr...@us...> - 2008-01-22 04:04:30
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25573/wxLua/bindings/wxwidgets Modified Files: wxcore_appframe.i wxcore_gdi.i wxcore_override.hpp Log Message: Add new wxBitmap constructor for XBMs using a table. Do not run wxApp::MainLoop() if it is already running. Index: wxcore_gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_gdi.i 22 Dec 2007 06:07:08 -0000 1.3 --- wxcore_gdi.i 22 Jan 2008 04:04:24 -0000 1.4 *************** *** 896,902 **** --- 896,907 ---- wxBitmap(const wxImage &image, int depth = -1) + // %override wxBitmap(lua string, int width, int height, int depth) // C++ Func: wxBitmap(const char bits[], int width, int height, int depth = 1) // Creates a bitmap from an array of bits in the form of a Lua string. %override_name wxLua_wxBitmapFromBits_constructor wxBitmap(const char* mono_bits, int width, int height, int depth /* = 1 */); + // %override wxBitmap(LuaTable charTable, int width, int height, int depth) + // C++ Func: wxBitmap(const char bits[], int width, int height, int depth = 1) + // Creates a bitmap from an array of chars in a Lua table. + %override_name wxLua_wxBitmapFromBitTable_constructor wxBitmap(LuaTable charTable, int width, int height, int depth /* = 1 */); // %override wxBitmap(LuaTable stringTable where each index is a row in the image) Index: wxcore_appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_appframe.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_appframe.i 20 Jan 2008 19:23:00 -0000 1.4 --- wxcore_appframe.i 22 Jan 2008 04:04:24 -0000 1.5 *************** *** 43,48 **** // bool Initialized() obsolete in wxWidgets ! // %override int wxApp::MainLoop() : Only calls it if !wxLuaState::sm_wxAppMainLoop_will_run, returns 0 if it is true. // C++ Func: int MainLoop() int MainLoop() --- 43,49 ---- // bool Initialized() obsolete in wxWidgets ! // %override int wxApp::MainLoop() // C++ Func: int MainLoop() + // Only calls it if (!IsMainLoopRuinning() && !wxLuaState::sm_wxAppMainLoop_will_run), returns 0 if not called. int MainLoop() Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxcore_override.hpp 20 Jan 2008 19:23:00 -0000 1.17 --- wxcore_override.hpp 22 Jan 2008 04:04:24 -0000 1.18 *************** *** 31,35 **** int returns = 0; ! if (!wxLuaState::sm_wxAppMainLoop_will_run) returns = self->MainLoop(); --- 31,35 ---- int returns = 0; ! if (!wxLuaState::sm_wxAppMainLoop_will_run && !wxApp::IsMainLoopRunning()) returns = self->MainLoop(); *************** *** 1483,1486 **** --- 1483,1533 ---- %end + %override wxLua_wxBitmapFromBitTable_constructor + // %win wxBitmap(LuaTable charTable, int width, int height, int depth = -1) + static int LUACALL wxLua_wxBitmapFromBitTable_constructor(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // int depth = -1 + int depth = (argCount >= 4 ? (int)wxlua_getintegertype(L, 4) : -1); + // int height + int height = (int)wxlua_getintegertype(L, 3); + // int width + int width = (int)wxlua_getintegertype(L, 2); + + if (!wxlua_iswxluatype(lua_type(L, 1), WXLUA_TTABLE)) + wxlua_argerror(L, 1, wxT("a 'table'")); + + // const char* bits + int size = height*width/8; + char *bits = (char*)malloc(size); + + for (int n = 0; n < size; ++n) + { + lua_rawgeti(L, 1, n+1); // Lua array starts at 1 + + if (!wxlua_iswxluatype(lua_type(L, -1), WXLUA_TINTEGER)) + { + free(bits); + wxlua_argerror(L, 1, wxT("a 'table of chars of size width*height/8'")); + } + + bits[n] = (char)lua_tonumber(L, -1); + lua_pop(L, 1); + } + + // call constructor + wxBitmap *returns = new wxBitmap(bits, width, height, depth); + free(bits); + + // add to tracked memory list + wxluaO_addgcobject(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxBitmap); + // return the number of parameters + return 1; + } + %end + %override wxLua_wxBitmapFromData_constructor // %win wxBitmap(void* data, int type, int width, int height, int depth = -1) |
|
From: John L. <jr...@us...> - 2008-01-22 04:04:30
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25573/wxLua/modules/wxbind/src Modified Files: wxcore_appframe.cpp wxcore_gdi.cpp Log Message: Add new wxBitmap constructor for XBMs using a table. Do not run wxApp::MainLoop() if it is already running. Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_gdi.cpp 22 Dec 2007 06:07:13 -0000 1.13 --- wxcore_gdi.cpp 22 Jan 2008 04:04:24 -0000 1.14 *************** *** 7776,7783 **** #if (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! #define wxLua_wxBitmap_constructor7 wxLua_wxBitmapFromData_constructor ! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor7[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; ! static int LUACALL wxLua_wxBitmap_constructor7(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor7[1] = {{ wxLua_wxBitmap_constructor7, WXLUAMETHOD_CONSTRUCTOR, 5, 5, s_wxluatypeArray_wxLua_wxBitmap_constructor7 }}; // %override wxLua_wxBitmapFromData_constructor // %win wxBitmap(void* data, int type, int width, int height, int depth = -1) --- 7776,7783 ---- #if (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! #define wxLua_wxBitmap_constructor8 wxLua_wxBitmapFromData_constructor ! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor8[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; ! static int LUACALL wxLua_wxBitmap_constructor8(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor8[1] = {{ wxLua_wxBitmap_constructor8, WXLUAMETHOD_CONSTRUCTOR, 5, 5, s_wxluatypeArray_wxLua_wxBitmap_constructor8 }}; // %override wxLua_wxBitmapFromData_constructor // %win wxBitmap(void* data, int type, int width, int height, int depth = -1) *************** *** 7811,7818 **** #endif // (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! #define wxLua_wxBitmap_constructor6 wxLua_wxBitmapFromXPMData_constructor ! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor6[] = { &g_wxluatype_TTABLE, NULL }; ! static int LUACALL wxLua_wxBitmap_constructor6(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor6[1] = {{ wxLua_wxBitmap_constructor6, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxBitmap_constructor6 }}; // %override wxLua_wxBitmapFromXPMData_constructor // %constructor wxXmlResourceGetDefault() --- 7811,7818 ---- #endif // (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! #define wxLua_wxBitmap_constructor7 wxLua_wxBitmapFromXPMData_constructor ! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor7[] = { &g_wxluatype_TTABLE, NULL }; ! static int LUACALL wxLua_wxBitmap_constructor7(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor7[1] = {{ wxLua_wxBitmap_constructor7, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxBitmap_constructor7 }}; // %override wxLua_wxBitmapFromXPMData_constructor // %constructor wxXmlResourceGetDefault() *************** *** 7839,7842 **** --- 7839,7893 ---- + #define wxLua_wxBitmap_constructor6 wxLua_wxBitmapFromBitTable_constructor + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor6[] = { &g_wxluatype_TTABLE, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxBitmap_constructor6(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor6[1] = {{ wxLua_wxBitmap_constructor6, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxBitmap_constructor6 }}; + // %override wxLua_wxBitmapFromBitTable_constructor + // %win wxBitmap(LuaTable charTable, int width, int height, int depth = -1) + static int LUACALL wxLua_wxBitmapFromBitTable_constructor(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // int depth = -1 + int depth = (argCount >= 4 ? (int)wxlua_getintegertype(L, 4) : -1); + // int height + int height = (int)wxlua_getintegertype(L, 3); + // int width + int width = (int)wxlua_getintegertype(L, 2); + + if (!wxlua_iswxluatype(lua_type(L, 1), WXLUA_TTABLE)) + wxlua_argerror(L, 1, wxT("a 'table'")); + + // const char* bits + int size = height*width/8; + char *bits = (char*)malloc(size); + + for (int n = 0; n < size; ++n) + { + lua_rawgeti(L, 1, n+1); // Lua array starts at 1 + + if (!wxlua_iswxluatype(lua_type(L, -1), WXLUA_TINTEGER)) + { + free(bits); + wxlua_argerror(L, 1, wxT("a 'table of chars of size width*height/8'")); + } + + bits[n] = (char)lua_tonumber(L, -1); + lua_pop(L, 1); + } + + // call constructor + wxBitmap *returns = new wxBitmap(bits, width, height, depth); + free(bits); + + // add to tracked memory list + wxluaO_addgcobject(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxBitmap); + // return the number of parameters + return 1; + } + + #define wxLua_wxBitmap_constructor5 wxLua_wxBitmapFromBits_constructor static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_constructor5[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; *************** *** 7982,7988 **** #if (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! { wxLua_wxBitmap_constructor7, WXLUAMETHOD_CONSTRUCTOR, 5, 5, s_wxluatypeArray_wxLua_wxBitmap_constructor7 }, #endif // (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! { wxLua_wxBitmap_constructor6, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxBitmap_constructor6 }, { wxLua_wxBitmap_constructor5, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxBitmap_constructor5 }, --- 8033,8040 ---- #if (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! { wxLua_wxBitmap_constructor8, WXLUAMETHOD_CONSTRUCTOR, 5, 5, s_wxluatypeArray_wxLua_wxBitmap_constructor8 }, #endif // (wxLUA_USE_wxBitmap) && ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) ! { wxLua_wxBitmap_constructor7, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxBitmap_constructor7 }, ! { wxLua_wxBitmap_constructor6, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxBitmap_constructor6 }, { wxLua_wxBitmap_constructor5, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxBitmap_constructor5 }, Index: wxcore_appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_appframe.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxcore_appframe.cpp 20 Jan 2008 19:23:01 -0000 1.9 --- wxcore_appframe.cpp 22 Jan 2008 04:04:24 -0000 1.10 *************** *** 199,203 **** int returns = 0; ! if (!wxLuaState::sm_wxAppMainLoop_will_run) returns = self->MainLoop(); --- 199,203 ---- int returns = 0; ! if (!wxLuaState::sm_wxAppMainLoop_will_run && !wxApp::IsMainLoopRunning()) returns = self->MainLoop(); |
|
From: John L. <jr...@us...> - 2008-01-22 04:03:39
|
Update of /cvsroot/wxlua/wxLua/samples/image In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25550/image Modified Files: image.wx.lua Log Message: Fix loading the images, use new wxBitmap constructor for XBMs Index: image.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/image/image.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** image.wx.lua 21 Jan 2008 00:47:10 -0000 1.1 --- image.wx.lua 22 Jan 2008 04:03:33 -0000 1.2 *************** *** 15,19 **** --[[ win32: ! lua5.1.exe -e "package.cpath = './?.dll'" ./image.wx.lua linux: --- 15,19 ---- --[[ win32: ! lua5.1.exe -e "package.cpath = './?.dll'" ./image.wx.lua linux: *************** *** 21,25 **** lua5.1 -e "package.cpath = './?.so'" ./image.wx.lua ! --wx = require("ds287u") --]] --- 21,25 ---- lua5.1 -e "package.cpath = './?.so'" ./image.wx.lua ! --wx = require("ds287u") --]] *************** *** 59,66 **** local C = string.char for i = 1, #smile_bits do ! smile_bits[i] = C(smile_bits[i]) -- turn into ASCII chars end ! smile_bits = table.concat(smile_bits) -- turn into a string --- 59,67 ---- local C = string.char + smile_bits_str = {} for i = 1, #smile_bits do ! smile_bits_str[i] = C(smile_bits[i]) -- turn into ASCII chars end ! smile_bits_str = table.concat(smile_bits_str) -- turn into a string *************** *** 105,109 **** " ..... ", " ", ! " "} local _T = function(s) return s end --- 106,110 ---- " ..... ", " ", ! " "} local _T = function(s) return s end *************** *** 113,117 **** local dc = wx.wxPaintDC(T) T:PrepareDC( dc ) ! dc:DrawText( _T("Loaded image"), 30, 10 ) if (T.my_square:Ok()) then --- 114,118 ---- local dc = wx.wxPaintDC(T) T:PrepareDC( dc ) ! dc:DrawText( _T("Loaded image"), 30, 10 ) if (T.my_square:Ok()) then *************** *** 173,187 **** if (T.my_horse_bmp2:Ok()) then dc:DrawBitmap( T.my_horse_bmp2, 280, 1070, false ) ! end dc:DrawText( _T("PNM handler"), 30, 1285 ) if (T.my_horse_pnm:Ok()) then dc:DrawBitmap( T.my_horse_pnm, 30, 1300, false ) ! end dc:DrawText( _T("PNM handler (ascii grey)"), 280, 1285 ) if (T.my_horse_asciigrey_pnm:Ok()) then dc:DrawBitmap( T.my_horse_asciigrey_pnm, 280, 1300, false ) ! end dc:DrawText( _T("PNM handler (raw grey)"), 530, 1285 ) --- 174,188 ---- if (T.my_horse_bmp2:Ok()) then dc:DrawBitmap( T.my_horse_bmp2, 280, 1070, false ) ! end dc:DrawText( _T("PNM handler"), 30, 1285 ) if (T.my_horse_pnm:Ok()) then dc:DrawBitmap( T.my_horse_pnm, 30, 1300, false ) ! end dc:DrawText( _T("PNM handler (ascii grey)"), 280, 1285 ) if (T.my_horse_asciigrey_pnm:Ok()) then dc:DrawBitmap( T.my_horse_asciigrey_pnm, 280, 1300, false ) ! end dc:DrawText( _T("PNM handler (raw grey)"), 530, 1285 ) *************** *** 207,211 **** --// toucans ! do local x,y,yy = 750,10,170 --- 208,212 ---- --// toucans ! if T.my_toucan:Ok() then local x,y,yy = 750,10,170 *************** *** 404,416 **** --/* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ if USE_QUITE_SLOW then ! local orig_data = original:GetData() -- get the data as a RGBRGB.. string local w = original:GetWidth() ! for y = 1, 149-1 do for x = 1, 149-1 do ! local red, green, blue = 0, 0, 0 ! if false then red = original:GetRed( x*2, y*2 ) + --- 405,417 ---- --/* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ if USE_QUITE_SLOW then ! local orig_data = original:GetData() -- get the data as a RGBRGB.. string local w = original:GetWidth() ! for y = 1, 149-1 do for x = 1, 149-1 do ! local red, green, blue = 0, 0, 0 ! if false then red = original:GetRed( x*2, y*2 ) + *************** *** 425,429 **** original:GetGreen( x*2+1, y*2+1 ) green = green/4 ! blue = original:GetBlue( x*2, y*2 ) + original:GetBlue( x*2-1, y*2 ) + --- 426,430 ---- original:GetGreen( x*2+1, y*2+1 ) green = green/4 ! blue = original:GetBlue( x*2, y*2 ) + original:GetBlue( x*2-1, y*2 ) + *************** *** 436,440 **** local i3 = ((x*2 ) + (y*2+1)*w)*3 + 1 local i4 = ((x*2+1) + (y*2+1)*w)*3 + 1 ! red = string.byte(orig_data, i1 ) + string.byte(orig_data, i2 ) + --- 437,441 ---- local i3 = ((x*2 ) + (y*2+1)*w)*3 + 1 local i4 = ((x*2+1) + (y*2+1)*w)*3 + 1 ! red = string.byte(orig_data, i1 ) + string.byte(orig_data, i2 ) + *************** *** 454,467 **** blue = blue/4 end ! anti:SetRGB( x, y, red, green, blue ) ! end ! end end T.my_anti = wx.wxBitmap(anti) ! original:delete() anti:delete() ! dc:delete() bitmap:delete() --- 455,468 ---- blue = blue/4 end ! anti:SetRGB( x, y, red, green, blue ) ! end ! end end T.my_anti = wx.wxBitmap(anti) ! original:delete() anti:delete() ! dc:delete() bitmap:delete() *************** *** 501,510 **** this.my_toucan_scaled_high = wx.wxNullBitmap this.my_toucan_blur = wx.wxNullBitmap ! this.m_bmpSmileXpm = wx.wxBitmap(smile_xpm) --this.m_iconSmileXpm = wx.wxIcon(smile_xpm) ! this.m_iconSmileXpm = wx.wxIcon() this.m_iconSmileXpm:CopyFromBitmap(this.m_bmpSmileXpm) ! this.my_horse_ani = {} this.m_ani_images = 0 --- 502,511 ---- this.my_toucan_scaled_high = wx.wxNullBitmap this.my_toucan_blur = wx.wxNullBitmap ! this.m_bmpSmileXpm = wx.wxBitmap(smile_xpm) --this.m_iconSmileXpm = wx.wxIcon(smile_xpm) ! this.m_iconSmileXpm = wx.wxIcon() this.m_iconSmileXpm:CopyFromBitmap(this.m_bmpSmileXpm) ! this.my_horse_ani = {} this.m_ani_images = 0 *************** *** 514,518 **** this.OnPaint = OnPaint this.CreateAntiAliasedBitmap = CreateAntiAliasedBitmap ! this:SetBackgroundColour(wx.wxWHITE) --- 515,519 ---- this.OnPaint = OnPaint this.CreateAntiAliasedBitmap = CreateAntiAliasedBitmap ! this:SetBackgroundColour(wx.wxWHITE) *************** *** 531,541 **** --// try to find the directory with our images local dir ! if ( wx.wxFile.Exists("./horse.png") ) then ! dir = "./" ! elseif ( wx.wxFile.Exists("../horse.png") ) then ! dir = "../" ! --hd... ! elseif ( wx.wxFile.Exists("./samples/wximage/horse.png") ) then ! dir = "./samples/wximage/" else --wx.wxLogWarning("Can't find image files in either '.' or '..'!") --- 532,545 ---- --// try to find the directory with our images local dir ! if ( wx.wxFile.Exists("horse.png") ) then ! dir = "" ! elseif ( wx.wxFile.Exists("./image/horse.png") ) then ! dir = "./image/" ! elseif ( wx.wxFile.Exists("./samples/image/horse.png") ) then ! dir = "./samples/image/" ! elseif ( wx.wxFile.Exists("../samples/image/horse.png") ) then ! dir = "../samples/image/" ! elseif ( wx.wxFile.Exists("../../samples/image/horse.png") ) then ! dir = "../../samples/image/" else --wx.wxLogWarning("Can't find image files in either '.' or '..'!") *************** *** 548,557 **** return this end ! ! if ( not wx.wxFile.Exists(dir.."./horse.png") ) then dir = nil end end ! local image = bitmap:ConvertToImage() --- 552,563 ---- return this end ! ! dir = dir.."/" ! ! if ( not wx.wxFile.Exists(dir.."horse.png") ) then dir = nil end end ! local image = bitmap:ConvertToImage() *************** *** 708,711 **** --- 714,719 ---- this:CreateAntiAliasedBitmap() + this.my_smile_xbm = wx.wxBitmap( smile_bits_str, smile_width, + smile_height, 1 ) this.my_smile_xbm = wx.wxBitmap( smile_bits, smile_width, smile_height, 1 ) *************** *** 747,752 **** else this.my_horse_cur = wx.wxBitmap( image ) ! this.xH = 30 + image:GetOptionInt(wx.wxIMAGE_OPTION_CUR_HOTSPOT_X) ! this.yH = 2420 + image:GetOptionInt(wx.wxIMAGE_OPTION_CUR_HOTSPOT_Y) end --- 755,760 ---- else this.my_horse_cur = wx.wxBitmap( image ) ! this.xH = 30 + image:GetOptionInt(wx.wxIMAGE_OPTION_CUR_HOTSPOT_X) ! this.yH = 2420 + image:GetOptionInt(wx.wxIMAGE_OPTION_CUR_HOTSPOT_Y) end *************** *** 776,780 **** local len = file:Length() local dataSize = len ! local read_count, data = file:Read(dataSize) if ( read_count ~= len ) then --- 784,788 ---- local len = file:Length() local dataSize = len ! local read_count, data = file:Read(dataSize) if ( read_count ~= len ) then *************** *** 792,796 **** this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) ! return this end --- 800,804 ---- this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) ! return this end *************** *** 837,841 **** local saved = false if ( extension == "bmp" ) then ! local bppvalues = { wx.wxBMP_1BPP, --- 845,849 ---- local saved = false if ( extension == "bmp" ) then ! local bppvalues = { wx.wxBMP_1BPP, *************** *** 937,947 **** this.OnPaint = OnPaint this.OnSave = OnSave ! ! this:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) --// do nothing here to be able to see how transparent images are shown end ) ! this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) this:Connect(wx.wxEVT_LEFT_DCLICK, function(event) this:OnSave(event) end) ! this:SetClientSize(bitmap:GetWidth(), bitmap:GetHeight()) return this --- 945,955 ---- this.OnPaint = OnPaint this.OnSave = OnSave ! ! this:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) --// do nothing here to be able to see how transparent images are shown end ) ! this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) this:Connect(wx.wxEVT_LEFT_DCLICK, function(event) this:OnSave(event) end) ! this:SetClientSize(bitmap:GetWidth(), bitmap:GetHeight()) return this *************** *** 955,959 **** --// MyRawBitmapFrame ------------------------------------------------------- ! if wx.wxHAVE_RAW_BITMAP then local wx = wx --- 963,967 ---- --// MyRawBitmapFrame ------------------------------------------------------- ! if wx.wxHAVE_RAW_BITMAP then local wx = wx *************** *** 1074,1078 **** this.OnPaint = OnPaint this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) ! this:SetClientSize(SIZE, SIZE*2+25) this:InitAlphaBitmap() --- 1082,1086 ---- this.OnPaint = OnPaint this:Connect(wx.wxEVT_PAINT, function(event) this:OnPaint(event) end) ! this:SetClientSize(SIZE, SIZE*2+25) this:InitAlphaBitmap() *************** *** 1097,1101 **** local MyCanvas = require"MyCanvas" local MyImageFrame = require"MyImageFrame" ! if wx.wxHAVE_RAW_BITMAP then local MyRawBitmapFrame = require"MyRawBitmapFrame" end --- 1105,1109 ---- local MyCanvas = require"MyCanvas" local MyImageFrame = require"MyImageFrame" ! if wx.wxHAVE_RAW_BITMAP then local MyRawBitmapFrame = require"MyRawBitmapFrame" end *************** *** 1142,1150 **** local dobjBmp = wx.wxBitmapDataObject() dobjBmp:SetBitmap(T.m_canvas.my_horse_png) ! local clipboard = wx.wxClipboard.Get() ! if not clipboard then wx.wxLogError("Failed to open clipboard") ! return end clipboard:Open() --- 1150,1158 ---- local dobjBmp = wx.wxBitmapDataObject() dobjBmp:SetBitmap(T.m_canvas.my_horse_png) ! local clipboard = wx.wxClipboard.Get() ! if not clipboard then wx.wxLogError("Failed to open clipboard") ! return end clipboard:Open() *************** *** 1179,1183 **** local this = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxImage sample", wx.wxPoint(20, 20), wx.wxSize(950, 700)) ! this.OnAbout = OnAbout this.OnQuit = OnQuit --- 1187,1191 ---- local this = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxImage sample", wx.wxPoint(20, 20), wx.wxSize(950, 700)) ! this.OnAbout = OnAbout this.OnQuit = OnQuit *************** *** 1190,1194 **** this.OnPaste = OnPaste --end --// wx.wxUSE_CLIPBOARD ! this:Connect(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function(event) this:OnAbout(event) end) this:Connect(ID_QUIT, wx.wxEVT_COMMAND_MENU_SELECTED, function(event) this:OnQuit(event) end) --- 1198,1202 ---- this.OnPaste = OnPaste --end --// wx.wxUSE_CLIPBOARD ! this:Connect(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function(event) this:OnAbout(event) end) this:Connect(ID_QUIT, wx.wxEVT_COMMAND_MENU_SELECTED, function(event) this:OnQuit(event) end) *************** *** 1235,1239 **** --// 500 width * 2750 height this.m_canvas:SetScrollbars( 10, 10, 50, 275 ) ! return this end --- 1243,1247 ---- --// 500 width * 2750 height this.m_canvas:SetScrollbars( 10, 10, 50, 275 ) ! return this end |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/modules/build/msvc6 Modified Files: modules_mod_luamodule_mono.dsp Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: modules_mod_luamodule_mono.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_luamodule_mono.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_luamodule_mono.dsp 21 Jan 2008 04:50:03 -0000 1.6 --- modules_mod_luamodule_mono.dsp 21 Jan 2008 05:08:40 -0000 1.7 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Monolithic" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Monolithic" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Multilib" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Multilib" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Monolithic" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Monolithic" *************** *** 208,213 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Multilib" --- 208,213 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Multilib" *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" ! # ADD LINK32 lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ENDIF |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** makefile.vc 21 Jan 2008 04:50:04 -0000 1.86 --- makefile.vc 21 Jan 2008 05:08:40 -0000 1.87 *************** *** 1778,1782 **** ..\..\..\lib\vc_$(VAR_210)\wx.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(MOD_LUAMODULE_MONO_OBJECTS) lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 1778,1782 ---- ..\..\..\lib\vc_$(VAR_210)\wx.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(MOD_LUAMODULE_MONO_OBJECTS) lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** makefile.bcc 21 Jan 2008 04:50:04 -0000 1.87 --- makefile.bcc 21 Jan 2008 05:08:40 -0000 1.88 *************** *** 1647,1651 **** ..\..\..\lib\bcc_$(VAR_146)\wx.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,, | !endif --- 1647,1651 ---- ..\..\..\lib\bcc_$(VAR_146)\wx.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** makefile.wat 21 Jan 2008 04:50:05 -0000 1.86 --- makefile.wat 21 Jan 2008 05:08:40 -0000 1.87 *************** *** 1904,1908 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_140) libpath ..\..\..\lib\wat_$(VAR_141) libpath $(LUA_LIB_DIR) @for %i in ($(MOD_LUAMODULE_MONO_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc file %i ! @for %i in ( lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc system nt_dll --- 1904,1908 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_140) libpath ..\..\..\lib\wat_$(VAR_141) libpath $(LUA_LIB_DIR) @for %i in ($(MOD_LUAMODULE_MONO_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc file %i ! @for %i in ( lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono.lbc system nt_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** makefile.gcc 21 Jan 2008 04:50:04 -0000 1.86 --- makefile.gcc 21 Jan 2008 05:08:40 -0000 1.87 *************** *** 1620,1624 **** ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_146)\wx.dll: make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ! $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(MOD_LUAMODULE_MONO_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_140) -L$(LUA_LIB_DIR) -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 1620,1624 ---- ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_146)\wx.dll: make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ! $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(MOD_LUAMODULE_MONO_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_140) -L$(LUA_LIB_DIR) -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule_mono.vcproj Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: modules_mod_luamodule_mono.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule_mono.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_luamodule_mono.vcproj 21 Jan 2008 04:50:03 -0000 1.6 --- modules_mod_luamodule_mono.vcproj 21 Jan 2008 05:08:40 -0000 1.7 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 172,176 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 172,176 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 260,264 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 260,264 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 348,352 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 348,352 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 437,441 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 437,441 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 527,531 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 527,531 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 616,620 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 616,620 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 705,709 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 705,709 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/modules/build/bakefiles Modified Files: modules.bkl Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** modules.bkl 21 Jan 2008 04:50:03 -0000 1.55 --- modules.bkl 21 Jan 2008 05:08:40 -0000 1.56 *************** *** 344,351 **** <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> ! <headers>$(LUAMODULEMONO_HDR)</headers> <sources>$(LUAMODULEMONO_SRC)</sources> --- 344,351 ---- <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> ! <headers>$(LUAMODULEMONO_HDR)</headers> <sources>$(LUAMODULEMONO_SRC)</sources> *************** *** 386,389 **** --- 386,390 ---- <wxlua-lib>lua</wxlua-lib> + <wx-lib>stc</wx-lib> <wx-alllibs-req-bywxlua/> |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:45
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/modules/luamodule/src Modified Files: luamodule.cpp Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/luamodule.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** luamodule.cpp 15 Jan 2008 05:31:37 -0000 1.9 --- luamodule.cpp 21 Jan 2008 05:08:40 -0000 1.10 *************** *** 7,11 **** ///////////////////////////////////////////////////////////////////////////// ! #include "wx/wx.h" #include "wx/image.h" // for wxInitAllImageHandlers #include "wxlua/include/wxlstate.h" --- 7,16 ---- ///////////////////////////////////////////////////////////////////////////// ! #include "wx/wxprec.h" ! ! #ifndef WX_PRECOMP ! #include "wx/wx.h" ! #endif ! #include "wx/image.h" // for wxInitAllImageHandlers #include "wxlua/include/wxlstate.h" |
|
From: John L. <jr...@us...> - 2008-01-21 05:08:44
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6438/wxLua/build/msvc6 Modified Files: wxLua.dsw Log Message: Add precomp headers and link to the stc lib for the monolithic luamodule. Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxLua.dsw 20 Jan 2008 19:23:01 -0000 1.11 --- wxLua.dsw 21 Jan 2008 05:08:40 -0000 1.12 *************** *** 498,543 **** Project_Dep_Name mod_lua End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxlua - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindbase - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindcore - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindnet - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindadv - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindaui - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindgl - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindhtml - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindstc - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindxml - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxbindxrc - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxluadebug - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency }}} --- 498,501 ---- |
|
From: John L. <jr...@us...> - 2008-01-21 04:50:11
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31831/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add include for wxWidget's contrib/include for monolithic luamodule. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** makefile.vc 21 Jan 2008 04:26:14 -0000 1.85 --- makefile.vc 21 Jan 2008 04:50:04 -0000 1.86 *************** *** 696,707 **** $(VAR_201) $(VAR_203) /Fd..\..\..\lib\vc_$(VAR_210)\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /I..\..\..\modules\wxbind\setup /DWXMAKINGDLL_LUAMODULE \ ! /DWXMAKINGDLL_WXBINDADV /DWXMAKINGDLL_WXBINDAUI /DWXMAKINGDLL_WXBINDBASE \ ! /DWXMAKINGDLL_WXBINDCORE /DWXMAKINGDLL_WXBINDGL /DWXMAKINGDLL_WXBINDHTML \ ! /DWXMAKINGDLL_WXBINDMEDIA /DWXMAKINGDLL_WXBINDNET \ /DWXMAKINGDLL_WXBINDRICHTEXT /DWXMAKINGDLL_WXBINDSTC \ /DWXMAKINGDLL_WXBINDXML /DWXMAKINGDLL_WXBINDXRC /DWXMAKINGDLL_WXLUADEBUG \ ! /DWXMAKINGDLL_WXLUASOCKET /DWXMAKINGDLL_WXLUA /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \ --- 696,708 ---- $(VAR_201) $(VAR_203) /Fd..\..\..\lib\vc_$(VAR_210)\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /I..\..\..\modules\wxbind\setup /I$(WX_DIR)\contrib\include \ ! /DWXMAKINGDLL_LUAMODULE /DWXMAKINGDLL_WXBINDADV /DWXMAKINGDLL_WXBINDAUI \ ! /DWXMAKINGDLL_WXBINDBASE /DWXMAKINGDLL_WXBINDCORE /DWXMAKINGDLL_WXBINDGL \ ! /DWXMAKINGDLL_WXBINDHTML /DWXMAKINGDLL_WXBINDMEDIA /DWXMAKINGDLL_WXBINDNET \ /DWXMAKINGDLL_WXBINDRICHTEXT /DWXMAKINGDLL_WXBINDSTC \ /DWXMAKINGDLL_WXBINDXML /DWXMAKINGDLL_WXBINDXRC /DWXMAKINGDLL_WXLUADEBUG \ ! /DWXMAKINGDLL_WXLUASOCKET /DWXMAKINGDLL_WXLUA /GR /EHsc /Yu"wx/wxprec.h" \ ! /Fp"vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_mod_luamodule_mono.pch" \ ! $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \ *************** *** 1775,1779 **** !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_$(VAR_210)\wx.dll: make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<< $(MOD_LUAMODULE_MONO_OBJECTS) lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib --- 1776,1780 ---- !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_$(VAR_210)\wx.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<< $(MOD_LUAMODULE_MONO_OBJECTS) lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib *************** *** 2409,2413 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp --- 2410,2414 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) /Ycwx/wxprec.h ..\..\wxbind\src\dummy.cpp vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** makefile.bcc 21 Jan 2008 04:26:13 -0000 1.86 --- makefile.bcc 21 Jan 2008 04:50:04 -0000 1.87 *************** *** 687,696 **** $(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \ ! -DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI \ ! -DWXMAKINGDLL_WXBINDBASE -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL \ ! -DWXMAKINGDLL_WXBINDHTML -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \ -DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \ -DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \ ! -DWXMAKINGDLL_WXLUASOCKET -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \ --- 687,699 ---- $(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \ ! -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_LUAMODULE \ ! -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI -DWXMAKINGDLL_WXBINDBASE \ ! -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL -DWXMAKINGDLL_WXBINDHTML \ ! -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \ -DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \ -DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \ ! -DWXMAKINGDLL_WXLUASOCKET -DWXMAKINGDLL_WXLUA \ ! -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_mod_luamodule_mono.csm \ ! -Hu $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \ *************** *** 1642,1646 **** !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_$(VAR_146)\wx.dll: make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,, --- 1645,1649 ---- !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_$(VAR_146)\wx.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono $(MOD_LUAMODULE_MONO_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,, *************** *** 2276,2280 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp --- 2279,2283 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) -H ..\..\wxbind\src\dummy.cpp bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** makefile.wat 21 Jan 2008 04:26:14 -0000 1.85 --- makefile.wat 21 Jan 2008 04:50:05 -0000 1.86 *************** *** 1225,1234 **** $(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup & ! -dWXMAKINGDLL_LUAMODULE -dWXMAKINGDLL_WXBINDADV -dWXMAKINGDLL_WXBINDAUI & ! -dWXMAKINGDLL_WXBINDBASE -dWXMAKINGDLL_WXBINDCORE -dWXMAKINGDLL_WXBINDGL & ! -dWXMAKINGDLL_WXBINDHTML -dWXMAKINGDLL_WXBINDMEDIA -dWXMAKINGDLL_WXBINDNET & -dWXMAKINGDLL_WXBINDRICHTEXT -dWXMAKINGDLL_WXBINDSTC & -dWXMAKINGDLL_WXBINDXML -dWXMAKINGDLL_WXBINDXRC -dWXMAKINGDLL_WXLUADEBUG & ! -dWXMAKINGDLL_WXLUASOCKET -dWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj & --- 1225,1235 ---- $(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_LUAMODULE & ! -dWXMAKINGDLL_WXBINDADV -dWXMAKINGDLL_WXBINDAUI -dWXMAKINGDLL_WXBINDBASE & ! -dWXMAKINGDLL_WXBINDCORE -dWXMAKINGDLL_WXBINDGL -dWXMAKINGDLL_WXBINDHTML & ! -dWXMAKINGDLL_WXBINDMEDIA -dWXMAKINGDLL_WXBINDNET & -dWXMAKINGDLL_WXBINDRICHTEXT -dWXMAKINGDLL_WXBINDSTC & -dWXMAKINGDLL_WXBINDXML -dWXMAKINGDLL_WXBINDXRC -dWXMAKINGDLL_WXLUADEBUG & ! -dWXMAKINGDLL_WXLUASOCKET -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_MONO_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** makefile.gcc 21 Jan 2008 04:26:14 -0000 1.85 --- makefile.gcc 21 Jan 2008 04:50:04 -0000 1.86 *************** *** 538,544 **** $(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \ ! -DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI \ ! -DWXMAKINGDLL_WXBINDBASE -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL \ ! -DWXMAKINGDLL_WXBINDHTML -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \ -DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \ -DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \ --- 538,545 ---- $(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \ ! -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_LUAMODULE \ ! -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI -DWXMAKINGDLL_WXBINDBASE \ ! -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL -DWXMAKINGDLL_WXBINDHTML \ ! -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \ -DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \ -DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \ |
|
From: John L. <jr...@us...> - 2008-01-21 04:50:11
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31831/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule_mono.vcproj Log Message: Add include for wxWidget's contrib/include for monolithic luamodule. Index: modules_mod_luamodule_mono.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule_mono.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_luamodule_mono.vcproj 21 Jan 2008 04:26:13 -0000 1.5 --- modules_mod_luamodule_mono.vcproj 21 Jan 2008 04:50:03 -0000 1.6 *************** *** 50,54 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" --- 50,54 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="false" ExceptionHandling="1" *************** *** 60,63 **** --- 60,66 ---- BufferSecurityCheck="false" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswu_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswu_dll\mod_luamodule_mono\" ObjectFile="vcmswu_dll\mod_luamodule_mono\" *************** *** 72,76 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> --- 75,79 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> *************** *** 136,140 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" --- 139,143 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="false" ExceptionHandling="1" *************** *** 146,149 **** --- 149,155 ---- BufferSecurityCheck="false" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswu_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswu_dll\mod_luamodule_mono\" ObjectFile="vcmswu_dll\mod_luamodule_mono\" *************** *** 158,162 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> --- 164,168 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> *************** *** 221,225 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" --- 227,231 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="false" ExceptionHandling="1" *************** *** 231,234 **** --- 237,243 ---- BufferSecurityCheck="false" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmsw_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmsw_dll\mod_luamodule_mono\" ObjectFile="vcmsw_dll\mod_luamodule_mono\" *************** *** 243,247 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> --- 252,256 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> *************** *** 306,310 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" --- 315,319 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="false" ExceptionHandling="1" *************** *** 316,319 **** --- 325,331 ---- BufferSecurityCheck="false" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmsw_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmsw_dll\mod_luamodule_mono\" ObjectFile="vcmsw_dll\mod_luamodule_mono\" *************** *** 328,332 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> --- 340,344 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA" /> *************** *** 392,396 **** Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" --- 404,408 ---- Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="true" ExceptionHandling="1" *************** *** 402,405 **** --- 414,420 ---- Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswud_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswud_dll\mod_luamodule_mono\" ObjectFile="vcmswud_dll\mod_luamodule_mono\" *************** *** 414,418 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> --- 429,433 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> *************** *** 479,483 **** Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" --- 494,498 ---- Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="true" ExceptionHandling="1" *************** *** 489,492 **** --- 504,510 ---- Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswud_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswud_dll\mod_luamodule_mono\" ObjectFile="vcmswud_dll\mod_luamodule_mono\" *************** *** 501,505 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> --- 519,523 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> *************** *** 565,569 **** Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" --- 583,587 ---- Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="true" ExceptionHandling="1" *************** *** 575,578 **** --- 593,599 ---- Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswd_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswd_dll\mod_luamodule_mono\" ObjectFile="vcmswd_dll\mod_luamodule_mono\" *************** *** 587,591 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> --- 608,612 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> *************** *** 651,655 **** Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" --- 672,676 ---- Optimization="0" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" MinimalRebuild="true" ExceptionHandling="1" *************** *** 661,664 **** --- 682,688 ---- Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="wx/wxprec.h" + PrecompiledHeaderFile="vcmswd_dll\wxprec_mod_luamodule_mono.pch" AssemblerListingLocation="vcmswd_dll\mod_luamodule_mono\" ObjectFile="vcmswd_dll\mod_luamodule_mono\" *************** *** 673,677 **** Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> --- 697,701 ---- Name="VCResourceCompilerTool" Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup;$(WXWIN)\contrib\include" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;WXMAKINGDLL_WXBINDADV;WXMAKINGDLL_WXBINDAUI;WXMAKINGDLL_WXBINDBASE;WXMAKINGDLL_WXBINDCORE;WXMAKINGDLL_WXBINDGL;WXMAKINGDLL_WXBINDHTML;WXMAKINGDLL_WXBINDMEDIA;WXMAKINGDLL_WXBINDNET;WXMAKINGDLL_WXBINDRICHTEXT;WXMAKINGDLL_WXBINDSTC;WXMAKINGDLL_WXBINDXML;WXMAKINGDLL_WXBINDXRC;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUA;_DEBUG" /> *************** *** 722,726 **** <File RelativePath="..\..\wxbind\src\dummy.cpp" ! /> <File RelativePath="..\..\luamodule\src\luamodule.cpp" --- 746,815 ---- <File RelativePath="..\..\wxbind\src\dummy.cpp" ! > ! <FileConfiguration ! Name="Release Unicode DLL Monolithic|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Release Unicode DLL Multilib|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Release DLL Monolithic|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Release DLL Multilib|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug Unicode DLL Monolithic|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug Unicode DLL Multilib|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug DLL Monolithic|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! <FileConfiguration ! Name="Debug DLL Multilib|Win32" ! > ! <Tool ! Name="VCCLCompilerTool" ! UsePrecompiledHeader="1" ! /> ! </FileConfiguration> ! </File> <File RelativePath="..\..\luamodule\src\luamodule.cpp" |
|
From: John L. <jr...@us...> - 2008-01-21 04:50:08
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31831/wxLua/modules/build/bakefiles Modified Files: modules.bkl Log Message: Add include for wxWidget's contrib/include for monolithic luamodule. Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** modules.bkl 21 Jan 2008 04:26:13 -0000 1.54 --- modules.bkl 21 Jan 2008 04:50:03 -0000 1.55 *************** *** 344,348 **** <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> ! <headers>$(LUAMODULEMONO_HDR)</headers> <sources>$(LUAMODULEMONO_SRC)</sources> --- 344,351 ---- <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> ! ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> ! <headers>$(LUAMODULEMONO_HDR)</headers> <sources>$(LUAMODULEMONO_SRC)</sources> *************** *** 367,370 **** --- 370,382 ---- <define>WXMAKINGDLL_WXLUA</define> + <!-- use precomp for the bind sources to speed them up --> + <precomp-headers-gen> + wxbind/src/dummy.cpp + </precomp-headers-gen> + <precomp-headers-location>include</precomp-headers-location> + <precomp-headers-header>wx/wxprec.h</precomp-headers-header> + <precomp-headers-file>wxprec_$(id)</precomp-headers-file> + <precomp-headers>on</precomp-headers> + <!-- It's important to keep the module name 'wx' to make require("wx") work --> <dllname>wx</dllname> |
