From: John L. <jr...@us...> - 2007-03-19 03:47:50
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/bindings Modified Files: genwxbind.lua Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** genwxbind.lua 16 Mar 2007 05:07:57 -0000 1.109 --- genwxbind.lua 19 Mar 2007 03:47:17 -0000 1.110 *************** *** 4077,4082 **** table.insert(fileData, "{\n") table.insert(fileData, " static "..hook_cpp_binding_classname.." m_binding;\n") ! ! table.insert(fileData, " wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding);\n") table.insert(fileData, " if (node && (node->GetData() == &m_binding))\n") table.insert(fileData, " return false;\n\n") --- 4077,4082 ---- table.insert(fileData, "{\n") table.insert(fileData, " static "..hook_cpp_binding_classname.." m_binding;\n") ! --table.insert(fileData, " wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding);\n") ! table.insert(fileData, " wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding);\n") table.insert(fileData, " if (node && (node->GetData() == &m_binding))\n") table.insert(fileData, " return false;\n\n") *************** *** 4418,4425 **** table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n") GenerateMap(fileData, sortedBindings, "", nil, false, object.Condition) table.insert(fileData, "};\n\n") -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof("..MakeClassVar(ObjectName).."_methods[0]);\n") if object.Condition then --- 4418,4426 ---- table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n") GenerateMap(fileData, sortedBindings, "", nil, false, object.Condition) + table.insert(fileData, " { LuaMethod, 0, 0, 0, 0 },\n") table.insert(fileData, "};\n\n") -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_methodCount = sizeof("..MakeClassVar(ObjectName).."_methods)/sizeof("..MakeClassVar(ObjectName).."_methods[0]) - 1;\n") if object.Condition then |