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...> - 2007-03-19 03:47:50
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxstc_datatypes.lua 15 Mar 2007 00:01:11 -0000 1.49 --- wxstc_datatypes.lua 19 Mar 2007 03:47:17 -0000 1.50 *************** *** 394,404 **** Name = "wxBusyCursor", }, - wxBusyCursorSuspender = { - Condition = "wxLUA_USE_wxBusyCursor", - DefType = "class", - Encapsulate = true, - IsNumber = false, - Name = "wxBusyCursorSuspender", - }, wxBusyInfo = { BaseClass = "wxObject", --- 394,397 ---- *************** *** 1875,1879 **** }, wxKeyType = { ! Condition = "wxLUA_USE_wxList", DefType = "enum", IsNumber = true, --- 1868,1872 ---- }, wxKeyType = { ! Condition = "wxLUA_USE_wxList && !wxUSE_STL", DefType = "enum", IsNumber = true, *************** *** 1932,1936 **** wxList = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxList", DefType = "class", IsNumber = false, --- 1925,1929 ---- wxList = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxList && !wxUSE_STL", DefType = "class", IsNumber = false, *************** *** 2321,2325 **** }, wxNode = { ! Condition = "wxLUA_USE_wxList", DefType = "class", IsNumber = false, --- 2314,2318 ---- }, wxNode = { ! Condition = "wxLUA_USE_wxList && !wxUSE_STL", DefType = "class", IsNumber = false, *************** *** 3568,3572 **** wxWindowList = { BaseClass = "wxList", ! Condition = "wxLUA_USE_wxWindowList", DefType = "class", IsNumber = false, --- 3561,3565 ---- wxWindowList = { BaseClass = "wxList", ! Condition = "wxLUA_USE_wxWindowList && !wxUSE_STL", DefType = "class", IsNumber = false, *************** *** 3657,3667 **** Name = "wxXmlResourceFlags", }, - wxXmlResourceHandler = { - BaseClass = "wxObject", - Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML", - DefType = "class", - IsNumber = false, - Name = "wxXmlResourceHandler", - }, } --- 3650,3653 ---- |
|
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 |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:50
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan_bind.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxluacan.cpp 15 Mar 2007 23:24:48 -0000 1.24 --- wxluacan.cpp 19 Mar 2007 03:47:17 -0000 1.25 *************** *** 176,182 **** { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, }; ! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]); // --------------------------------------------------------------------------- --- 176,183 ---- { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 214,220 **** WXLUAMETHOD wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }, }; ! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]); // --------------------------------------------------------------------------- --- 215,222 ---- WXLUAMETHOD wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 250,256 **** WXLUAMETHOD wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }, }; ! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]); // --------------------------------------------------------------------------- --- 252,259 ---- WXLUAMETHOD wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 286,292 **** WXLUAMETHOD wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }, }; ! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]); // --------------------------------------------------------------------------- --- 289,296 ---- WXLUAMETHOD wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 338,344 **** { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, }; ! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]); // --------------------------------------------------------------------------- --- 342,349 ---- { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 434,440 **** #endif // wxLUA_USE_wxPointSizeRect }; ! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]); // --------------------------------------------------------------------------- --- 439,446 ---- #endif // wxLUA_USE_wxPointSizeRect + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 490,495 **** { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, }; ! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]); --- 496,502 ---- { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluacan_bind.cpp 15 Mar 2007 23:24:49 -0000 1.16 --- wxluacan_bind.cpp 19 Mar 2007 03:47:17 -0000 1.17 *************** *** 210,214 **** { static wxLuaBinding_wxluacan m_binding; ! wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; --- 210,214 ---- { static wxLuaBinding_wxluacan m_binding; ! wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** wxlstate.cpp 16 Mar 2007 21:23:47 -0000 1.90 --- wxlstate.cpp 19 Mar 2007 03:47:21 -0000 1.91 *************** *** 733,737 **** // It wasn't, so check all its children ! for ( wxWindowList::Node * node = parent->GetChildren().GetFirst(); node; node = node->GetNext() ) --- 733,737 ---- // It wasn't, so check all its children ! for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst(); node; node = node->GetNext() ) *************** *** 760,764 **** } // start at very top of wx's windows ! for ( wxWindowList::Node * top_node = wxTopLevelWindows.GetFirst(); top_node; top_node = top_node->GetNext() ) --- 760,764 ---- } // start at very top of wx's windows ! for ( wxWindowList::compatibility_iterator top_node = wxTopLevelWindows.GetFirst(); top_node; top_node = top_node->GetNext() ) *************** *** 775,779 **** // ---------------------------------------------------------------------------- ! // wxLuaCleanupWindows - given a wxList of wxWindows it runs wxFindWindowByPointer // on it to remove dead pointers from the list if only_check=true or // Destroy() the windows and remove them from the list if !only_check. --- 775,779 ---- // ---------------------------------------------------------------------------- ! // wxLuaCleanupWindows - given a wxWindowList of wxWindows it runs wxFindWindowByPointer // on it to remove dead pointers from the list if only_check=true or // Destroy() the windows and remove them from the list if !only_check. *************** *** 781,789 **** // returns true if any windows removed, ie. the list has changed // ---------------------------------------------------------------------------- ! bool wxLuaCleanupWindows(wxList *list, bool only_check) { bool removed = false; ! wxNode *node = list->GetFirst(); while (node != NULL) --- 781,789 ---- // returns true if any windows removed, ie. the list has changed // ---------------------------------------------------------------------------- ! bool wxLuaCleanupWindows(wxWindowList *list, bool only_check) { bool removed = false; ! wxWindowList::compatibility_iterator node = list->GetFirst(); while (node != NULL) *************** *** 793,797 **** if (!win) { ! wxNode *lastNode = node; node = node->GetNext(); list->DeleteNode(lastNode); --- 793,797 ---- if (!win) { ! wxWindowList::compatibility_iterator lastNode = node; node = node->GetNext(); list->DeleteNode(lastNode); *************** *** 800,804 **** { removed = true; ! wxNode *lastNode = node; node = node->GetNext(); //printf("%d %d\n", int(lastNode), int(node)); fflush(stdout); --- 800,804 ---- { removed = true; ! wxWindowList::compatibility_iterator lastNode = node; node = node->GetNext(); //printf("%d %d\n", int(lastNode), int(node)); fflush(stdout); *************** *** 877,881 **** m_bindingList.DeleteContents(true); // we add "new" copies of the bindings ! wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->GetFirst(); for (; node; node = node->GetNext() ) { --- 877,881 ---- m_bindingList.DeleteContents(true); // we add "new" copies of the bindings ! wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->GetFirst(); for (; node; node = node->GetNext() ) { *************** *** 906,913 **** m_trackedObjects.clear(); ! wxLuaBindingList::Node *node = m_bindingList.GetFirst(); while (node) { ! wxLuaBindingList::Node* next_node = node->GetNext(); m_bindingList.DeleteNode(node); // see m_bindingList.DeleteContents(true) node = next_node; --- 906,913 ---- m_trackedObjects.clear(); ! wxLuaBindingList::compatibility_iterator node = m_bindingList.GetFirst(); while (node) { ! wxLuaBindingList::compatibility_iterator next_node = node->GetNext(); m_bindingList.DeleteNode(node); // see m_bindingList.DeleteContents(true) node = next_node; *************** *** 1016,1020 **** { // remove any and all callbacks that use this event handler since its gone ! wxNode* node = m_wxlStateData->m_callbackList.GetFirst(); while (node) { --- 1016,1020 ---- { // remove any and all callbacks that use this event handler since its gone ! wxList::compatibility_iterator node = m_wxlStateData->m_callbackList.GetFirst(); while (node) { *************** *** 1047,1051 **** // UnRegister bindings ! wxLuaBindingList::Node *node; for (node = m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1047,1051 ---- // UnRegister bindings ! wxLuaBindingList::compatibility_iterator node; for (node = m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1663,1667 **** // Register bindings ! wxLuaBindingList::Node *node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1663,1667 ---- // Register bindings ! wxLuaBindingList::compatibility_iterator node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1688,1692 **** if (pLuaClass->baseclassName) { ! wxLuaBindingList::Node* basenode; for (basenode = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); basenode; basenode = basenode->GetNext() ) { --- 1688,1692 ---- if (pLuaClass->baseclassName) { ! wxLuaBindingList::compatibility_iterator basenode; for (basenode = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); basenode; basenode = basenode->GetNext() ) { *************** *** 1715,1719 **** { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); ! wxLuaBindingList::Node *node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1715,1719 ---- { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); ! wxLuaBindingList::compatibility_iterator node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1732,1736 **** classItem.class_tag = &iClassTag; ! wxLuaBindingList::Node *node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1732,1736 ---- classItem.class_tag = &iClassTag; ! wxLuaBindingList::compatibility_iterator node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1754,1758 **** { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); ! wxLuaBindingList::Node *node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1754,1759 ---- { wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState")); ! ! wxLuaBindingList::compatibility_iterator node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1800,1804 **** wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); ! wxLuaBindingList::Node *node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext()) { --- 1801,1805 ---- wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); ! wxLuaBindingList::compatibility_iterator node; for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext()) { *************** *** 1967,1971 **** wxWindow* parent = win; ! wxList* list = &M_WXLSTATEDATA->m_wxlStateData->m_windowList; while (parent) --- 1968,1972 ---- wxWindow* parent = win; ! wxWindowList* list = &M_WXLSTATEDATA->m_wxlStateData->m_windowList; while (parent) *************** *** 2282,2286 **** // check to make sure that we're not trying to attach another destroy callback bool already_handled = false; ! wxNode* node = M_WXLSTATEDATA->m_wxlStateData->m_winDestroyCallbackList.GetFirst(); while (node) { --- 2283,2287 ---- // check to make sure that we're not trying to attach another destroy callback bool already_handled = false; ! wxList::compatibility_iterator node = M_WXLSTATEDATA->m_wxlStateData->m_winDestroyCallbackList.GetFirst(); while (node) { Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** wxlbind.cpp 16 Mar 2007 21:23:47 -0000 1.54 --- wxlbind.cpp 19 Mar 2007 03:47:21 -0000 1.55 *************** *** 553,557 **** // find the m_wxLuaTable of the previously loaded binding (start at last) ! wxLuaBindingList::Node *node = wxlState.GetLuaBindingList()->GetFirst(); for (; node; node = node->GetNext()) { --- 553,557 ---- // find the m_wxLuaTable of the previously loaded binding (start at last) ! wxLuaBindingList::compatibility_iterator node = wxlState.GetLuaBindingList()->GetFirst(); for (; node; node = node->GetNext()) { Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlcallb.cpp 16 Mar 2007 21:23:47 -0000 1.26 --- wxlcallb.cpp 19 Mar 2007 03:47:21 -0000 1.27 *************** *** 80,84 **** wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); ! wxNode* node = wxlState.GetTrackedCallbackList()->GetFirst(); while (node) { --- 80,84 ---- wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); ! wxList::compatibility_iterator node = wxlState.GetTrackedCallbackList()->GetFirst(); while (node) { *************** *** 88,92 **** { // delete the reference to all other handlers that are cleared ! wxNode* pc_node = node; // remember current node node = node->GetNext(); wxlState.GetTrackedCallbackList()->Erase(pc_node); --- 88,92 ---- { // delete the reference to all other handlers that are cleared ! wxList::compatibility_iterator pc_node = node; // remember current node node = node->GetNext(); wxlState.GetTrackedCallbackList()->Erase(pc_node); |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** xml.cpp 17 Mar 2007 19:08:14 -0000 1.27 --- xml.cpp 19 Mar 2007 03:47:20 -0000 1.28 *************** *** 535,541 **** { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor }, }; ! int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]); #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 535,542 ---- { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxXmlNode_methodCount = sizeof(wxXmlNode_methods)/sizeof(wxXmlNode_methods[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML *************** *** 712,718 **** { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]); #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 713,720 ---- { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxXmlProperty_methodCount = sizeof(wxXmlProperty_methods)/sizeof(wxXmlProperty_methods[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML *************** *** 947,953 **** { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]); #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 949,956 ---- { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxXmlDocument_methodCount = sizeof(wxXmlDocument_methods)/sizeof(wxXmlDocument_methods[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML *************** *** 1606,1612 **** { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]); #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 1609,1616 ---- { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxXmlResource_methodCount = sizeof(wxXmlResource_methods)/sizeof(wxXmlResource_methods[0]) - 1; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** defsutil.cpp 17 Mar 2007 19:08:13 -0000 1.29 --- defsutil.cpp 19 Mar 2007 03:47:18 -0000 1.30 *************** *** 344,350 **** { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, }; ! int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]); #endif // wxLUA_USE_wxProcess --- 344,351 ---- { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxProcess_methodCount = sizeof(wxProcess_methods)/sizeof(wxProcess_methods[0]) - 1; #endif // wxLUA_USE_wxProcess *************** *** 700,706 **** { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]); #endif // wxCHECK_VERSION(2,7,0) --- 701,708 ---- { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxMouseState_methodCount = sizeof(wxMouseState_methods)/sizeof(wxMouseState_methods[0]) - 1; #endif // wxCHECK_VERSION(2,7,0) *************** *** 766,772 **** #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) }; ! int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]); #endif // wxLUA_USE_wxBusyCursor --- 768,775 ---- #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxBusyCursor_methodCount = sizeof(wxBusyCursor_methods)/sizeof(wxBusyCursor_methods[0]) - 1; #endif // wxLUA_USE_wxBusyCursor *************** *** 825,831 **** { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, }; ! int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]); #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO --- 828,835 ---- { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxBusyInfo_methodCount = sizeof(wxBusyInfo_methods)/sizeof(wxBusyInfo_methods[0]) - 1; #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlua.cpp 15 Mar 2007 23:24:57 -0000 1.32 --- wxlua.cpp 19 Mar 2007 03:47:20 -0000 1.33 *************** *** 51,57 **** WXLUAMETHOD wxLuaState_methods[] = { { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }, }; ! int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]); // --------------------------------------------------------------------------- --- 51,58 ---- WXLUAMETHOD wxLuaState_methods[] = { { LuaMethod, "Delete", wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaState_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 185,191 **** { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaObject_methods[0]); --- 186,193 ---- { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaObject_methods[0]) - 1; *************** *** 284,290 **** { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, }; ! int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]); #endif // wxLUA_USE_wxLuaPrintout --- 286,293 ---- { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaPrintout_methodCount = sizeof(wxLuaPrintout_methods)/sizeof(wxLuaPrintout_methods[0]) - 1; #endif // wxLUA_USE_wxLuaPrintout *************** *** 341,347 **** #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) }; ! int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow --- 344,351 ---- #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaHtmlWindow_methodCount = sizeof(wxLuaHtmlWindow_methods)/sizeof(wxLuaHtmlWindow_methods[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 467,473 **** { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, }; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(wxLuaHtmlWinTagEvent_methods)/sizeof(wxLuaHtmlWinTagEvent_methods[0]); #endif // wxLUA_USE_wxLuaHtmlWindow --- 471,478 ---- { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaHtmlWinTagEvent_methodCount = sizeof(wxLuaHtmlWinTagEvent_methods)/sizeof(wxLuaHtmlWinTagEvent_methods[0]) - 1; #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 542,548 **** { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, }; ! int wxLuaTreeItemData_methodCount = sizeof(wxLuaTreeItemData_methods)/sizeof(wxLuaTreeItemData_methods[0]); #endif // wxLUA_USE_wxTreeCtrl --- 547,554 ---- { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaTreeItemData_methodCount = sizeof(wxLuaTreeItemData_methods)/sizeof(wxLuaTreeItemData_methods[0]) - 1; #endif // wxLUA_USE_wxTreeCtrl Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** image.cpp 15 Mar 2007 23:24:54 -0000 1.33 --- image.cpp 19 Mar 2007 03:47:19 -0000 1.34 *************** *** 425,429 **** #endif // wxLUA_USE_wxImage && wxUSE_IMAGE ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // static wxList& GetHandlers() static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L) --- 425,429 ---- #endif // wxLUA_USE_wxImage && wxUSE_IMAGE ! #if (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) // static wxList& GetHandlers() static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L) *************** *** 439,443 **** } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) #if wxLUA_USE_wxImage && wxUSE_IMAGE --- 439,443 ---- } ! #endif // (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) #if wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 1768,1774 **** { LuaMethod, "GetGreen", wxLua_wxImage_GetGreen, 2, 2, s_wxluatagArray_wxLua_wxImage_GetGreen }, ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetHeight", wxLua_wxImage_GetHeight, 0, 0, s_wxluaargArray_None }, --- 1768,1774 ---- { LuaMethod, "GetGreen", wxLua_wxImage_GetGreen, 2, 2, s_wxluatagArray_wxLua_wxImage_GetGreen }, ! #if (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { LuaMethod, "GetHeight", wxLua_wxImage_GetHeight, 0, 0, s_wxluaargArray_None }, *************** *** 1877,1883 **** { LuaConstructor, "wxImageFromFile", wxLua_wxImageFromFile_constructor, 2, 1, s_wxluatagArray_wxLua_wxImageFromFile_constructor }, }; ! int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 1877,1884 ---- { LuaConstructor, "wxImageFromFile", wxLua_wxImageFromFile_constructor, 2, 1, s_wxluatagArray_wxLua_wxImageFromFile_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxImage_methodCount = sizeof(wxImage_methods)/sizeof(wxImage_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 1971,1977 **** { LuaConstructor, "wxImageHistogramEntry", wxLua_wxImageHistogramEntry_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxImageHistogramEntry_methodCount = sizeof(wxImageHistogramEntry_methods)/sizeof(wxImageHistogramEntry_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 1972,1979 ---- { LuaConstructor, "wxImageHistogramEntry", wxLua_wxImageHistogramEntry_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxImageHistogramEntry_methodCount = sizeof(wxImageHistogramEntry_methods)/sizeof(wxImageHistogramEntry_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 2091,2097 **** { LuaGetProp, "second", wxLua_wxImageHistogram_iterator_Get_second, 0, 0, s_wxluaargArray_None }, }; ! int wxImageHistogram_iterator_methodCount = sizeof(wxImageHistogram_iterator_methods)/sizeof(wxImageHistogram_iterator_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 2093,2100 ---- { LuaGetProp, "second", wxLua_wxImageHistogram_iterator_Get_second, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxImageHistogram_iterator_methodCount = sizeof(wxImageHistogram_iterator_methods)/sizeof(wxImageHistogram_iterator_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 2291,2297 **** { LuaConstructor, "wxImageHistogram", wxLua_wxImageHistogram_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxImageHistogram_methodCount = sizeof(wxImageHistogram_methods)/sizeof(wxImageHistogram_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 2294,2301 ---- { LuaConstructor, "wxImageHistogram", wxLua_wxImageHistogram_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxImageHistogram_methodCount = sizeof(wxImageHistogram_methods)/sizeof(wxImageHistogram_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 2560,2566 **** { LuaGetProp, "Type", wxLua_wxImageHandler_GetType, 0, 0, s_wxluaargArray_None }, }; ! int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 2564,2571 ---- { LuaGetProp, "Type", wxLua_wxImageHandler_GetType, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxImageHandler_methodCount = sizeof(wxImageHandler_methods)/sizeof(wxImageHandler_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 2599,2605 **** { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 2604,2611 ---- { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxBMPHandler_methodCount = sizeof(wxBMPHandler_methods)/sizeof(wxBMPHandler_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 2638,2644 **** { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2644,2651 ---- { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxICOHandler_methodCount = sizeof(wxICOHandler_methods)/sizeof(wxICOHandler_methods[0]) - 1; #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2677,2683 **** { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2684,2691 ---- { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxCURHandler_methodCount = sizeof(wxCURHandler_methods)/sizeof(wxCURHandler_methods[0]) - 1; #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2716,2722 **** { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]); #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2724,2731 ---- { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxANIHandler_methodCount = sizeof(wxANIHandler_methods)/sizeof(wxANIHandler_methods[0]) - 1; #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2755,2761 **** { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]); #endif // (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2764,2771 ---- { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxIFFHandler_methodCount = sizeof(wxIFFHandler_methods)/sizeof(wxIFFHandler_methods[0]) - 1; #endif // (wxUSE_IFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2794,2800 **** { LuaConstructor, "wxGIFHandler", wxLua_wxGIFHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]); #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2804,2811 ---- { LuaConstructor, "wxGIFHandler", wxLua_wxGIFHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGIFHandler_methodCount = sizeof(wxGIFHandler_methods)/sizeof(wxGIFHandler_methods[0]) - 1; #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2833,2839 **** { LuaConstructor, "wxJPEGHandler", wxLua_wxJPEGHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]); #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2844,2851 ---- { LuaConstructor, "wxJPEGHandler", wxLua_wxJPEGHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxJPEGHandler_methodCount = sizeof(wxJPEGHandler_methods)/sizeof(wxJPEGHandler_methods[0]) - 1; #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2872,2878 **** { LuaConstructor, "wxPCXHandler", wxLua_wxPCXHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]); #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2884,2891 ---- { LuaConstructor, "wxPCXHandler", wxLua_wxPCXHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxPCXHandler_methodCount = sizeof(wxPCXHandler_methods)/sizeof(wxPCXHandler_methods[0]) - 1; #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2911,2917 **** { LuaConstructor, "wxPNGHandler", wxLua_wxPNGHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]); #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2924,2931 ---- { LuaConstructor, "wxPNGHandler", wxLua_wxPNGHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxPNGHandler_methodCount = sizeof(wxPNGHandler_methods)/sizeof(wxPNGHandler_methods[0]) - 1; #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2950,2956 **** { LuaConstructor, "wxPNMHandler", wxLua_wxPNMHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]); #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 2964,2971 ---- { LuaConstructor, "wxPNMHandler", wxLua_wxPNMHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxPNMHandler_methodCount = sizeof(wxPNMHandler_methods)/sizeof(wxPNMHandler_methods[0]) - 1; #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 2989,2995 **** { LuaConstructor, "wxTIFFHandler", wxLua_wxTIFFHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]); #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 3004,3011 ---- { LuaConstructor, "wxTIFFHandler", wxLua_wxTIFFHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxTIFFHandler_methodCount = sizeof(wxTIFFHandler_methods)/sizeof(wxTIFFHandler_methods[0]) - 1; #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 3028,3034 **** { LuaConstructor, "wxTGAHandler", wxLua_wxTGAHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxTGAHandler_methods[0]); #endif // (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE) --- 3044,3051 ---- { LuaConstructor, "wxTGAHandler", wxLua_wxTGAHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxTGAHandler_methodCount = sizeof(wxTGAHandler_methods)/sizeof(wxTGAHandler_methods[0]) - 1; #endif // (wxCHECK_VERSION(2,8,0) && wxUSE_TGA) && (wxLUA_USE_wxImage && wxUSE_IMAGE) *************** *** 3067,3073 **** { LuaConstructor, "wxXPMHandler", wxLua_wxXPMHandler_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]); #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 3084,3091 ---- { LuaConstructor, "wxXPMHandler", wxLua_wxXPMHandler_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxXPMHandler_methodCount = sizeof(wxXPMHandler_methods)/sizeof(wxXPMHandler_methods[0]) - 1; #endif // wxLUA_USE_wxImage && wxUSE_IMAGE *************** *** 3279,3285 **** #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) }; ! int wxArtProvider_methodCount = sizeof(wxArtProvider_methods)/sizeof(wxArtProvider_methods[0]); #endif // wxLUA_USE_wxArtProvider --- 3297,3304 ---- #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxArtProvider_methodCount = sizeof(wxArtProvider_methods)/sizeof(wxArtProvider_methods[0]) - 1; #endif // wxLUA_USE_wxArtProvider Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** mdi.cpp 15 Mar 2007 23:24:55 -0000 1.29 --- mdi.cpp 19 Mar 2007 03:47:19 -0000 1.30 *************** *** 39,45 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMDIClientWindow_methods[] = { }; ! int wxMDIClientWindow_methodCount = sizeof(wxMDIClientWindow_methods)/sizeof(wxMDIClientWindow_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 39,46 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMDIClientWindow_methods[] = { + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxMDIClientWindow_methodCount = sizeof(wxMDIClientWindow_methods)/sizeof(wxMDIClientWindow_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 383,389 **** { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxMDIParentFrame_methodCount = sizeof(wxMDIParentFrame_methods)/sizeof(wxMDIParentFrame_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 384,391 ---- { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxMDIParentFrame_methodCount = sizeof(wxMDIParentFrame_methods)/sizeof(wxMDIParentFrame_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 554,560 **** { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxMDIChildFrame_methodCount = sizeof(wxMDIChildFrame_methods)/sizeof(wxMDIChildFrame_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 556,563 ---- { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxMDIChildFrame_methodCount = sizeof(wxMDIChildFrame_methods)/sizeof(wxMDIChildFrame_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 686,692 **** #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) }; ! int wxDocChildFrame_methodCount = sizeof(wxDocChildFrame_methods)/sizeof(wxDocChildFrame_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 689,696 ---- #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxDocChildFrame_methodCount = sizeof(wxDocChildFrame_methods)/sizeof(wxDocChildFrame_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 1021,1025 **** #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) // %override wxLua_wxDocManager_GetDocuments // wxList& GetDocuments() --- 1025,1029 ---- #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) // %override wxLua_wxDocManager_GetDocuments // wxList& GetDocuments() *************** *** 1039,1043 **** } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) --- 1043,1047 ---- } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) *************** *** 1128,1132 **** #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) // %override wxLua_wxDocManager_GetTemplates // wxList& GetTemplates() --- 1132,1136 ---- #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) // %override wxLua_wxDocManager_GetTemplates // wxList& GetTemplates() *************** *** 1146,1150 **** } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 1150,1154 ---- } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 1423,1429 **** { LuaMethod, "GetCurrentView", wxLua_wxDocManager_GetCurrentView, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) --- 1427,1433 ---- { LuaMethod, "GetCurrentView", wxLua_wxDocManager_GetCurrentView, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) *************** *** 1442,1448 **** #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) { LuaMethod, "Initialize", wxLua_wxDocManager_Initialize, 0, 0, s_wxluaargArray_None }, --- 1446,1452 ---- #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) { LuaMethod, "Initialize", wxLua_wxDocManager_Initialize, 0, 0, s_wxluaargArray_None }, *************** *** 1469,1475 **** { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, s_wxluatagArray_wxLua_wxDocManager_constructor }, }; ! int wxDocManager_methodCount = sizeof(wxDocManager_methods)/sizeof(wxDocManager_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 1473,1480 ---- { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, s_wxluatagArray_wxLua_wxDocManager_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxDocManager_methodCount = sizeof(wxDocManager_methods)/sizeof(wxDocManager_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 1529,1535 **** #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) }; ! int wxDocParentFrame_methodCount = sizeof(wxDocParentFrame_methods)/sizeof(wxDocParentFrame_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 1534,1541 ---- #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxDocParentFrame_methodCount = sizeof(wxDocParentFrame_methods)/sizeof(wxDocParentFrame_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 1920,1926 **** #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxClassInfo) }; ! int wxDocTemplate_methodCount = sizeof(wxDocTemplate_methods)/sizeof(wxDocTemplate_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 1926,1933 ---- #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxClassInfo) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxDocTemplate_methodCount = sizeof(wxDocTemplate_methods)/sizeof(wxDocTemplate_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 2128,2132 **** #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) // %override wxLua_wxDocument_GetViews // wxList& GetViews() const --- 2135,2139 ---- #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) // %override wxLua_wxDocument_GetViews // wxList& GetViews() const *************** *** 2146,2150 **** } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 2153,2157 ---- } ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) #if wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 2516,2522 **** { LuaMethod, "GetTitle", wxLua_wxDocument_GetTitle, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList) { LuaMethod, "IsModified", wxLua_wxDocument_IsModified, 0, 0, s_wxluaargArray_None }, --- 2523,2529 ---- { LuaMethod, "GetTitle", wxLua_wxDocument_GetTitle, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxList && !wxUSE_STL) { LuaMethod, "IsModified", wxLua_wxDocument_IsModified, 0, 0, s_wxluaargArray_None }, *************** *** 2555,2561 **** { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxDocument_methodCount = sizeof(wxDocument_methods)/sizeof(wxDocument_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 2562,2569 ---- { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxDocument_methodCount = sizeof(wxDocument_methods)/sizeof(wxDocument_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 2865,2871 **** { LuaGetProp, "ViewName", wxLua_wxView_GetViewName, 0, 0, s_wxluaargArray_None }, }; ! int wxView_methodCount = sizeof(wxView_methods)/sizeof(wxView_methods[0]); #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE --- 2873,2880 ---- { LuaGetProp, "ViewName", wxLua_wxView_GetViewName, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxView_methodCount = sizeof(wxView_methods)/sizeof(wxView_methods[0]) - 1; #endif // wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 2924,2928 **** #endif // wxLUA_USE_wxCommandProcessor ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) // %override wxLua_wxCommandProcessor_GetCommands // wxList& GetCommands() const --- 2933,2937 ---- #endif // wxLUA_USE_wxCommandProcessor ! #if (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxCommandProcessor) // %override wxLua_wxCommandProcessor_GetCommands // wxList& GetCommands() const *************** *** 2942,2946 **** } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) #if wxLUA_USE_wxCommandProcessor --- 2951,2955 ---- } ! #endif // (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxCommandProcessor) #if wxLUA_USE_wxCommandProcessor *************** *** 3256,3262 **** { LuaMethod, "ClearCommands", wxLua_wxCommandProcessor_ClearCommands, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, s_wxluaargArray_None }, --- 3265,3271 ---- { LuaMethod, "ClearCommands", wxLua_wxCommandProcessor_ClearCommands, 0, 0, s_wxluaargArray_None }, ! #if (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxList && !wxUSE_STL) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, s_wxluaargArray_None }, *************** *** 3288,3294 **** { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, s_wxluatagArray_wxLua_wxCommandProcessor_constructor }, }; ! int wxCommandProcessor_methodCount = sizeof(wxCommandProcessor_methods)/sizeof(wxCommandProcessor_methods[0]); #endif // wxLUA_USE_wxCommandProcessor --- 3297,3304 ---- { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, s_wxluatagArray_wxLua_wxCommandProcessor_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxCommandProcessor_methodCount = sizeof(wxCommandProcessor_methods)/sizeof(wxCommandProcessor_methods[0]) - 1; #endif // wxLUA_USE_wxCommandProcessor *************** *** 3374,3380 **** { LuaMethod, "Undo", wxLua_wxCommand_Undo, 0, 0, s_wxluaargArray_None }, }; ! int wxCommand_methodCount = sizeof(wxCommand_methods)/sizeof(wxCommand_methods[0]); #endif // wxLUA_USE_wxCommandProcessor --- 3384,3391 ---- { LuaMethod, "Undo", wxLua_wxCommand_Undo, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxCommand_methodCount = sizeof(wxCommand_methods)/sizeof(wxCommand_methods[0]) - 1; #endif // wxLUA_USE_wxCommandProcessor *************** *** 3638,3644 **** { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, s_wxluatagArray_wxLua_wxFileHistory_constructor }, }; ! int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]); #endif // wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE --- 3649,3656 ---- { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, s_wxluatagArray_wxLua_wxFileHistory_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxFileHistory_methodCount = sizeof(wxFileHistory_methods)/sizeof(wxFileHistory_methods[0]) - 1; #endif // wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** config.cpp 15 Mar 2007 23:24:50 -0000 1.32 --- config.cpp 19 Mar 2007 03:47:18 -0000 1.33 *************** *** 782,788 **** { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, s_wxluatagArray_wxLua_wxConfigGet_constructor }, }; ! int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]); #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG --- 782,789 ---- { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, s_wxluatagArray_wxLua_wxConfigGet_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxConfigBase_methodCount = sizeof(wxConfigBase_methods)/sizeof(wxConfigBase_methods[0]) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 831,837 **** { LuaConstructor, "wxConfig", wxLua_wxConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxConfig_constructor }, }; ! int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]); #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG --- 832,839 ---- { LuaConstructor, "wxConfig", wxLua_wxConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxConfig_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxConfig_methodCount = sizeof(wxConfig_methods)/sizeof(wxConfig_methods[0]) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 896,902 **** { LuaConstructor, "wxFileConfig", wxLua_wxFileConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxFileConfig_constructor }, }; ! int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]); #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG --- 898,905 ---- { LuaConstructor, "wxFileConfig", wxLua_wxFileConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxFileConfig_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxFileConfig_methodCount = sizeof(wxFileConfig_methods)/sizeof(wxFileConfig_methods[0]) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 932,938 **** { LuaConstructor, "wxMemoryConfig", wxLua_wxMemoryConfig_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxMemoryConfig_methodCount = sizeof(wxMemoryConfig_methods)/sizeof(wxMemoryConfig_methods[0]); #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG --- 935,942 ---- { LuaConstructor, "wxMemoryConfig", wxLua_wxMemoryConfig_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxMemoryConfig_methodCount = sizeof(wxMemoryConfig_methods)/sizeof(wxMemoryConfig_methods[0]) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 1012,1018 **** { LuaConstructor, "wxConfigPathChanger", wxLua_wxConfigPathChanger_constructor, 2, 2, s_wxluatagArray_wxLua_wxConfigPathChanger_constructor }, }; ! int wxConfigPathChanger_methodCount = sizeof(wxConfigPathChanger_methods)/sizeof(wxConfigPathChanger_methods[0]); #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG --- 1016,1023 ---- { LuaConstructor, "wxConfigPathChanger", wxLua_wxConfigPathChanger_constructor, 2, 2, s_wxluatagArray_wxLua_wxConfigPathChanger_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxConfigPathChanger_methodCount = sizeof(wxConfigPathChanger_methods)/sizeof(wxConfigPathChanger_methods[0]) - 1; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** grid.cpp 15 Mar 2007 23:24:53 -0000 1.30 --- grid.cpp 19 Mar 2007 03:47:19 -0000 1.31 *************** *** 85,91 **** { LuaMethod, "SetParameters", wxLua_wxGridCellWorker_SetParameters, 1, 1, s_wxluatagArray_wxLua_wxGridCellWorker_SetParameters }, }; ! int wxGridCellWorker_methodCount = sizeof(wxGridCellWorker_methods)/sizeof(wxGridCellWorker_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 85,92 ---- { LuaMethod, "SetParameters", wxLua_wxGridCellWorker_SetParameters, 1, 1, s_wxluatagArray_wxLua_wxGridCellWorker_SetParameters }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellWorker_methodCount = sizeof(wxGridCellWorker_methods)/sizeof(wxGridCellWorker_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 139,145 **** #endif // ((wxLUA_USE_wxGrid && wxUSE_GRID) && (wxLUA_USE_wxDC)) && (wxLUA_USE_wxPointSizeRect) }; ! int wxGridCellRenderer_methodCount = sizeof(wxGridCellRenderer_methods)/sizeof(wxGridCellRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 140,147 ---- #endif // ((wxLUA_USE_wxGrid && wxUSE_GRID) && (wxLUA_USE_wxDC)) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellRenderer_methodCount = sizeof(wxGridCellRenderer_methods)/sizeof(wxGridCellRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 175,181 **** { LuaConstructor, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellStringRenderer_methodCount = sizeof(wxGridCellStringRenderer_methods)/sizeof(wxGridCellStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 177,184 ---- { LuaConstructor, "wxGridCellStringRenderer", wxLua_wxGridCellStringRenderer_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellStringRenderer_methodCount = sizeof(wxGridCellStringRenderer_methods)/sizeof(wxGridCellStringRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 211,217 **** { LuaConstructor, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellNumberRenderer_methodCount = sizeof(wxGridCellNumberRenderer_methods)/sizeof(wxGridCellNumberRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 214,221 ---- { LuaConstructor, "wxGridCellNumberRenderer", wxLua_wxGridCellNumberRenderer_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellNumberRenderer_methodCount = sizeof(wxGridCellNumberRenderer_methods)/sizeof(wxGridCellNumberRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 322,328 **** { LuaConstructor, "wxGridCellFloatRenderer", wxLua_wxGridCellFloatRenderer_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellFloatRenderer_constructor }, }; ! int wxGridCellFloatRenderer_methodCount = sizeof(wxGridCellFloatRenderer_methods)/sizeof(wxGridCellFloatRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 326,333 ---- { LuaConstructor, "wxGridCellFloatRenderer", wxLua_wxGridCellFloatRenderer_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellFloatRenderer_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellFloatRenderer_methodCount = sizeof(wxGridCellFloatRenderer_methods)/sizeof(wxGridCellFloatRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 358,364 **** { LuaConstructor, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellBoolRenderer_methodCount = sizeof(wxGridCellBoolRenderer_methods)/sizeof(wxGridCellBoolRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 363,370 ---- { LuaConstructor, "wxGridCellBoolRenderer", wxLua_wxGridCellBoolRenderer_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellBoolRenderer_methodCount = sizeof(wxGridCellBoolRenderer_methods)/sizeof(wxGridCellBoolRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 401,407 **** { LuaConstructor, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellDateTimeRenderer_constructor }, }; ! int wxGridCellDateTimeRenderer_methodCount = sizeof(wxGridCellDateTimeRenderer_methods)/sizeof(wxGridCellDateTimeRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 407,414 ---- { LuaConstructor, "wxGridCellDateTimeRenderer", wxLua_wxGridCellDateTimeRenderer_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellDateTimeRenderer_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellDateTimeRenderer_methodCount = sizeof(wxGridCellDateTimeRenderer_methods)/sizeof(wxGridCellDateTimeRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 442,448 **** { LuaConstructor, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_constructor, 1, 0, s_wxluatagArray_wxLua_wxGridCellEnumRenderer_constructor }, }; ! int wxGridCellEnumRenderer_methodCount = sizeof(wxGridCellEnumRenderer_methods)/sizeof(wxGridCellEnumRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 449,456 ---- { LuaConstructor, "wxGridCellEnumRenderer", wxLua_wxGridCellEnumRenderer_constructor, 1, 0, s_wxluatagArray_wxLua_wxGridCellEnumRenderer_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellEnumRenderer_methodCount = sizeof(wxGridCellEnumRenderer_methods)/sizeof(wxGridCellEnumRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 478,484 **** { LuaConstructor, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellAutoWrapStringRenderer_methodCount = sizeof(wxGridCellAutoWrapStringRenderer_methods)/sizeof(wxGridCellAutoWrapStringRenderer_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 486,493 ---- { LuaConstructor, "wxGridCellAutoWrapStringRenderer", wxLua_wxGridCellAutoWrapStringRenderer_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellAutoWrapStringRenderer_methodCount = sizeof(wxGridCellAutoWrapStringRenderer_methods)/sizeof(wxGridCellAutoWrapStringRenderer_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 807,813 **** { LuaMethod, "StartingKey", wxLua_wxGridCellEditor_StartingKey, 1, 1, s_wxluatagArray_wxLua_wxGridCellEditor_StartingKey }, }; ! int wxGridCellEditor_methodCount = sizeof(wxGridCellEditor_methods)/sizeof(wxGridCellEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 816,823 ---- { LuaMethod, "StartingKey", wxLua_wxGridCellEditor_StartingKey, 1, 1, s_wxluatagArray_wxLua_wxGridCellEditor_StartingKey }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellEditor_methodCount = sizeof(wxGridCellEditor_methods)/sizeof(wxGridCellEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 843,849 **** { LuaConstructor, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellTextEditor_methodCount = sizeof(wxGridCellTextEditor_methods)/sizeof(wxGridCellTextEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 853,860 ---- { LuaConstructor, "wxGridCellTextEditor", wxLua_wxGridCellTextEditor_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellTextEditor_methodCount = sizeof(wxGridCellTextEditor_methods)/sizeof(wxGridCellTextEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 886,892 **** { LuaConstructor, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellNumberEditor_constructor }, }; ! int wxGridCellNumberEditor_methodCount = sizeof(wxGridCellNumberEditor_methods)/sizeof(wxGridCellNumberEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 897,904 ---- { LuaConstructor, "wxGridCellNumberEditor", wxLua_wxGridCellNumberEditor_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellNumberEditor_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellNumberEditor_methodCount = sizeof(wxGridCellNumberEditor_methods)/sizeof(wxGridCellNumberEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 929,935 **** { LuaConstructor, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellFloatEditor_constructor }, }; ! int wxGridCellFloatEditor_methodCount = sizeof(wxGridCellFloatEditor_methods)/sizeof(wxGridCellFloatEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 941,948 ---- { LuaConstructor, "wxGridCellFloatEditor", wxLua_wxGridCellFloatEditor_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridCellFloatEditor_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellFloatEditor_methodCount = sizeof(wxGridCellFloatEditor_methods)/sizeof(wxGridCellFloatEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 965,971 **** { LuaConstructor, "wxGridCellBoolEditor", wxLua_wxGridCellBoolEditor_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellBoolEditor_methodCount = sizeof(wxGridCellBoolEditor_methods)/sizeof(wxGridCellBoolEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 978,985 ---- { LuaConstructor, "wxGridCellBoolEditor", wxLua_wxGridCellBoolEditor_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellBoolEditor_methodCount = sizeof(wxGridCellBoolEditor_methods)/sizeof(wxGridCellBoolEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 1008,1014 **** { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor }, }; ! int wxGridCellChoiceEditor_methodCount = sizeof(wxGridCellChoiceEditor_methods)/sizeof(wxGridCellChoiceEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 1022,1029 ---- { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, s_wxluatagArray_wxLua_wxGridCellChoiceEditor_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellChoiceEditor_methodCount = sizeof(wxGridCellChoiceEditor_methods)/sizeof(wxGridCellChoiceEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 1049,1055 **** { LuaConstructor, "wxGridCellEnumEditor", wxLua_wxGridCellEnumEditor_constructor, 1, 0, s_wxluatagArray_wxLua_wxGridCellEnumEditor_constructor }, }; ! int wxGridCellEnumEditor_methodCount = sizeof(wxGridCellEnumEditor_methods)/sizeof(wxGridCellEnumEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 1064,1071 ---- { LuaConstructor, "wxGridCellEnumEditor", wxLua_wxGridCellEnumEditor_constructor, 1, 0, s_wxluatagArray_wxLua_wxGridCellEnumEditor_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellEnumEditor_methodCount = sizeof(wxGridCellEnumEditor_methods)/sizeof(wxGridCellEnumEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 1085,1091 **** { LuaConstructor, "wxGridCellAutoWrapStringEditor", wxLua_wxGridCellAutoWrapStringEditor_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellAutoWrapStringEditor_methodCount = sizeof(wxGridCellAutoWrapStringEditor_methods)/sizeof(wxGridCellAutoWrapStringEditor_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 1101,1108 ---- { LuaConstructor, "wxGridCellAutoWrapStringEditor", wxLua_wxGridCellAutoWrapStringEditor_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellAutoWrapStringEditor_methodCount = sizeof(wxGridCellAutoWrapStringEditor_methods)/sizeof(wxGridCellAutoWrapStringEditor_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 1797,1803 **** { LuaConstructor, "wxGridCellAttrDefault", wxLua_wxGridCellAttrDefault_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellAttr_methodCount = sizeof(wxGridCellAttr_methods)/sizeof(wxGridCellAttr_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 1814,1821 ---- { LuaConstructor, "wxGridCellAttrDefault", wxLua_wxGridCellAttrDefault_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellAttr_methodCount = sizeof(wxGridCellAttr_methods)/sizeof(wxGridCellAttr_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 1948,1954 **** { LuaConstructor, "wxGridCellAttrProvider", wxLua_wxGridCellAttrProvider_constructor, 0, 0, s_wxluaargArray_None }, }; ! int wxGridCellAttrProvider_methodCount = sizeof(wxGridCellAttrProvider_methods)/sizeof(wxGridCellAttrProvider_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 1966,1973 ---- { LuaConstructor, "wxGridCellAttrProvider", wxLua_wxGridCellAttrProvider_constructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridCellAttrProvider_methodCount = sizeof(wxGridCellAttrProvider_methods)/sizeof(wxGridCellAttrProvider_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 2638,2644 **** { LuaGetProp, "View", wxLua_wxGridTableBase_GetView, 0, 0, s_wxluaargArray_None }, }; ! int wxGridTableBase_methodCount = sizeof(wxGridTableBase_methods)/sizeof(wxGridTableBase_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 2657,2664 ---- { LuaGetProp, "View", wxLua_wxGridTableBase_GetView, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridTableBase_methodCount = sizeof(wxGridTableBase_methods)/sizeof(wxGridTableBase_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 2684,2690 **** { LuaConstructor, "wxGridStringTable", wxLua_wxGridStringTable_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridStringTable_constructor }, }; ! int wxGridStringTable_methodCount = sizeof(wxGridStringTable_methods)/sizeof(wxGridStringTable_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 2704,2711 ---- { LuaConstructor, "wxGridStringTable", wxLua_wxGridStringTable_constructor, 2, 0, s_wxluatagArray_wxLua_wxGridStringTable_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridStringTable_methodCount = sizeof(wxGridStringTable_methods)/sizeof(wxGridStringTable_methods[0]) - 1; #endif // wxLUA_USE_wxGrid && wxUSE_GRID *************** *** 2867,2873 **** { LuaConstructor, "wxGridTableMessage", wxLua_wxGridTableMessage_constructor, 4, 2, s_wxluatagArray_wxLua_wxGridTableMessage_constructor }, }; ! int wxGridTableMessage_methodCount = sizeof(wxGridTableMessage_methods)/sizeof(wxGridTableMessage_methods[0]); #endif // wxLUA_USE_wxGrid && wxUSE_GRID --- 2888,2895 ---- { LuaConstructor, "wxGridTableMessage", wxLua_wxGridTableMessage_constructor, 4, 2, s_wxluatagArray_wxLua_wxGridTableMessage_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxGridTableMessage_methodCount = sizeof(wxGridTableMessage_methods)/sizeof(wxGridTableMessage_methods[0]) - 1; #endif // wxLUA_USE_wxGrid ... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxluasocket_bind.cpp 15 Mar 2007 23:24:58 -0000 1.14 --- wxluasocket_bind.cpp 19 Mar 2007 03:47:21 -0000 1.15 *************** *** 187,191 **** { static wxLuaBinding_wxluasocket m_binding; ! wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; --- 187,191 ---- { static wxLuaBinding_wxluasocket m_binding; ! wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** dservice.cpp 12 Dec 2006 01:23:40 -0000 1.29 --- dservice.cpp 19 Mar 2007 03:47:21 -0000 1.30 *************** *** 116,121 **** // Cleanup Debuggee List ! wxLuaDebuggeeList::Node* nodeDebuggee; ! wxLuaDebuggeeList::Node* nextDebuggee; for (nodeDebuggee = m_debuggeeList.GetFirst(); nodeDebuggee; nodeDebuggee = nextDebuggee) --- 116,121 ---- // Cleanup Debuggee List ! wxLuaDebuggeeList::compatibility_iterator nodeDebuggee; ! wxLuaDebuggeeList::compatibility_iterator nextDebuggee; for (nodeDebuggee = m_debuggeeList.GetFirst(); nodeDebuggee; nodeDebuggee = nextDebuggee) *************** *** 129,134 **** // Cleanup Debugger Socket List ! wxLuaDebugSocketList::Node* nodeDebuggerSocket; ! wxLuaDebugSocketList::Node* nextDebuggerSocket; for (nodeDebuggerSocket = m_debuggerSocketList.GetFirst(); nodeDebuggerSocket; nodeDebuggerSocket = nextDebuggerSocket) --- 129,134 ---- // Cleanup Debugger Socket List ! wxLuaDebugSocketList::compatibility_iterator nodeDebuggerSocket; ! wxLuaDebugSocketList::compatibility_iterator nextDebuggerSocket; for (nodeDebuggerSocket = m_debuggerSocketList.GetFirst(); nodeDebuggerSocket; nodeDebuggerSocket = nextDebuggerSocket) *************** *** 375,379 **** wxCriticalSectionLocker locker(m_debuggerSocketListCriticalSection); ! for ( wxLuaDebugSocketList::Node *node = m_debuggerSocketList.GetFirst(); node; node = node->GetNext() ) { if (node->GetData()->GetSocket() == sock) --- 375,380 ---- wxCriticalSectionLocker locker(m_debuggerSocketListCriticalSection); ! wxLuaDebugSocketList::compatibility_iterator node; ! for ( node = m_debuggerSocketList.GetFirst(); node; node = node->GetNext() ) { if (node->GetData()->GetSocket() == sock) *************** *** 838,843 **** { // Cleanup Break Point List ! wxLuaBreakPointList::Node* nodeBreakPoint; ! wxLuaBreakPointList::Node* nextBreakPoint; for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint) --- 839,844 ---- { // Cleanup Break Point List ! wxLuaBreakPointList::compatibility_iterator nodeBreakPoint; ! wxLuaBreakPointList::compatibility_iterator nextBreakPoint; for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint) *************** *** 1009,1013 **** wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey); if (!node) { --- 1010,1014 ---- wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey); if (!node) { *************** *** 1030,1034 **** wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey); if (node) { --- 1031,1035 ---- wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey); if (node) { *************** *** 1053,1057 **** wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey); if (node) { --- 1054,1058 ---- wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey); if (node) { *************** *** 1066,1070 **** wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey); if (node) { --- 1067,1071 ---- wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey); if (node) { *************** *** 1346,1350 **** wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey); return (node && node->GetData()->GetEnabled()); } --- 1347,1351 ---- wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber); ! wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey); return (node && node->GetData()->GetEnabled()); } *************** *** 1386,1391 **** // Notify Debugger of Each BreakPoint ! wxLuaBreakPointList::Node* nodeBreakPoint; ! wxLuaBreakPointList::Node* nextBreakPoint; for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint) --- 1387,1392 ---- // Notify Debugger of Each BreakPoint ! wxLuaBreakPointList::compatibility_iterator nodeBreakPoint; ! wxLuaBreakPointList::compatibility_iterator nextBreakPoint; for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint) Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluasocket.cpp 15 Mar 2007 23:24:58 -0000 1.19 --- wxluasocket.cpp 19 Mar 2007 03:47:21 -0000 1.20 *************** *** 388,394 **** { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, }; ! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]); // --------------------------------------------------------------------------- --- 388,395 ---- { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 481,486 **** { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, }; ! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]); --- 482,488 ---- { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** staktree.cpp 26 Feb 2007 05:17:30 -0000 1.36 --- staktree.cpp 19 Mar 2007 03:47:21 -0000 1.37 *************** *** 355,359 **** else if (pDebugDataItem->GetName() == _("Event Callback List")) { ! wxNode* node = wxlState.GetTrackedCallbackList()->GetFirst(); while (node) { --- 355,359 ---- else if (pDebugDataItem->GetName() == _("Event Callback List")) { ! wxList::compatibility_iterator node = wxlState.GetTrackedCallbackList()->GetFirst(); while (node) { *************** *** 364,368 **** if (wxlState.GetLuaBindingList()) { ! wxLuaBindingList::Node *bindNode = wxlState.GetLuaBindingList()->GetFirst(); for (; bindNode; bindNode = bindNode->GetNext()) { --- 364,368 ---- if (wxlState.GetLuaBindingList()) { ! wxLuaBindingList::compatibility_iterator bindNode = wxlState.GetLuaBindingList()->GetFirst(); for (; bindNode; bindNode = bindNode->GetNext()) { *************** *** 388,392 **** else { ! wxNode* node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); while (node) { --- 388,392 ---- else { ! wxWindowList::compatibility_iterator node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); while (node) { |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxstc_bind.cpp 15 Mar 2007 23:24:58 -0000 1.19 --- wxstc_bind.cpp 19 Mar 2007 03:47:21 -0000 1.20 *************** *** 1564,1568 **** { static wxLuaBinding_wxstc m_binding; ! wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; --- 1564,1568 ---- { static wxLuaBinding_wxstc m_binding; ! wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** stc.cpp 15 Mar 2007 23:24:57 -0000 1.29 --- stc.cpp 19 Mar 2007 03:47:20 -0000 1.30 *************** *** 7580,7586 **** #endif // wxLUA_USE_wxPointSizeRect }; ! int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]); // --------------------------------------------------------------------------- --- 7580,7587 ---- #endif // wxLUA_USE_wxPointSizeRect + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxStyledTextCtrl_methodCount = sizeof(wxStyledTextCtrl_methods)/sizeof(wxStyledTextCtrl_methods[0]) - 1; // --------------------------------------------------------------------------- *************** *** 8387,8392 **** { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluaargArray_None }, { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_constructor }, }; ! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxStyledTextEvent_methods[0]); --- 8388,8394 ---- { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluaargArray_None }, { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_constructor }, + { LuaMethod, 0, 0, 0, 0 }, }; ! int wxStyledTextEvent_methodCount = sizeof(wxStyledTextEvent_methods)/sizeof(wxStyledTextEvent_methods[0]) - 1; |
|
From: John L. <jr...@us...> - 2007-03-19 03:47:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0 Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wxlstate.h 26 Feb 2007 01:57:06 -0000 1.61 --- wxlstate.h 19 Mar 2007 03:47:21 -0000 1.62 *************** *** 223,227 **** wxList m_callbackList; // event objects for wxLuaCallback wxList m_winDestroyCallbackList; // wxLuaWinDestroyCallback installed ! wxList m_windowList; // all wxWindow objects, wxWidgets will delete these // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle --- 223,227 ---- wxList m_callbackList; // event objects for wxLuaCallback wxList m_winDestroyCallbackList; // wxLuaWinDestroyCallback installed ! wxWindowList m_windowList; // all wxWindow objects, wxWidgets will delete these // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle |
|
From: John L. <jr...@us...> - 2007-03-19 02:17:16
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10862/wxLua/bindings/wxwidgets Modified Files: defsutil.i dialogs.i wx_datatypes.lua xml.i Log Message: fixes in the bindings for MSW missing functions rem out wxXMLResourceHandler since it didn't have any methods Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xml.i 9 Mar 2007 00:15:12 -0000 1.7 --- xml.i 17 Mar 2007 19:08:09 -0000 1.8 *************** *** 124,129 **** // wxXmlResourceHandler ! %class %noclassinfo wxXmlResourceHandler, wxObject ! %endclass %enum wxXmlResourceFlags --- 124,129 ---- // wxXmlResourceHandler ! //%class %noclassinfo wxXmlResourceHandler, wxObject ! //%endclass %enum wxXmlResourceFlags Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wx_datatypes.lua 15 Mar 2007 00:01:12 -0000 1.58 --- wx_datatypes.lua 17 Mar 2007 19:08:09 -0000 1.59 *************** *** 394,404 **** Name = "wxBusyCursor", }, - wxBusyCursorSuspender = { - Condition = "wxLUA_USE_wxBusyCursor", - DefType = "class", - Encapsulate = true, - IsNumber = false, - Name = "wxBusyCursorSuspender", - }, wxBusyInfo = { BaseClass = "wxObject", --- 394,397 ---- *************** *** 3646,3656 **** Name = "wxXmlResourceFlags", }, - wxXmlResourceHandler = { - BaseClass = "wxObject", - Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML", - DefType = "class", - IsNumber = false, - Name = "wxXmlResourceHandler", - }, } --- 3639,3642 ---- Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** dialogs.i 12 Mar 2007 23:12:31 -0000 1.26 --- dialogs.i 17 Mar 2007 19:08:09 -0000 1.27 *************** *** 237,245 **** %class wxFileDialog, wxDialog ! %constructor wxFileDialogDefault() !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") ! %wxchkver_2_8 bool Create(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") wxString GetDirectory() const wxString GetFilename() const --- 237,246 ---- %class wxFileDialog, wxDialog ! // %constructor wxFileDialogDefault() no default constructor in MSW !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") ! // since there's no default constructor in MSW you can't call this so it's best to not have it at all ! //%wxchkver_2_8 bool Create(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") wxString GetDirectory() const wxString GetFilename() const Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** defsutil.i 15 Mar 2007 23:24:50 -0000 1.38 --- defsutil.i 17 Mar 2007 19:08:09 -0000 1.39 *************** *** 601,611 **** //----------------------------------------------------------------------------- ! // wxBusyCursorSuspender ! %class %delete %noclassinfo %encapsulate wxBusyCursorSuspender // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough ! wxBusyCursorSuspender() ! %endclass %endif //wxLUA_USE_wxBusyCursor --- 601,613 ---- //----------------------------------------------------------------------------- ! // wxBusyCursorSuspender - we don't wrap this since lua's garbage collector doesn't ! // automatically collect items when they go out of scope so you would have to ! // Delete this anyway which is just as easy as ! //%class %delete %noclassinfo %encapsulate wxBusyCursorSuspender // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough ! // wxBusyCursorSuspender() ! //%endclass %endif //wxLUA_USE_wxBusyCursor |
|
From: John L. <jr...@us...> - 2007-03-19 01:38:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10862/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: fixes in the bindings for MSW missing functions rem out wxXMLResourceHandler since it didn't have any methods Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** wxbind.h 15 Mar 2007 23:24:50 -0000 1.62 --- wxbind.h 17 Mar 2007 19:08:13 -0000 1.63 *************** *** 1201,1207 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursor_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursor_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursorSuspender; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursorSuspender_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursorSuspender_methodCount; #endif // wxLUA_USE_wxBusyCursor --- 1201,1204 ---- *************** *** 2260,2266 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxXmlResource_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxXmlResource_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxXmlResourceHandler; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxXmlResourceHandler_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxXmlResourceHandler_methodCount; #endif // wxLUA_USE_wxXMLResource && wxUSE_XML --- 2257,2260 ---- *************** *** 2438,2442 **** #if wxLUA_USE_wxBusyCursor wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor, wxBusyCursor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursorSuspender, wxBusyCursorSuspender) #endif // wxLUA_USE_wxBusyCursor --- 2432,2435 ---- |
|
From: John L. <jr...@us...> - 2007-03-16 21:23:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9909/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: Move GetEvent function that searches to bindings to the wxLuaBinding class from wxLuaState Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxlbind.h 15 Mar 2007 00:01:25 -0000 1.37 --- wxlbind.h 16 Mar 2007 21:23:47 -0000 1.38 *************** *** 322,328 **** bool SetBaseClass(WXLUACLASS *pClass); // Look up the event type name as a string, from the wxEventType number // in the WXLUAEVENT* struct list of this binding. ! wxString GetEventTypeName(wxEventType e_type); // Get all the bindings that were initialized using the generated binding --- 322,330 ---- bool SetBaseClass(WXLUACLASS *pClass); + // Find the WXLUAEVENT with the wxEventType, returns NULL if not found. + const WXLUAEVENT* GetEvent(wxEventType eventType) const; // Look up the event type name as a string, from the wxEventType number // in the WXLUAEVENT* struct list of this binding. ! wxString GetEventTypeName(wxEventType eventType) const; // Get all the bindings that were initialized using the generated binding |
|
From: John L. <jr...@us...> - 2007-03-16 21:23:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9909/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: Move GetEvent function that searches to bindings to the wxLuaBinding class from wxLuaState Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** wxlstate.cpp 15 Mar 2007 00:01:25 -0000 1.89 --- wxlstate.cpp 16 Mar 2007 21:23:47 -0000 1.90 *************** *** 1799,1805 **** { wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); - WXLUAEVENT eventItem; - int eventType = eventType_; - eventItem.eventType = &eventType; wxLuaBindingList::Node *node; --- 1799,1802 ---- *************** *** 1807,1816 **** { wxLuaBinding* binding = node->GetData(); - WXLUAEVENT *pLuaEvent = (WXLUAEVENT *) bsearch(&eventItem, - binding->GetLuaEventList(), - binding->GetLuaEventCount(), - sizeof(WXLUAEVENT), - wxLuaEventListCompareFn); if (pLuaEvent) return pLuaEvent; --- 1804,1809 ---- { wxLuaBinding* binding = node->GetData(); + const WXLUAEVENT *pLuaEvent = binding->GetEvent(eventType_); if (pLuaEvent) return pLuaEvent; Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** wxlbind.cpp 15 Mar 2007 00:01:25 -0000 1.53 --- wxlbind.cpp 16 Mar 2007 21:23:47 -0000 1.54 *************** *** 714,727 **** } ! wxString wxLuaBinding::GetEventTypeName(wxEventType e_type) { ! for (size_t n = 0; n < m_eventCount; ++n) ! { ! WXLUAEVENT *pEvent = m_eventList + n; ! if (*pEvent->eventType == (int)e_type) ! return lua2wx(pEvent->name); ! } ! return wxEmptyString; } --- 714,733 ---- } ! const WXLUAEVENT* wxLuaBinding::GetEvent(wxEventType eventType_) const { ! const int eventType = eventType_; ! WXLUAEVENT eventItem = { &eventType, "" }; ! const WXLUAEVENT *pLuaEvent = (WXLUAEVENT *)bsearch(&eventItem, ! m_eventList, ! m_eventCount, ! sizeof(WXLUAEVENT), ! wxLuaEventListCompareFn); ! return pLuaEvent; ! } ! wxString wxLuaBinding::GetEventTypeName(wxEventType eventType) const ! { ! const WXLUAEVENT* luaEvent = GetEvent(eventType); ! return (luaEvent != NULL) ? lua2wx(luaEvent->name) : wxString(); } Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxlcallb.cpp 26 Feb 2007 01:57:06 -0000 1.25 --- wxlcallb.cpp 16 Mar 2007 21:23:47 -0000 1.26 *************** *** 113,116 **** --- 113,117 ---- // ref the state in case this generates a wxEVT_DESTROY which clears us + // this is why we don't get a pointer to the lua_Sstate but check it with GetLuaState() wxLuaState wxlState(m_wxlState); *************** *** 132,139 **** } else ! wxlState.terror("wxLua: CallFunction: function is not a Lua function."); } else ! wxlState.terror("wxLua: CallFunction: function has been garbage collected."); lua_settop(wxlState.GetLuaState(), oldTop); --- 133,140 ---- } else ! wxlState.terror("wxLua: wxEvtHandler::Connect in wxLuaCallback::CallFunction: function is not a Lua function."); } else ! wxlState.terror("wxLua: wxEvtHandler::Connect in wxLuaCallback::CallFunction: function has been garbage collected."); lua_settop(wxlState.GetLuaState(), oldTop); |
|
From: John L. <jr...@us...> - 2007-03-16 05:08:26
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8749/wxLua/bindings Modified Files: genwxbind.lua Log Message: cleanup, does not change output from last commit Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** genwxbind.lua 15 Mar 2007 23:24:49 -0000 1.108 --- genwxbind.lua 16 Mar 2007 05:07:57 -0000 1.109 *************** *** 280,283 **** --- 280,284 ---- -- --------------------------------------------------------------------------- -- Decode Declaration of a data type, see DecodeDataType + -- For "const wxDateTime &" returns {"const"}, "wxDateTime", {"&"} -- --------------------------------------------------------------------------- function DecodeDecl(decl) *************** *** 321,335 **** -- --------------------------------------------------------------------------- ! -- Decode DataType, see TranslateDataType -- --------------------------------------------------------------------------- function DecodeDataType(decl) local attribs = {} ! local type = nil local ptrs = {} ! attribs, type, ptrs = DecodeDecl(decl) -- merge typeDef declaration ! if typedefTable[type] then -- build new datatype using typeDef local datatype = nil --- 322,337 ---- -- --------------------------------------------------------------------------- ! -- Decode DataType, also handles typedefs, see TranslateDataType ! -- For "const wxDateTime &" returns {"const"}, "wxDateTime", {"&"} -- --------------------------------------------------------------------------- function DecodeDataType(decl) local attribs = {} ! local data_type = nil local ptrs = {} ! attribs, data_type, ptrs = DecodeDecl(decl) -- merge typeDef declaration ! if typedefTable[data_type] then -- build new datatype using typeDef local datatype = nil *************** *** 338,348 **** end ! datatype = SpaceSeparateStrings(datatype, typedefTable[type]) datatype = datatype..table.concat(ptrs) ! attribs, type, ptrs = DecodeDataType(datatype) end ! return attribs, type, ptrs end --- 340,350 ---- end ! datatype = SpaceSeparateStrings(datatype, typedefTable[data_type]) datatype = datatype..table.concat(ptrs) ! attribs, data_type, ptrs = DecodeDataType(datatype) end ! return attribs, data_type, ptrs end *************** *** 352,356 **** function TranslateDataType(param) local attribs = {} ! local type = nil local ptrs = {} --- 354,358 ---- function TranslateDataType(param) local attribs = {} ! local data_type = nil local ptrs = {} *************** *** 358,362 **** local datatype = param.DataTypeWithAttrib.." "..table.concat(param.DataTypePointer) ! attribs, type, ptrs = DecodeDataType(datatype) -- build new datatype --- 360,364 ---- local datatype = param.DataTypeWithAttrib.." "..table.concat(param.DataTypePointer) ! attribs, data_type, ptrs = DecodeDataType(datatype) -- build new datatype *************** *** 366,372 **** end ! tlstype = SpaceSeparateStrings(tlstype, type) ! param.TypedDataType = type param.TypedDataTypeWithAttrib = tlstype param.TypedDataTypePointer = ptrs --- 368,374 ---- end ! tlstype = SpaceSeparateStrings(tlstype, data_type) ! param.TypedDataType = data_type param.TypedDataTypeWithAttrib = tlstype param.TypedDataTypePointer = ptrs *************** *** 379,385 **** if dataTypeTable[datatype] then return true ! end ! ! if typedefTable[datatype] then if not dataTypeTable[typedefTable[datatype]] then print("Error - supposed datatype: '"..datatype.."' has typedef = '"..typedefTable[datatype].."' which is not a data type either") --- 381,385 ---- if dataTypeTable[datatype] then return true ! elseif typedefTable[datatype] then if not dataTypeTable[typedefTable[datatype]] then print("Error - supposed datatype: '"..datatype.."' has typedef = '"..typedefTable[datatype].."' which is not a data type either") *************** *** 507,528 **** if not file_handle then return false end -- ok if it doesn't exist ! for i = 1, #fileData do ! local line = fileData[i] ! local len = string.len(line) ! local file_line = file_handle:read(len) ! ! if line ~= file_line then ! io.close(file_handle) ! return false ! end ! end ! ! local cur_file_pos = file_handle:seek("cur") ! local end_file_pos = file_handle:seek("end") io.close(file_handle) ! ! if cur_file_pos ~= end_file_pos then return false end -- file is bigger ! ! return true end --- 507,514 ---- if not file_handle then return false end -- ok if it doesn't exist ! local f = file_handle:read("*a") ! local is_same = (f == table.concat(fileData)) io.close(file_handle) ! return is_same end *************** *** 549,555 **** end ! for i = 1, #fileData do ! outfile:write(fileData[i]) ! end outfile:flush() --- 535,539 ---- end ! outfile:write(table.concat(fileData)) outfile:flush() *************** *** 1642,1646 **** local l = 0 ! while interfaceData[l+1] do l = l + 1 -- get lineData --- 1626,1630 ---- local l = 0 ! while interfaceData[l+1] do -- not for loop so we can adjust l l = l + 1 -- get lineData *************** *** 1730,1743 **** break -- we can stop processing line ! -- skip %protected functions ! elseif tag == "%protected" then ! lineState.Skip = true ! break ! -- skip %private functions ! elseif tag == "%private" then ! lineState.Skip = true ! break elseif tag == "%class" then local parseObject = AllocParseObject("class") --- 1714,1725 ---- break -- we can stop processing line ! elseif tag == "%rename" then ! lineState.Action = "rename" ! lineState.ActionMandatory = true ! elseif tag == "%function" then ! lineState.IsCFunction = true + -- ------------------------------------------------------- elseif tag == "%class" then local parseObject = AllocParseObject("class") *************** *** 1769,1784 **** break -- we can stop processing line ! elseif tag == "%delete" then parseState.ObjectStack[1].DeleteRequired = true ! elseif tag == "%noclassinfo" then parseState.ObjectStack[1].HasClassInfo = false ! elseif tag == "%abstract" then parseState.ObjectStack[1].IsAbstract = true ! elseif tag == "%encapsulate" then parseState.ObjectStack[1].Encapsulate = true elseif tag == "%struct" then local parseObject = AllocParseObject("struct") --- 1751,1814 ---- break -- we can stop processing line ! elseif tag == "%delete" then -- tag for %class parseState.ObjectStack[1].DeleteRequired = true ! elseif tag == "%noclassinfo" then -- tag for %class parseState.ObjectStack[1].HasClassInfo = false ! elseif tag == "%abstract" then -- tag for %class parseState.ObjectStack[1].IsAbstract = true ! elseif tag == "%encapsulate" then -- tag for %class parseState.ObjectStack[1].Encapsulate = true + -- ------------------------------------------------------- + elseif tag == "%protected" then -- skip %protected functions + lineState.Skip = true + break + + elseif tag == "%private" then -- skip %private functions + lineState.Skip = true + break + + elseif tag == "%property" then + lineState.DefType = "property" + lineState.Action = "property" + lineState.ActionMandatory = true + + elseif tag == "%member" then + lineState.DefType = "member" + lineState.Action = "member" + lineState.ActionMandatory = true + + elseif tag == "%constructor" then + lineState.IsConstructor = true + + elseif tag == "%operator" then + lineState.IsOperator = true + + elseif tag == "%static" then + -- means that we will create function ClassName_MemberFunction(...) + -- as opposed to "static" where the generated member function accessed the function as + -- ClassName::MemberFunction(...) + lineState.IsStaticFunction = true + lineState.CreateStaticFunction = 1 + lineState.DefType = "method" + lineState.Action = "method" + lineState.ActionMandatory = true + + elseif tag == "%staticonly" then + -- means that we will ONLY create function ClassName_MemberFunction(...) + -- as opposed to "%static" where we also generate member function + lineState.IsStaticFunction = true + lineState.CreateStaticFunction = 2 + lineState.DefType = "method" + lineState.Action = "method" + lineState.ActionMandatory = true + + elseif tag == "%overload" then + lineState.IsOverload = true + + -- ------------------------------------------------------- elseif tag == "%struct" then local parseObject = AllocParseObject("struct") *************** *** 1805,1808 **** --- 1835,1839 ---- break -- we can stop processing line + -- ------------------------------------------------------- elseif tag == "%enum" then local parseObject = AllocParseObject("enum") *************** *** 1829,1837 **** break -- we can stop processing line ! elseif tag == "%property" then ! lineState.DefType = "property" ! lineState.Action = "property" ! lineState.ActionMandatory = true ! elseif tag == "%include" then local parseObject = AllocParseObject("include") --- 1860,1864 ---- break -- we can stop processing line ! -- ------------------------------------------------------- elseif tag == "%include" then local parseObject = AllocParseObject("include") *************** *** 1856,1864 **** lineState.ActionMandatory = true ! elseif tag == "%member" then ! lineState.DefType = "member" ! lineState.Action = "member" ! lineState.ActionMandatory = true ! elseif tag == "%typedef" then lineState.DefType = "typedef" --- 1883,1887 ---- lineState.ActionMandatory = true ! -- ------------------------------------------------------- elseif tag == "%typedef" then lineState.DefType = "typedef" *************** *** 1866,1908 **** lineState.ActionMandatory = true ! elseif tag == "%rename" then ! lineState.Action = "rename" ! lineState.ActionMandatory = true ! ! elseif tag == "%constructor" then ! lineState.IsConstructor = true ! ! elseif tag == "%overload" then ! lineState.IsOverload = true ! ! elseif tag == "%operator" then ! lineState.IsOperator = true ! ! elseif tag == "%static" then ! -- means that we will create function ClassName_MemberFunction(...) ! -- as opposed to "static" where the generated member function accessed the function as ! -- ClassName::MemberFunction(...) ! lineState.IsStaticFunction = true ! lineState.CreateStaticFunction = 1 ! lineState.DefType = "method" ! lineState.Action = "method" ! lineState.ActionMandatory = true ! ! elseif tag == "%staticonly" then ! -- means that we will ONLY create function ClassName_MemberFunction(...) ! -- as opposed to "%static" where we also generate member function ! lineState.IsStaticFunction = true ! lineState.CreateStaticFunction = 2 ! lineState.DefType = "method" ! lineState.Action = "method" ! lineState.ActionMandatory = true ! ! elseif tag == "%function" then ! lineState.IsCFunction = true ! ! elseif tag == "%builtin" then ! print("Warning %builtin is deprecated, use %function instead.") ! lineState.IsCFunction = true ! elseif tag == "%define" then lineState.DefType = "define" --- 1889,1893 ---- lineState.ActionMandatory = true ! -- ------------------------------------------------------- elseif tag == "%define" then lineState.DefType = "define" *************** *** 1989,2000 **** elseif not skipBindingKeywordTable[tag] then ! -- -- Process Interface Data ! -- if (lineState.Action == "keyword") and lineState.ActionMandatory then print("Error: Invalid Token '"..tag.."'. "..LineTableErrString(lineTable)) end -- add block condition if lineState.DefType == "blockcondition" then if not lineState.Condition then --- 1974,1987 ---- elseif not skipBindingKeywordTable[tag] then ! -- ------------------------------------------------------- -- Process Interface Data ! -- ------------------------------------------------------- if (lineState.Action == "keyword") and lineState.ActionMandatory then print("Error: Invalid Token '"..tag.."'. "..LineTableErrString(lineTable)) end + -- ------------------------------------------------------- -- add block condition + -- ------------------------------------------------------- if lineState.DefType == "blockcondition" then if not lineState.Condition then *************** *** 2013,2017 **** --- 2000,2006 ---- lineState.Condition = lineState.Condition..tag + -- ------------------------------------------------------- -- apply tag to lineState.Action + -- ------------------------------------------------------- else -- end inline conditionals *************** *** 2024,2027 **** --- 2013,2017 ---- -- no actions specified + -- ----------------------------------------------- -- enum parseObject if parseState.ObjectStack[1].DefType == "enum" then *************** *** 2037,2040 **** --- 2027,2031 ---- end + -- ----------------------------------------------- -- class or function parseObject elseif (parseState.ObjectStack[1].DefType == "class") or *************** *** 3609,3621 **** if member.IsCFunction then table.insert(functionBindingTable, methodBinding) ! else if not interface.objectData[o].BindTable[methodcondition] then interface.objectData[o].BindTable[methodcondition] = {} end ! if not (member.IsConstructor and parseObject.IsAbstract) then ! table.insert(interface.objectData[o].BindTable[methodcondition], methodBinding) ! if member.IsOverload then ! table.insert(interface.objectData[o].OverloadTable[overloadName].Map[methodcondition], overloadMap) ! interface.objectData[o].OverloadTable[overloadName].Precode = overloadCode -- ok to overwrite ! end end end --- 3600,3610 ---- if member.IsCFunction then table.insert(functionBindingTable, methodBinding) ! elseif not (member.IsConstructor and parseObject.IsAbstract) then if not interface.objectData[o].BindTable[methodcondition] then interface.objectData[o].BindTable[methodcondition] = {} end ! table.insert(interface.objectData[o].BindTable[methodcondition], methodBinding) ! if member.IsOverload then ! table.insert(interface.objectData[o].OverloadTable[overloadName].Map[methodcondition], overloadMap) ! interface.objectData[o].OverloadTable[overloadName].Precode = overloadCode -- ok to overwrite end end *************** *** 3726,3729 **** --- 3715,3724 ---- -- --------------------------------------------------------------------------- -- Write (typically a Map) to a file + -- fileData is a table to append strings to + -- sortedBindings[i][j] = { Map = , Condition = } the binding table + -- indent is the number of space to indent, may be nil default is "" + -- writeFunc is called with the sortedBindings[i][j] to write whatever, may be nil + -- no_elseif means no #elif and each Condition item if be #ifed + -- ignore_condition is an extra condition to ignore -- --------------------------------------------------------------------------- function GenerateMap(fileData, sortedBindings, indent, writeFunc, no_elseif, ignore_condition) *************** *** 3735,3740 **** --- 3730,3747 ---- local wrote_elseif = false + local duplicatesTable = {} + for i = 1, #sortedBindings[n] do local condition = sortedBindings[n][i].Condition + --[[ + -- FIXME implement duplicate entries check + if duplicatesTable[condition] then + print("Warning: Duplicate entries with the same #if condition! Check bindings") + TableDump(duplicatesTable[condition], "Entry #1: ") + TableDump(sortedBindings[n][i], "Entry #2: ") + else + duplicatesTable[condition] = sortedBindings[n][i] + end + ]] local next_condition = "1" *************** *** 4243,4247 **** -- Don't use #elif to let compiler fail on multiple definitions per condition ! -- since there's an error in the bindings local namedBindingTable = {} --- 4250,4254 ---- -- Don't use #elif to let compiler fail on multiple definitions per condition ! -- since there's a problem with the bindings if that happens local namedBindingTable = {} |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:25
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxluacan.cpp 15 Mar 2007 00:01:08 -0000 1.23 --- wxluacan.cpp 15 Mar 2007 23:24:48 -0000 1.24 *************** *** 27,63 **** int s_wxluatag_wxlCanObj = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObj( double x = 0, double y = 0 ) ! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxlCanObj *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // double y = 0 ! double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0); ! // double x = 0 ! double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); ! // call constructor ! returns = new wxlCanObj(x, y); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxlCanObj, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // void SetPos( double x, double y ) ! static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) { wxLuaState wxlState(L); ! // double y ! double y = (double)wxlState.GetNumberType(3); ! // double x ! double x = (double)wxlState.GetNumberType(2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPos ! self->SetPos(x, y); return 0; --- 27,41 ---- int s_wxluatag_wxlCanObj = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; ! // void AddObject( wxlCanObj *canobj ) ! static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) { wxLuaState wxlState(L); ! // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxlState.GetUserDataType(2, s_wxluatag_wxlCanObj); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call AddObject ! self->AddObject(canobj); return 0; *************** *** 94,162 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 }; ! // void SetPending( bool pending = true ) ! static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool pending = true ! bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPending ! self->SetPending(pending); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; ! // void AddObject( wxlCanObj *canobj ) ! static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) { wxLuaState wxlState(L); ! // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxlState.GetUserDataType(2, s_wxluatag_wxlCanObj); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call AddObject ! self->AddObject(canobj); return 0; } ! #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 }; ! // void SetPen( const wxPen& pen ) ! static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) { wxLuaState wxlState(L); ! // const wxPen pen ! const wxPen * pen = (const wxPen *)wxlState.GetUserDataType(2, s_wxluatag_wxPen); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPen ! self->SetPen(*pen); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 }; ! // void SetBrush( const wxBrush& brush ) ! static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) { wxLuaState wxlState(L); ! // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxlState.GetUserDataType(2, s_wxluatag_wxBrush); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetBrush ! self->SetBrush(*brush); return 0; } ! #endif // wxLUA_USE_wxColourPenBrush --- 72,162 ---- } ! ! #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 }; ! // void SetBrush( const wxBrush& brush ) ! static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) { wxLuaState wxlState(L); ! // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxlState.GetUserDataType(2, s_wxluatag_wxBrush); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetBrush ! self->SetBrush(*brush); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 }; ! // void SetPen( const wxPen& pen ) ! static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) { wxLuaState wxlState(L); ! // const wxPen pen ! const wxPen * pen = (const wxPen *)wxlState.GetUserDataType(2, s_wxluatag_wxPen); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPen ! self->SetPen(*pen); return 0; } + #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 }; ! // void SetPending( bool pending = true ) ! static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool pending = true ! bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPending ! self->SetPending(pending); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // void SetPos( double x, double y ) ! static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) { wxLuaState wxlState(L); ! // double y ! double y = (double)wxlState.GetNumberType(3); ! // double x ! double x = (double)wxlState.GetNumberType(2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); ! // call SetPos ! self->SetPos(x, y); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObj( double x = 0, double y = 0 ) ! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxlCanObj *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // double y = 0 ! double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0); ! // double x = 0 ! double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); ! // call constructor ! returns = new wxlCanObj(x, y); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxlCanObj, returns); ! ! return 1; ! } *************** *** 164,179 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, ! { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, - { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, #if wxLUA_USE_wxColourPenBrush - { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }, { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }, ! #endif // wxLUA_USE_wxColourPenBrush }; --- 164,179 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxColourPenBrush { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }, ! { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }, ! #endif // wxLUA_USE_wxColourPenBrush + { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, + { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, + { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, }; *************** *** 297,300 **** --- 297,315 ---- int s_wxluatag_wxlCanObjAddScript = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 }; + // void SetScript( const wxString& script ) + static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString script + const wxString script = wxlState.GetwxStringType(2); + // get this + wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript); + // call SetScript + self->SetScript(script); + + return 0; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // wxlCanObjAddScript( double x, double y, const wxString& script ) *************** *** 317,341 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 }; - // void SetScript( const wxString& script ) - static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString script - const wxString script = wxlState.GetwxStringType(2); - // get this - wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript); - // call SetScript - self->SetScript(script); - - return 0; - } - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { - { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, }; --- 332,341 ---- } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, + { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, }; *************** *** 364,393 **** } ! // bool GetYaxis() ! static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); ! // call GetYaxis ! returns = self->GetYaxis(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // wxlLuaCanCmd* GetCmdh() ! static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; // get this wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); ! // call GetCmdh ! returns = (wxlLuaCanCmd *)self->GetCmdh(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; --- 364,393 ---- } ! // wxlLuaCanCmd* GetCmdh() ! static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; // get this wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); ! // call GetCmdh ! returns = (wxlLuaCanCmd *)self->GetCmdh(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; } ! // bool GetYaxis() ! static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); ! // call GetYaxis ! returns = self->GetYaxis(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; *************** *** 427,436 **** WXLUAMETHOD wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, - { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxPointSizeRect { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor }, ! #endif // wxLUA_USE_wxPointSizeRect }; --- 427,436 ---- WXLUAMETHOD wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxPointSizeRect { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor }, ! #endif // wxLUA_USE_wxPointSizeRect }; *************** *** 445,448 **** --- 445,467 ---- int s_wxluatag_wxlLuaCanCmd = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + // void MoveObject( int index, double x, double y ) + static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) + { + wxLuaState wxlState(L); + // double y + double y = (double)wxlState.GetNumberType(4); + // double x + double x = (double)wxlState.GetNumberType(3); + // int index + int index = (int)wxlState.GetNumberType(2); + // get this + wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); + // call MoveObject + self->MoveObject(index, x, y); + + return 0; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) *************** *** 465,493 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; - // void MoveObject( int index, double x, double y ) - static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) - { - wxLuaState wxlState(L); - // double y - double y = (double)wxlState.GetNumberType(4); - // double x - double x = (double)wxlState.GetNumberType(3); - // int index - int index = (int)wxlState.GetNumberType(2); - // get this - wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); - // call MoveObject - self->MoveObject(index, x, y); - - return 0; - } - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { - { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, }; --- 484,493 ---- } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, + { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, }; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluacan_bind.cpp 9 Mar 2007 06:10:13 -0000 1.15 --- wxluacan_bind.cpp 15 Mar 2007 23:24:49 -0000 1.16 *************** *** 28,31 **** --- 28,32 ---- static WXLUAEVENT eventList[] = { + { 0, 0, 0 }, }; *************** *** 35,39 **** // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluacan() is called to register defines and enums // --------------------------------------------------------------------------- --- 36,40 ---- // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluacan() is called to register %define and %enum // --------------------------------------------------------------------------- *************** *** 42,52 **** static WXLUADEFINE defineList[] = { - // ------------------------------------------------------------------- - // %define - // ------------------------------------------------------------------- - - // ------------------------------------------------------------------- - // %enum - // ------------------------------------------------------------------- { 0, 0 }, --- 43,46 ---- *************** *** 58,62 **** // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluacan() is called to register strings // --------------------------------------------------------------------------- --- 52,56 ---- // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluacan() is called to register %define %string // --------------------------------------------------------------------------- *************** *** 65,71 **** static WXLUASTRING stringList[] = { - // ------------------------------------------------------------------- - // %define %string - // ------------------------------------------------------------------- { 0, 0 }, --- 59,62 ---- *************** *** 83,86 **** --- 74,78 ---- static WXLUAOBJECT objectList[] = { + { 0, 0, 0, 0 }, }; *************** *** 93,97 **** // --------------------------------------------------------------------------- - // %function wxlCan* GetCan() static int LUACALL wxLua_function_GetCan(lua_State *L) --- 85,88 ---- *************** *** 120,125 **** } - - // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions --- 111,114 ---- *************** *** 132,135 **** --- 121,125 ---- { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }, { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }, + { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; *************** *** 155,158 **** --- 145,149 ---- { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, + { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 164,168 **** // --------------------------------------------------------------------------- ! // wxLuaGetClassList_wxluacan() is called to register classes // --------------------------------------------------------------------------- --- 155,159 ---- // --------------------------------------------------------------------------- ! // wxLuaBinding_wxluacan() - the binding class // --------------------------------------------------------------------------- Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxluacan.h 15 Mar 2007 00:01:08 -0000 1.21 --- wxluacan.h 15 Mar 2007 23:24:49 -0000 1.22 *************** *** 54,86 **** // --------------------------------------------------------------------------- ! // Lua Tag Method Values for each Class // --------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; - extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; - - - - // --------------------------------------------------------------------------- - // Method Tables - // --------------------------------------------------------------------------- - extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; --- 54,79 ---- // --------------------------------------------------------------------------- ! // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; + extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; *************** *** 89,93 **** // --------------------------------------------------------------------------- ! // Encapsulation Declarations // --------------------------------------------------------------------------- --- 82,86 ---- // --------------------------------------------------------------------------- ! // Encapsulation Declarations - need to be public for other bindings. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wxbind.h 15 Mar 2007 00:01:13 -0000 1.61 --- wxbind.h 15 Mar 2007 23:24:50 -0000 1.62 *************** *** 680,1588 **** // --------------------------------------------------------------------------- ! // Lua Tag Method Values for each Class // --------------------------------------------------------------------------- #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxExtHelpController; - #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP) - - #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) [...2923 lines suppressed...] extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPage; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPage_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWizardPageSimple; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWizardPageSimple_methodCount; *************** *** 2887,2891 **** // --------------------------------------------------------------------------- ! // Encapsulation Declarations // --------------------------------------------------------------------------- --- 2391,2395 ---- // --------------------------------------------------------------------------- ! // Encapsulation Declarations - need to be public for other bindings. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:23
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/bindings/wxwidgets Modified Files: defsutil.i Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** defsutil.i 14 Mar 2007 05:08:09 -0000 1.37 --- defsutil.i 15 Mar 2007 23:24:50 -0000 1.38 *************** *** 166,170 **** %function wxString wxGetHomeDir() %function wxString wxGetHostName() - %function wxString wxGetUserId() %function wxString wxGetOsDescription() // %override [int version, int major, int minor] wxGetOsVersion() --- 166,169 ---- *************** *** 180,187 **** // Dialog functions - see dialogs.i ! %function void wxBeginBusyCursor(wxCursor *cursor = wxLua_wxHOURGLASS_CURSOR) ! %function void wxBell() ! %function void wxEndBusyCursor() ! %function bool wxIsBusy() //----------------------------------------------------------------------------- --- 179,186 ---- // Dialog functions - see dialogs.i ! //%function void wxBeginBusyCursor(wxCursor *cursor = wxLua_wxHOURGLASS_CURSOR) ! //%function void wxBell() ! //%function void wxEndBusyCursor() ! //%function bool wxIsBusy() //----------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:23
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/bindings Modified Files: genwxbind.lua Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** genwxbind.lua 15 Mar 2007 14:20:13 -0000 1.107 --- genwxbind.lua 15 Mar 2007 23:24:49 -0000 1.108 *************** *** 26,31 **** preprocConditionTable = {} -- Preprocessor conditions for #ifing the output code ! -- table is ["binding code"] = "C preproc code for #if statement" ! preprocOperatorTable = {} -- Preprocessor operators typedefTable = {} -- all %typedefs read from the interface files --- 26,31 ---- preprocConditionTable = {} -- Preprocessor conditions for #ifing the output code ! -- table["binding code condition"] = "C preproc code suitable for #if statement" [...965 lines suppressed...] ! end ! end ! ! if HasCondition(condition) and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! end ! end ! table.insert(fileData, "};\n\n") --- 4406,4414 ---- end -- Output Method Map Table CommentBindingTable(fileData, "// Map Lua Class Methods to C Binding Functions\n") table.insert(fileData, "WXLUAMETHOD "..MakeClassVar(ObjectName).."_methods[] = {\n") ! GenerateMap(fileData, sortedBindings, "", nil, false, object.Condition) table.insert(fileData, "};\n\n") |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** xml.cpp 15 Mar 2007 00:01:24 -0000 1.25 --- xml.cpp 15 Mar 2007 23:24:57 -0000 1.26 *************** *** 35,105 **** int s_wxluatag_wxXmlNode = -1; ! // %constructor wxXmlNodeDefault() ! static int LUACALL wxLua_wxXmlNodeDefault_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxXmlNode *returns; ! // call constructor ! returns = new wxXmlNode(); ! // add to tracked memory list [...2366 lines suppressed...] ! { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow }, ! #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML) + { LuaMethod, "LoadPanel", wxLua_wxXmlResource_LoadPanel, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, + { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanelCreate }, #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }, ! #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML) { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Set }, { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }, { LuaMethod, "Unload", wxLua_wxXmlResource_Unload, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Unload }, { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, ! { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, s_wxluatagArray_wxLua_wxXmlResourceDefault_constructor }, ! { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluaargArray_None }, ! }; Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** defsutil.cpp 15 Mar 2007 00:01:16 -0000 1.27 --- defsutil.cpp 15 Mar 2007 23:24:52 -0000 1.28 *************** *** 35,38 **** --- 35,96 ---- int s_wxluatag_wxProcess = -1; + #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + // void CloseOutput() + static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); [...1105 lines suppressed...] ! #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO *************** *** 841,846 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { - { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, { LuaMethod, "Delete", wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }, }; --- 874,880 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { { LuaMethod, "Delete", wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }, + { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, s_wxluatagArray_wxLua_wxBusyInfo_constructor }, + }; Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxlua.cpp 15 Mar 2007 00:01:24 -0000 1.31 --- wxlua.cpp 15 Mar 2007 23:24:57 -0000 1.32 *************** *** 62,93 **** int s_wxluatag_wxLuaObject = -1; ! // %override wxLua_wxLuaObject_constructor ! // wxLuaObject(void *object) ! static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaObject *returns; ! // call constructor ! returns = new wxLuaObject(wxlState, 1); ! // add to tracked memory list ! wxlState.AddTrackedObject(returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); ! // return the number of parameters ! return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxLuaObject_SetObject ! // void SetObject(void *object) ! static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L) { wxLuaState wxlState(L); // get this ! wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call SetObject ! self->SetObject(1); ! // return the number of parameters ! return 0; } --- 62,91 ---- int s_wxluatag_wxLuaObject = -1; ! static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } ! // int GetAllocationFlags() const ! static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) { wxLuaState wxlState(L); + int returns; // get this ! wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetAllocationFlags ! returns = self->GetAllocationFlags(); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } *************** *** 105,123 **** } - // int GetAllocationFlags() const - static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); - // call GetAllocationFlags - returns = self->GetAllocationFlags(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluaarg_Enumeration, 0 }; // bool HasAllocationFlag(wxLuaObject_Type flag) --- 103,106 ---- *************** *** 158,188 **** } ! static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } return 0; } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, - { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, - { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Object", wxLua_wxLuaObject_SetObject, 1, 1, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }, }; --- 141,188 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxLuaObject_SetObject ! // void SetObject(void *object) ! static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L) { wxLuaState wxlState(L); ! // get this ! wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call SetObject ! self->SetObject(1); ! // return the number of parameters return 0; } + // %override wxLua_wxLuaObject_constructor + // wxLuaObject(void *object) + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxLuaObject *returns; + // call constructor + returns = new wxLuaObject(wxlState, 1); + // add to tracked memory list + wxlState.AddTrackedObject(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); + // return the number of parameters + return 1; + } + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Object", wxLua_wxLuaObject_SetObject, 1, 1, s_wxluaargArray_None }, ! { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 198,222 **** int s_wxluatag_wxLuaPrintout = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; ! // %override wxLua_wxLuaPrintout_constructor ! // wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) ! static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaPrintout *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxLuaObject pObject = NULL ! wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); ! // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxT("Printout"))); ! // call constructor ! returns = new wxLuaPrintout(wxlState, title, pObject); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaPrintout *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); ! ! return 1; } --- 198,213 ---- int s_wxluatag_wxLuaPrintout = -1; ! #if wxLUA_USE_wxLuaPrintout ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } *************** *** 259,283 **** } ! static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, ! { LuaMethod, "Delete", wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }, }; --- 250,287 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 }; ! // %override wxLua_wxLuaPrintout_constructor ! // wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) ! static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaPrintout *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxLuaObject pObject = NULL ! wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); ! // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxT("Printout"))); ! // call constructor ! returns = new wxLuaPrintout(wxlState, title, pObject); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaPrintout *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); ! ! return 1; } + #endif // wxLUA_USE_wxLuaPrintout + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, ! { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, ! }; *************** *** 294,298 **** int s_wxluatag_wxLuaHtmlWindow = -1; - #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; --- 298,301 ---- *************** *** 334,341 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWindow_methods[] = { - #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) }; --- 337,343 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWindow_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) }; *************** *** 353,373 **** int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! // const wxHtmlTag *GetHtmlTag() const ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) { wxLuaState wxlState(L); - const wxHtmlTag *returns; - // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // call GetHtmlTag ! returns = (const wxHtmlTag *)self->GetHtmlTag(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns); ! ! return 1; } // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) --- 355,375 ---- int s_wxluatag_wxLuaHtmlWinTagEvent = -1; ! #if wxLUA_USE_wxLuaHtmlWindow ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } + #endif // wxLUA_USE_wxLuaHtmlWindow + + #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) *************** *** 385,407 **** } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; ! // void SetParseInnerCalled(bool fParseInnerCalled = true) ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool fParseInnerCalled = true ! bool fParseInnerCalled = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // call SetParseInnerCalled ! self->SetParseInnerCalled(fParseInnerCalled); ! return 0; } // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) --- 387,408 ---- } ! // const wxHtmlTag *GetHtmlTag() const ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) { wxLuaState wxlState(L); ! const wxHtmlTag *returns; // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // call GetHtmlTag ! returns = (const wxHtmlTag *)self->GetHtmlTag(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns); ! return 1; } + #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) + + #if wxLUA_USE_wxLuaHtmlWindow // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) *************** *** 419,452 **** } ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } return 0; } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) - { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, { LuaMethod, "GetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, s_wxluaargArray_None }, }; --- 420,470 ---- } ! #endif // wxLUA_USE_wxLuaHtmlWindow ! ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! ! #if wxLUA_USE_wxLuaHtmlWindow ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled[] = { &s_wxluaarg_Boolean, 0 }; ! // void SetParseInnerCalled(bool fParseInnerCalled = true) ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled(lua_State *L) { wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // bool fParseInnerCalled = true + bool fParseInnerCalled = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); + // get this wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! // call SetParseInnerCalled ! self->SetParseInnerCalled(fParseInnerCalled); ! return 0; } + #endif // wxLUA_USE_wxLuaHtmlWindow + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { + { LuaMethod, "Delete", wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, s_wxluaargArray_None }, #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) { LuaMethod, "GetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, ! ! #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML && wxUSE_HTML) ! { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, ! }; *************** *** 463,484 **** int s_wxluatag_wxLuaTreeItemData = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor[] = { &s_wxluaarg_Number, 0 }; ! // wxLuaTreeItemData(double value = 0) ! static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaTreeItemData *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // double value = 0 ! double value = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); ! // call constructor ! returns = new wxLuaTreeItemData(value); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaTreeItemData, returns); ! ! return 1; ! } ! // double GetValue() const; static int LUACALL wxLua_wxLuaTreeItemData_GetValue(lua_State *L) --- 481,485 ---- int s_wxluatag_wxLuaTreeItemData = -1; ! #if wxLUA_USE_wxTreeCtrl // double GetValue() const; static int LUACALL wxLua_wxLuaTreeItemData_GetValue(lua_State *L) *************** *** 511,523 **** } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaTreeItemData_methods[] = { - { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetValue", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }, - { LuaGetProp, "Value", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Value", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluaargArray_None }, }; --- 512,545 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor[] = { &s_wxluaarg_Number, 0 }; + // wxLuaTreeItemData(double value = 0) + static int LUACALL wxLua_wxLuaTreeItemData_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxLuaTreeItemData *returns; + // get number of arguments + int argCount = lua_gettop(L); + // double value = 0 + double value = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); + // call constructor + returns = new wxLuaTreeItemData(value); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxLuaTreeItemData, returns); + + return 1; + } + + #endif // wxLUA_USE_wxTreeCtrl + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaTreeItemData_methods[] = { { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetValue", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }, { LuaSetProp, "Value", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluaargArray_None }, + { LuaGetProp, "Value", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, + { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, + }; Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** image.cpp 15 Mar 2007 00:01:19 -0000 1.32 --- image.cpp 15 Mar 2007 23:24:54 -0000 1.33 *************** *** 35,38 **** --- 35,53 ---- int s_wxluatag_wxImage = -1; + #if wxLUA_USE_wxImage && wxUSE_IMAGE + static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_AddHandler[] = { &s_wxluatag_wxImageHandler, 0 }; + // static void AddHandler(wxImageHandler* handler) + static int LUACALL wxLua_wxImage_AddHandler(lua_State *L) + { + wxLuaState wxlState(L); + // wxImageHandler handler [...3133 lines suppressed...] ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) ! ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) ! { LuaMethod, "GetSizeHint", wxLua_wxArtProvider_GetSizeHint, 2, 1, s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) + #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + { LuaMethod, "Insert", wxLua_wxArtProvider_Insert, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Insert }, + #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "Pop", wxLua_wxArtProvider_Pop, 0, 0, s_wxluaargArray_None }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) { LuaMethod, "Push", wxLua_wxArtProvider_Push, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Push }, { LuaMethod, "Remove", wxLua_wxArtProvider_Remove, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Remove }, ! #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) }; Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mdi.cpp 15 Mar 2007 00:01:19 -0000 1.28 --- mdi.cpp 15 Mar 2007 23:24:55 -0000 1.29 *************** *** 53,125 **** int s_wxluatag_wxMDIParentFrame = -1; ! ! #if ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS) ! // %win wxMenu* GetWindowMenu() const ! static int LUACALL wxLua_wxMDIParentFrame_GetWindowMenu(lua_State *L) { wxLuaState wxlState(L); - wxMenu *returns; // get this [...3211 lines suppressed...] ! #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + { LuaMethod, "RemoveFileFromHistory", wxLua_wxFileHistory_RemoveFileFromHistory, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_RemoveFileFromHistory }, #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_RemoveMenu }, + #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) + + #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + { LuaMethod, "Save", wxLua_wxFileHistory_Save, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_Save }, + #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + + #if (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, s_wxluatagArray_wxLua_wxFileHistory_UseMenu }, ! #endif // (wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE) && (wxLUA_USE_wxMenu && wxUSE_MENUS) { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, s_wxluatagArray_wxLua_wxFileHistory_constructor }, ! }; Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** config.cpp 15 Mar 2007 00:01:14 -0000 1.31 --- config.cpp 15 Mar 2007 23:24:50 -0000 1.32 *************** *** 35,112 **** int s_wxluatag_wxConfigBase = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigGet_constructor[] = { &s_wxluaarg_Boolean, 0 }; ! // %override wxLua_wxConfigGet_constructor ! // %constructor wxConfigGet(bool CreateOnDemand = true) ! static int LUACALL wxLua_wxConfigGet_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxConfigBase *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool CreateOnDemand = true ! bool CreateOnDemand = (argCount >= 1 ? wxlState.GetBooleanType(1) : true); ! // call constructor ! returns = wxConfigBase::Get(CreateOnDemand); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); ! // return the number of parameters ! return 1; ! } ! ! // %override wxLua_wxConfigCreate_constructor ! // %constructor wxConfigCreate() ! static int LUACALL wxLua_wxConfigCreate_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxConfigBase *returns; ! // call constructor ! returns = wxConfigBase::Create(); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); ! // return the number of parameters ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigCreateFileConfig_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigCreateFileConfig_constructor ! // %constructor wxConfigCreateFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8) ! static int LUACALL wxLua_wxConfigCreateFileConfig_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxConfigBase *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE ! long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); ! // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); ! // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); ! // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); ! // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); ! // call constructor ! returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); ! wxConfigBase::Set(returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); ! // return the number of parameters ! return 1; ! } ! ! // %override wxLua_wxConfigBase_Destroy ! // void Destroy() ! static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get this ! wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); ! // call Destroy ! delete self; ! // return the number of parameters ! return 0; ! } ! // static wxConfigBase* Create() static int LUACALL wxLua_wxConfigBase_Create(lua_State *L) --- 35,39 ---- int s_wxluatag_wxConfigBase = -1; ! #if wxLUA_USE_wxConfig && wxUSE_CONFIG // static wxConfigBase* Create() static int LUACALL wxLua_wxConfigBase_Create(lua_State *L) *************** *** 122,135 **** } - // static void DontCreateOnDemand() - static int LUACALL wxLua_wxConfigBase_DontCreateOnDemand(lua_State *L) - { - wxLuaState wxlState(L); - // call DontCreateOnDemand - wxConfigBase::DontCreateOnDemand(); - - return 0; - } - // bool DeleteAll() static int LUACALL wxLua_wxConfigBase_DeleteAll(lua_State *L) --- 49,52 ---- *************** *** 187,190 **** --- 104,130 ---- } + // %override wxLua_wxConfigBase_Destroy + // void Destroy() + static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); + // call Destroy + delete self; + // return the number of parameters + return 0; + } + + // static void DontCreateOnDemand() + static int LUACALL wxLua_wxConfigBase_DontCreateOnDemand(lua_State *L) + { + wxLuaState wxlState(L); + // call DontCreateOnDemand + wxConfigBase::DontCreateOnDemand(); + + return 0; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Exists[] = { &s_wxluaarg_String, 0 }; // bool Exists(wxString& strName) const *************** *** 258,264 **** } ! // %override wxLua_wxConfigBase_GetFirstGroup ! // bool GetFirstGroup(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetFirstGroup(lua_State *L) { wxLuaState wxlState(L); --- 198,204 ---- } ! // %override wxLua_wxConfigBase_GetFirstEntry ! // bool GetFirstEntry(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetFirstEntry(lua_State *L) { wxLuaState wxlState(L); *************** *** 271,279 **** // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetFirstGroup ! returns = self->GetFirstGroup(str, index); // push the result number lua_pushboolean(L, returns); ! // push the result string wxlState.lua_PushString(str); // push the next index --- 211,219 ---- // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetFirstEntry ! returns = self->GetFirstEntry(str, index); // push the result number lua_pushboolean(L, returns); ! // push the next string wxlState.lua_PushString(str); // push the next index *************** *** 283,289 **** } ! // %override wxLua_wxConfigBase_GetFirstEntry ! // bool GetFirstEntry(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetFirstEntry(lua_State *L) { wxLuaState wxlState(L); --- 223,229 ---- } ! // %override wxLua_wxConfigBase_GetFirstGroup ! // bool GetFirstGroup(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetFirstGroup(lua_State *L) { wxLuaState wxlState(L); *************** *** 296,304 **** // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetFirstEntry ! returns = self->GetFirstEntry(str, index); // push the result number lua_pushboolean(L, returns); ! // push the next string wxlState.lua_PushString(str); // push the next index --- 236,244 ---- // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetFirstGroup ! returns = self->GetFirstGroup(str, index); // push the result number lua_pushboolean(L, returns); ! // push the result string wxlState.lua_PushString(str); // push the next index *************** *** 308,317 **** } ! // %override wxLua_wxConfigBase_GetNextGroup ! // bool GetNextGroup(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetNextGroup(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // only the number is needed long index = (long)wxlState.GetNumberType(2); --- 248,258 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_GetNextEntry[] = { &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_GetNextEntry ! // bool GetNextEntry(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetNextEntry(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // only the number is needed long index = (long)wxlState.GetNumberType(2); *************** *** 319,327 **** // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetNextGroup ! returns = self->GetNextGroup(str, index); // push the result number lua_pushboolean(L, returns); ! // push the next result string wxlState.lua_PushString(str); // push the next index --- 260,268 ---- // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetNextEntry ! returns = self->GetNextEntry(str, index); // push the result number lua_pushboolean(L, returns); ! // push the result string wxlState.lua_PushString(str); // push the next index *************** *** 331,341 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_GetNextEntry[] = { &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_GetNextEntry ! // bool GetNextEntry(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetNextEntry(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // only the number is needed long index = (long)wxlState.GetNumberType(2); --- 272,281 ---- } ! // %override wxLua_wxConfigBase_GetNextGroup ! // bool GetNextGroup(wxString& str, long& index) const ! static int LUACALL wxLua_wxConfigBase_GetNextGroup(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // only the number is needed long index = (long)wxlState.GetNumberType(2); *************** *** 343,351 **** // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetNextEntry ! returns = self->GetNextEntry(str, index); // push the result number lua_pushboolean(L, returns); ! // push the result string wxlState.lua_PushString(str); // push the next index --- 283,291 ---- // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); ! // call GetNextGroup ! returns = self->GetNextGroup(str, index); // push the result number lua_pushboolean(L, returns); ! // push the next result string wxlState.lua_PushString(str); // push the next index *************** *** 516,530 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_ReadInt ! // %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L) { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); // double defaultVal = 0 ! long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); --- 456,470 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_ReadFloat ! // %rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadFloat(lua_State *L) { wxLuaState wxlState(L); ! double returns = 0; // get number of arguments int argCount = lua_gettop(L); // double defaultVal = 0 ! double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); *************** *** 541,555 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_ReadFloat ! // %rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadFloat(lua_State *L) { wxLuaState wxlState(L); ! double returns = 0; // get number of arguments int argCount = lua_gettop(L); // double defaultVal = 0 ! double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); --- 481,495 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxConfigBase_ReadInt ! // %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L) { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); // double defaultVal = 0 ! long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); *************** *** 693,704 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %rename WriteInt bool Write(const wxString &key, long value) ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // long value ! long value = (long)wxlState.GetNumberType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); --- 633,644 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %rename WriteFloat bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // double value ! double value = (double)wxlState.GetNumberType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); *************** *** 713,724 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %rename WriteFloat bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // double value ! double value = (double)wxlState.GetNumberType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); --- 653,664 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %rename WriteInt bool Write(const wxString &key, long value) ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // long value ! long value = (long)wxlState.GetNumberType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); *************** *** 733,757 **** } // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { ! { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, s_wxluatagArray_wxLua_wxConfigGet_constructor }, ! { LuaConstructor, "wxConfigCreate", wxLua_wxConfigCreate_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxConfigCreateFileConfig", wxLua_wxConfigCreateFileConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxConfigCreateFileConfig_constructor }, ! { LuaMethod, "Destroy", wxLua_wxConfigBase_Destroy, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Create", wxLua_wxConfigBase_Create, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "DontCreateOnDemand", wxLua_wxConfigBase_DontCreateOnDemand, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DeleteAll", wxLua_wxConfigBase_DeleteAll, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DeleteEntry", wxLua_wxConfigBase_DeleteEntry, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_DeleteEntry }, { LuaMethod, "DeleteGroup", wxLua_wxConfigBase_DeleteGroup, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_DeleteGroup }, { LuaMethod, "Exists", wxLua_wxConfigBase_Exists, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_Exists }, { LuaMethod, "Flush", wxLua_wxConfigBase_Flush, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_Flush }, { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_GetEntryType }, - { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_GetNextEntry }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_GetNumberOfEntries }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_GetNumberOfGroups }, --- 673,758 ---- } + // %override wxLua_wxConfigCreate_constructor + // %constructor wxConfigCreate() + static int LUACALL wxLua_wxConfigCreate_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigBase *returns; + // call constructor + returns = wxConfigBase::Create(); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); + // return the number of parameters + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigCreateFileConfig_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + // %override wxLua_wxConfigCreateFileConfig_constructor + // %constructor wxConfigCreateFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8) + static int LUACALL wxLua_wxConfigCreateFileConfig_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigBase *returns; + // get number of arguments + int argCount = lua_gettop(L); + // long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE + long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); + // const wxString& globalFilename = "" + wxString globalFilename = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); + // const wxString& localFilename = "", + wxString localFilename = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); + // const wxString& vendorName = "" + wxString vendorName = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); + // const wxString& appName = "" + wxString appName = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); + // call constructor + returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); + wxConfigBase::Set(returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); + // return the number of parameters + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigGet_constructor[] = { &s_wxluaarg_Boolean, 0 }; + // %override wxLua_wxConfigGet_constructor + // %constructor wxConfigGet(bool CreateOnDemand = true) + static int LUACALL wxLua_wxConfigGet_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigBase *returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool CreateOnDemand = true + bool CreateOnDemand = (argCount >= 1 ? wxlState.GetBooleanType(1) : true); + // call constructor + returns = wxConfigBase::Get(CreateOnDemand); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxConfig, returns); + // return the number of parameters + return 1; + } + + #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { ! { LuaGetProp, "AppName", wxLua_wxConfigBase_GetAppName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Create", wxLua_wxConfigBase_Create, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DeleteAll", wxLua_wxConfigBase_DeleteAll, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DeleteEntry", wxLua_wxConfigBase_DeleteEntry, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_DeleteEntry }, { LuaMethod, "DeleteGroup", wxLua_wxConfigBase_DeleteGroup, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_DeleteGroup }, + { LuaMethod, "Destroy", wxLua_wxConfigBase_Destroy, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "DontCreateOnDemand", wxLua_wxConfigBase_DontCreateOnDemand, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Exists", wxLua_wxConfigBase_Exists, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_Exists }, { LuaMethod, "Flush", wxLua_wxConfigBase_Flush, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_Flush }, { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_GetEntryType }, { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_GetNextEntry }, + { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_GetNumberOfEntries }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_GetNumberOfGroups }, *************** *** 762,768 **** { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, s_wxluaargArray_None }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Read", wxLua_wxConfigBase_Read, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_Read }, - { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_ReadInt }, { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_ReadFloat }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_RenameEntry }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_RenameGroup }, --- 763,771 ---- { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, s_wxluaargArray_None }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, s_wxluaargArray_None }, + { LuaSetProp, "Path", wxLua_wxConfigBase_SetPath, 1, 1, s_wxluaargArray_None }, + { LuaGetProp, "Path", wxLua_wxConfigBase_GetPath, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Read", wxLua_wxConfigBase_Read, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_Read }, { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_ReadFloat }, + { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 2, 1, s_wxluatagArray_wxLua_wxConfigBase_ReadInt }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_RenameEntry }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_RenameGroup }, *************** *** 771,781 **** { LuaMethod, "SetPath", wxLua_wxConfigBase_SetPath, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_SetPath }, { LuaMethod, "SetRecordDefaults", wxLua_wxConfigBase_SetRecordDefaults, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_SetRecordDefaults }, { LuaMethod, "Write", wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }, - { LuaMethod, "WriteInt", wxLua_wxConfigBase_WriteInt, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteInt }, { LuaMethod, "WriteFloat", wxLua_wxConfigBase_WriteFloat, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteFloat }, ! { LuaGetProp, "AppName", wxLua_wxConfigBase_GetAppName, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "VendorName", wxLua_wxConfigBase_GetVendorName, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "Path", wxLua_wxConfigBase_GetPath, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Path", wxLua_wxConfigBase_SetPath, 1, 1, s_wxluaargArray_None }, }; --- 774,785 ---- { LuaMethod, "SetPath", wxLua_wxConfigBase_SetPath, 1, 1, s_wxluatagArray_wxLua_wxConfigBase_SetPath }, { LuaMethod, "SetRecordDefaults", wxLua_wxConfigBase_SetRecordDefaults, 1, 0, s_wxluatagArray_wxLua_wxConfigBase_SetRecordDefaults }, + { LuaGetProp, "VendorName", wxLua_wxConfigBase_GetVendorName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Write", wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }, { LuaMethod, "WriteFloat", wxLua_wxConfigBase_WriteFloat, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteFloat }, ! { LuaMethod, "WriteInt", wxLua_wxConfigBase_WriteInt, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteInt }, ! { LuaConstructor, "wxConfigCreate", wxLua_wxConfigCreate_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxConfigCreateFileConfig", wxLua_wxConfigCreateFileConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxConfigCreateFileConfig_constructor }, ! { LuaConstructor, "wxConfigGet", wxLua_wxConfigGet_constructor, 1, 0, s_wxluatagArray_wxLua_wxConfigGet_constructor }, ! }; *************** *** 792,795 **** --- 796,800 ---- int s_wxluatag_wxConfig = -1; + #if wxLUA_USE_wxConfig && wxUSE_CONFIG static wxLuaArgTag s_wxluatagArray_wxLua_wxConfig_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // wxConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = 0) *************** *** 818,821 **** --- 823,828 ---- } + #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + *************** *** 823,826 **** --- 830,834 ---- WXLUAMETHOD wxConfig_methods[] = { { LuaConstructor, "wxConfig", wxLua_wxConfig_constructor, 5, 0, s_wxluatagArray_wxLua_wxConfig_constructor }, + }; *************** *** 837,840 **** --- 845,864 ---- int s_wxluatag_wxFileConfig = -1; + #if wxLUA_USE_wxConfig && wxUSE_CONFIG + static wxLuaArgTag s_wxluatagArray_wxLua_wxFileConfig_SetUmask[] = { &s_wxluaarg_Number, 0 }; + // void SetUmask(int mode) + static int LUACALL wxLua_wxFileConfig_SetUmask(lua_State *L) + { + wxLuaState wxlState(L); + // int mode + int mode = (int)wxlState.GetNumberType(2); + // get this + wxFileConfig * self = (wxFileConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxFileConfig); + // call SetUmask + self->SetUmask(mode); + + return 0; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxFileConfig_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // wxFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8) *************** *** 863,880 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileConfig_SetUmask[] = { &s_wxluaarg_Number, 0 }; ! // void SetUmask(int mode) ! static int LUACALL wxLua_wxFileConfi... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluasocket_bind.cpp 26 Feb 2007 01:57:07 -0000 1.13 --- wxluasocket_bind.cpp 15 Mar 2007 23:24:58 -0000 1.14 *************** *** 46,50 **** // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluasocket() is called to register defines and enums // --------------------------------------------------------------------------- --- 46,50 ---- // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluasocket() is called to register %define and %enum // --------------------------------------------------------------------------- *************** *** 53,63 **** static WXLUADEFINE defineList[] = { - // ------------------------------------------------------------------- - // %define - // ------------------------------------------------------------------- - - // ------------------------------------------------------------------- - // %enum - // ------------------------------------------------------------------- { 0, 0 }, --- 53,56 ---- *************** *** 69,73 **** // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluasocket() is called to register strings // --------------------------------------------------------------------------- --- 62,66 ---- // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluasocket() is called to register %define %string // --------------------------------------------------------------------------- *************** *** 76,82 **** static WXLUASTRING stringList[] = { - // ------------------------------------------------------------------- - // %define %string - // ------------------------------------------------------------------- { 0, 0 }, --- 69,72 ---- *************** *** 94,97 **** --- 84,88 ---- static WXLUAOBJECT objectList[] = { + { 0, 0, 0, 0 }, }; *************** *** 112,115 **** --- 103,107 ---- static WXLUAMETHOD functionList[] = { + { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; *************** *** 130,133 **** --- 122,126 ---- { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL }, { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL }, + { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 139,143 **** // --------------------------------------------------------------------------- ! // wxLuaGetClassList_wxluasocket() is called to register classes // --------------------------------------------------------------------------- --- 132,136 ---- // --------------------------------------------------------------------------- ! // wxLuaBinding_wxluasocket() - the binding class // --------------------------------------------------------------------------- Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluasocket.cpp 15 Mar 2007 00:01:26 -0000 1.18 --- wxluasocket.cpp 15 Mar 2007 23:24:58 -0000 1.19 *************** *** 27,57 **** int s_wxluatag_wxLuaDebuggerServer = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; ! // wxLuaDebuggerServer(int portNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaDebuggerServer *returns; ! // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); ! // call constructor ! returns = new wxLuaDebuggerServer(portNumber); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaDebuggerServer *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); ! ! return 1; ! } ! ! // bool StartServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartServer ! returns = self->StartServer(); // push the result flag lua_pushboolean(L, returns); --- 27,44 ---- int s_wxluatag_wxLuaDebuggerServer = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // bool AddBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { wxLuaState wxlState(L); bool returns; + // int lineNumber + int lineNumber = (int)wxlState.GetNumberType(3); + // const wxString fileName + const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call AddBreakPoint ! returns = self->AddBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); *************** *** 60,65 **** } ! // bool StopServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { wxLuaState wxlState(L); --- 47,52 ---- } ! // bool Break() ! static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { wxLuaState wxlState(L); *************** *** 67,72 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StopServer ! returns = self->StopServer(); // push the result flag lua_pushboolean(L, returns); --- 54,59 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Break ! returns = self->Break(); // push the result flag lua_pushboolean(L, returns); *************** *** 75,107 **** } ! // long StartClient() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartClient ! returns = self->StartClient(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // bool AddBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { wxLuaState wxlState(L); bool returns; - // int lineNumber - int lineNumber = (int)wxlState.GetNumberType(3); - // const wxString fileName - const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call AddBreakPoint ! returns = self->AddBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); --- 62,89 ---- } ! // bool ClearAllBreakPoints() ! static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call ClearAllBreakPoints ! returns = self->ClearAllBreakPoints(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Continue() ! static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Continue ! returns = self->Continue(); // push the result flag lua_pushboolean(L, returns); *************** *** 110,162 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { wxLuaState wxlState(L); - bool returns; - // int lineNumber - int lineNumber = (int)wxlState.GetNumberType(3); - // const wxString fileName - const wxString fileName = wxlState.GetwxStringType(2); - // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call RemoveBreakPoint ! returns = self->RemoveBreakPoint(fileName, lineNumber); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; } ! // bool ClearAllBreakPoints() ! static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call ClearAllBreakPoints ! returns = self->ClearAllBreakPoints(); ! // push the result flag ! lua_pushboolean(L, returns); ! return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! // bool Run(const wxString &file, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(3); ! // const wxString file ! const wxString file = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Run ! returns = self->Run(file, fileName); // push the result flag lua_pushboolean(L, returns); --- 92,141 ---- } ! static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; ! // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) ! static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call DisplayStackDialog ! self->DisplayStackDialog(pParent, id); ! return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // bool EvaluateExpr(int exprRef, const wxString &expr) ! static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // const wxString expr ! const wxString expr = wxlState.GetwxStringType(3); ! // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call EvaluateExpr ! returns = self->EvaluateExpr(exprRef, expr); // push the result flag lua_pushboolean(L, returns); *************** *** 165,215 **** } ! // bool Step() ! static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Step ! returns = self->Step(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOver() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOver ! returns = self->StepOver(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOut() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOut ! returns = self->StepOut(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Continue() ! static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { wxLuaState wxlState(L); --- 144,190 ---- } ! // long GetDebuggeeProcessId() const ! static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call GetDebuggeeProcessId ! returns = self->GetDebuggeeProcessId(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // static wxString GetNetworkName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetNetworkName ! returns = wxLuaDebuggerServer::GetNetworkName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // static wxString GetProgramName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetProgramName ! returns = wxLuaDebuggerServer::GetProgramName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // bool KillDebuggee() ! static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { wxLuaState wxlState(L); *************** *** 217,222 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Continue ! returns = self->Continue(); // push the result flag lua_pushboolean(L, returns); --- 192,197 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call KillDebuggee ! returns = self->KillDebuggee(); // push the result flag lua_pushboolean(L, returns); *************** *** 225,237 **** } ! // bool Break() ! static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Break ! returns = self->Break(); // push the result flag lua_pushboolean(L, returns); --- 200,217 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { wxLuaState wxlState(L); bool returns; + // int lineNumber + int lineNumber = (int)wxlState.GetNumberType(3); + // const wxString fileName + const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call RemoveBreakPoint ! returns = self->RemoveBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); *************** *** 255,272 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // bool EvaluateExpr(int exprRef, const wxString &expr) ! static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // const wxString expr ! const wxString expr = wxlState.GetwxStringType(3); ! // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call EvaluateExpr ! returns = self->EvaluateExpr(exprRef, expr); // push the result flag lua_pushboolean(L, returns); --- 235,252 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! // bool Run(const wxString &file, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(3); ! // const wxString file ! const wxString file = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Run ! returns = self->Run(file, fileName); // push the result flag lua_pushboolean(L, returns); *************** *** 275,314 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; ! // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) ! static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call DisplayStackDialog ! self->DisplayStackDialog(pParent, id); ! return 0; } ! // long GetDebuggeeProcessId() const ! static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call GetDebuggeeProcessId ! returns = self->GetDebuggeeProcessId(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // bool KillDebuggee() ! static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { wxLuaState wxlState(L); --- 255,290 ---- } ! // long StartClient() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartClient ! returns = self->StartClient(); ! // push the result number ! lua_pushnumber(L, returns); ! return 1; } ! // bool StartServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartServer ! returns = self->StartServer(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Step() ! static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { wxLuaState wxlState(L); *************** *** 316,321 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call KillDebuggee ! returns = self->KillDebuggee(); // push the result flag lua_pushboolean(L, returns); --- 292,297 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Step ! returns = self->Step(); // push the result flag lua_pushboolean(L, returns); *************** *** 324,364 **** } ! // static wxString GetProgramName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetProgramName ! returns = wxLuaDebuggerServer::GetProgramName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // static wxString GetNetworkName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetNetworkName ! returns = wxLuaDebuggerServer::GetNetworkName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } --- 300,364 ---- } ! // bool StepOut() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOut ! returns = self->StepOut(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOver() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOver ! returns = self->StepOver(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StopServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { wxLuaState wxlState(L); + bool returns; + // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StopServer ! returns = self->StopServer(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; ! // wxLuaDebuggerServer(int portNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaDebuggerServer *returns; ! // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); ! // call constructor ! returns = new wxLuaDebuggerServer(portNumber); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaDebuggerServer *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); ! ! return 1; } *************** *** 367,391 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { - { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, - { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, - { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, }; --- 367,391 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, + { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, }; *************** *** 399,443 **** int s_wxluatag_wxLuaDebuggerEvent = -1; ! // int GetLineNumber() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); - int returns; - // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetLineNumber ! returns = self->GetLineNumber(); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } ! // int GetReference() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); ! int returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetReference ! returns = self->GetReference(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // wxString GetFileName() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetFileName ! returns = self->GetFileName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; --- 399,441 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; ! static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } ! // wxString GetFileName() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetFileName ! returns = self->GetFileName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // int GetLineNumber() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); ! int returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetLineNumber ! returns = self->GetLineNumber(); ! // push the result number ! lua_pushnumber(L, returns); return 1; *************** *** 459,473 **** } ! static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } --- 457,473 ---- } ! // int GetReference() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); + int returns; + // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetReference ! returns = self->GetReference(); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } *************** *** 476,484 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, }; --- 476,484 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, }; |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxstc_bind.cpp 26 Feb 2007 01:57:06 -0000 1.18 --- wxstc_bind.cpp 15 Mar 2007 23:24:58 -0000 1.19 *************** *** 28,35 **** static WXLUAEVENT eventList[] = { - #if !wxCHECK_VERSION(2,5,0) - { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, - #endif // !wxCHECK_VERSION(2,5,0) - { &wxEVT_STC_AUTOCOMP_SELECTION, "wxEVT_STC_AUTOCOMP_SELECTION", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CALLTIP_CLICK, "wxEVT_STC_CALLTIP_CLICK", &s_wxluatag_wxStyledTextEvent }, --- 28,31 ---- *************** *** 49,52 **** --- 45,53 ---- { &wxEVT_STC_NEEDSHOWN, "wxEVT_STC_NEEDSHOWN", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_PAINTED, "wxEVT_STC_PAINTED", &s_wxluatag_wxStyledTextEvent }, + + #if !wxCHECK_VERSION(2,5,0) + { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, + #endif // !wxCHECK_VERSION(2,5,0) + { &wxEVT_STC_ROMODIFYATTEMPT, "wxEVT_STC_ROMODIFYATTEMPT", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_SAVEPOINTLEFT, "wxEVT_STC_SAVEPOINTLEFT", &s_wxluatag_wxStyledTextEvent }, *************** *** 66,70 **** // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called to register defines and enums // --------------------------------------------------------------------------- --- 67,71 ---- // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called to register %define and %enum // --------------------------------------------------------------------------- *************** *** 73,108 **** static WXLUADEFINE defineList[] = { - // ------------------------------------------------------------------- - // %define - // ------------------------------------------------------------------- - - #if !wxCHECK_VERSION(2,5,0) - { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, - { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, - { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, - { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, - { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, - { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, - { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, - { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, - { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, - { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, - { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, - { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, - { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, - { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, - { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, - { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, - { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, - { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, - { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, - { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, - #endif // !wxCHECK_VERSION(2,5,0) - - #if !wxCHECK_VERSION(2,7,0) - { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, - { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, - #endif // !wxCHECK_VERSION(2,7,0) - { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, { "wxSTC_ADA_CHARACTEREOL", wxSTC_ADA_CHARACTEREOL }, --- 74,77 ---- *************** *** 772,775 **** --- 741,749 ---- { "wxSTC_LEX_ASM", wxSTC_LEX_ASM }, { "wxSTC_LEX_ASN1", wxSTC_LEX_ASN1 }, + + #if !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, + #endif // !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_AU3", wxSTC_LEX_AU3 }, { "wxSTC_LEX_AUTOMATIC", wxSTC_LEX_AUTOMATIC }, *************** *** 820,823 **** --- 794,802 ---- { "wxSTC_LEX_PASCAL", wxSTC_LEX_PASCAL }, { "wxSTC_LEX_PERL", wxSTC_LEX_PERL }, + + #if !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, + #endif // !wxCHECK_VERSION(2,7,0) + { "wxSTC_LEX_PHPSCRIPT", wxSTC_LEX_PHPSCRIPT }, { "wxSTC_LEX_POV", wxSTC_LEX_POV }, *************** *** 1197,1200 **** --- 1176,1273 ---- { "wxSTC_SCMOD_NORM", wxSTC_SCMOD_NORM }, { "wxSTC_SCMOD_SHIFT", wxSTC_SCMOD_SHIFT }, + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, + { "wxSTC_SCRIPTOL_COMMENTBASIC", wxSTC_SCRIPTOL_COMMENTBASIC }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTDOC", wxSTC_SCRIPTOL_COMMENTDOC }, + { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORD", wxSTC_SCRIPTOL_COMMENTDOCKEYWORD }, + { "wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR", wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, + #endif // !wxCHECK_VERSION(2,5,0) + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_COMMENTLINEDOC", wxSTC_SCRIPTOL_COMMENTLINEDOC }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, + { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, + { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, + { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, + #endif // !wxCHECK_VERSION(2,5,0) + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_REGEX", wxSTC_SCRIPTOL_REGEX }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, + #elif !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, + #endif // !wxCHECK_VERSION(2,5,0) + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_UUID", wxSTC_SCRIPTOL_UUID }, + { "wxSTC_SCRIPTOL_VERBATIM", wxSTC_SCRIPTOL_VERBATIM }, + #endif // !wxCHECK_VERSION(2,5,0) + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, + #endif // wxCHECK_VERSION(2,5,0) + + #if !wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, + { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, + #endif // !wxCHECK_VERSION(2,5,0) + { "wxSTC_SEL_LINES", wxSTC_SEL_LINES }, { "wxSTC_SEL_RECTANGLE", wxSTC_SEL_RECTANGLE }, *************** *** 1358,1384 **** { "wxSTC_YAML_TEXT", wxSTC_YAML_TEXT }, - #if wxCHECK_VERSION(2,5,0) - { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, - { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, - { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, - { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, - { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, - { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, - { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, - { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, - { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, - { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, - { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, - { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, - { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, - { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, - { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, - { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, - #endif // wxCHECK_VERSION(2,5,0) - - // ------------------------------------------------------------------- - // %enum - // ------------------------------------------------------------------- - { 0, 0 }, }; --- 1431,1434 ---- *************** *** 1389,1393 **** // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxstc() is called to register strings // --------------------------------------------------------------------------- --- 1439,1443 ---- // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxstc() is called to register %define %string // --------------------------------------------------------------------------- *************** *** 1396,1402 **** static WXLUASTRING stringList[] = { - // ------------------------------------------------------------------- - // %define %string - // ------------------------------------------------------------------- { 0, 0 }, --- 1446,1449 ---- *************** *** 1414,1417 **** --- 1461,1465 ---- static WXLUAOBJECT objectList[] = { + { 0, 0, 0, 0 }, }; *************** *** 1432,1435 **** --- 1480,1484 ---- static WXLUAMETHOD functionList[] = { + { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; *************** *** 1450,1453 **** --- 1499,1503 ---- { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl", NULL }, { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent", NULL }, + { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 1459,1463 **** // --------------------------------------------------------------------------- ! // wxLuaGetClassList_wxstc() is called to register classes // --------------------------------------------------------------------------- --- 1509,1513 ---- // --------------------------------------------------------------------------- ! // wxLuaBinding_wxstc() - the binding class // --------------------------------------------------------------------------- Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** stc.cpp 15 Mar 2007 00:01:24 -0000 1.28 --- stc.cpp 15 Mar 2007 23:24:57 -0000 1.29 *************** *** 27,138 **** int s_wxluatag_wxStyledTextCtrl = -1; ! ! #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) ! // %wxchkver_2_7_1 wxColour GetCaretLineBackground(); ! static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxColour *returns; ! // get this [...15879 lines suppressed...] + { LuaMethod, "SetMessage", wxLua_wxStyledTextEvent_SetMessage, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetMessage }, + { LuaMethod, "SetModificationType", wxLua_wxStyledTextEvent_SetModificationType, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetModificationType }, + { LuaMethod, "SetModifiers", wxLua_wxStyledTextEvent_SetModifiers, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetModifiers }, + { LuaMethod, "SetPosition", wxLua_wxStyledTextEvent_SetPosition, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetPosition }, + { LuaMethod, "SetText", wxLua_wxStyledTextEvent_SetText, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetText }, + { LuaMethod, "SetWParam", wxLua_wxStyledTextEvent_SetWParam, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetWParam }, + { LuaMethod, "SetX", wxLua_wxStyledTextEvent_SetX, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetX }, + { LuaMethod, "SetY", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetY }, + { LuaGetProp, "Shift", wxLua_wxStyledTextEvent_GetShift, 0, 0, s_wxluaargArray_None }, + { LuaGetProp, "Text", wxLua_wxStyledTextEvent_GetText, 0, 0, s_wxluaargArray_None }, + { LuaSetProp, "Text", wxLua_wxStyledTextEvent_SetText, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "WParam", wxLua_wxStyledTextEvent_GetWParam, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "WParam", wxLua_wxStyledTextEvent_SetWParam, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "X", wxLua_wxStyledTextEvent_GetX, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "X", wxLua_wxStyledTextEvent_SetX, 1, 1, s_wxluaargArray_None }, { LuaGetProp, "Y", wxLua_wxStyledTextEvent_GetY, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluaargArray_None }, ! { LuaConstructor, "wxStyledTextEvent", wxLua_wxStyledTextEvent_constructor, 2, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_constructor }, }; |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluasocket_bind.h 15 Mar 2007 00:01:26 -0000 1.13 --- wxluasocket_bind.h 15 Mar 2007 23:24:58 -0000 1.14 *************** *** 64,81 **** // --------------------------------------------------------------------------- ! // Lua Tag Method Values for each Class // --------------------------------------------------------------------------- extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent; - extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; - - - - // --------------------------------------------------------------------------- - // Method Tables - // --------------------------------------------------------------------------- - extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; --- 64,74 ---- // --------------------------------------------------------------------------- ! // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; *************** *** 84,88 **** // --------------------------------------------------------------------------- ! // Encapsulation Declarations // --------------------------------------------------------------------------- --- 77,81 ---- // --------------------------------------------------------------------------- ! // Encapsulation Declarations - need to be public for other bindings. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 23:25:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxbind.h 15 Mar 2007 00:01:24 -0000 1.19 --- wxbind.h 15 Mar 2007 23:24:57 -0000 1.20 *************** *** 59,76 **** // --------------------------------------------------------------------------- ! // Lua Tag Method Values for each Class // --------------------------------------------------------------------------- extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl; - extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; - - - - // --------------------------------------------------------------------------- - // Method Tables - // --------------------------------------------------------------------------- - extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; --- 59,69 ---- // --------------------------------------------------------------------------- ! // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl; extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD wxStyledTextEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; *************** *** 79,83 **** // --------------------------------------------------------------------------- ! // Encapsulation Declarations // --------------------------------------------------------------------------- --- 72,76 ---- // --------------------------------------------------------------------------- ! // Encapsulation Declarations - need to be public for other bindings. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 14:21:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4972/wxbind/include Modified Files: wxbinddefs.h Log Message: hack for wxFILE_SEP_PATH being a wxChar wxT('') and not a wxChar* wxT("") Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbinddefs.h 21 May 2006 19:16:59 -0000 1.2 --- wxbinddefs.h 15 Mar 2007 14:21:19 -0000 1.3 *************** *** 16,19 **** --- 16,32 ---- // ---------------------------------------------------------------------------- + // Convert from wxWidgets wxT('') to wxT(""), a string. Copied from wx/filefn.h + + // platform independent versions + #if defined(__UNIX__) && !defined(__OS2__) + // CYGWIN also uses UNIX settings + #define wxLua_FILE_SEP_PATH wxT("/") + #elif defined(__MAC__) + #define wxLua_FILE_SEP_PATH wxT(":") + #else // Windows and OS/2 + #define wxLua_FILE_SEP_PATH wxT("\\") + #endif // Unix/Windows + + // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-03-15 14:20:24
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4462/bindings Modified Files: genwxbind.lua Log Message: remove duplicate entries in .i files start to sort the binding items in the structs alphabetically Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** genwxbind.lua 15 Mar 2007 00:01:09 -0000 1.106 --- genwxbind.lua 15 Mar 2007 14:20:13 -0000 1.107 *************** *** 36,48 **** enumBindingTable = {} -- table[#if condition][enum name] = { Map, Condition } defineBindingTable = {} -- table[#if condition][define name] = { Map, Condition } - defineIncludeBindingTable = {} -- table[#if condition][define name] = { Map, Condition } stringBindingTable = {} -- table[#if condition][string name] = { Map, Condition } objectBindingTable = {} -- table[#if condition][object name] = { Map, Condition } - objectTagBindingTable = {} - objectIncludeBindingTable = {} pointerBindingTable = {} eventBindingTable = {} - eventTagBindingTable = {} - eventIncludeBindingTable = {} functionBindingTable = {} classBindingTable = {} --- 36,43 ---- *************** *** 109,112 **** --- 104,119 ---- -- --------------------------------------------------------------------------- + -- Sort the table and return it as an numerically indexed table array + -- --------------------------------------------------------------------------- + function TableSort(atable, comp_func) + local a = {} + for k, v in pairs(atable) do table.insert(a, k) end + table.sort(a, comp_func) + local b = {} + for n = 1, #a do table.insert(b, atable[a[n]]) end + return b + end + + -- --------------------------------------------------------------------------- -- Completely dump the contents of a table -- atable is the input table to dump the contents of *************** *** 598,601 **** --- 605,619 ---- -- --------------------------------------------------------------------------- + -- Fix the condition to be uniform, "1" means none + -- --------------------------------------------------------------------------- + function FixCondition(condition) + if not HasCondition(condition) then + return "1" + end + + return condition + end + + -- --------------------------------------------------------------------------- -- Build condition string using condition stack (number indexed lua table) -- --------------------------------------------------------------------------- *************** *** 2606,2610 **** -- end ! local includecondition = parseObject.Condition or "1" local includeBinding = { --- 2624,2628 ---- -- end ! local includecondition = FixCondition(parseObject.Condition) local includeBinding = { *************** *** 2629,2633 **** -- encapsulate non-wxObject objects with a tracked wxObject if parseObject.Encapsulate then ! local encapcondition = parseObject.Condition or "1" local encapsulationBinding = { --- 2647,2651 ---- -- encapsulate non-wxObject objects with a tracked wxObject if parseObject.Encapsulate then ! local encapcondition = FixCondition(parseObject.Condition) local encapsulationBinding = { *************** *** 2645,2649 **** local member = parseObject.Members[m] ! local fullcondition = AddCondition(member.Condition, member.ExtraCondition) or "1" -- /////////////////////////////////////////////////////////////// --- 2663,2667 ---- local member = parseObject.Members[m] ! local fullcondition = FixCondition(AddCondition(member.Condition, member.ExtraCondition)) -- /////////////////////////////////////////////////////////////// *************** *** 2676,2680 **** propertycondition = AddCondition(propertycondition, condition) end ! if not propertycondition then propertycondition = "1" end -- read property --- 2694,2698 ---- propertycondition = AddCondition(propertycondition, condition) end ! propertycondition = FixCondition(propertycondition) -- read property *************** *** 2682,2685 **** --- 2700,2704 ---- local propertyBinding = { + Name = member.Name, Map = " { LuaGetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 0, 0, s_wxluaargArray_None },\n", Condition = propertycondition *************** *** 2694,2697 **** --- 2713,2717 ---- local propertyBinding = { + Name = member.Name, Map = " { LuaSetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1, 1, s_wxluaargArray_None },\n", Condition = propertycondition *************** *** 2734,2738 **** membercondition = AddCondition(membercondition, condition) end ! if not membercondition then membercondition = "1" end -- GET MEMBER CODE --- 2754,2758 ---- membercondition = AddCondition(membercondition, condition) end ! membercondition = FixCondition(membercondition) -- GET MEMBER CODE *************** *** 2865,2869 **** table.insert(interface.objectData[o].BindTable[membercondition], propertyBinding) ! -- ////////////////////////////////////////////////////////////////////////////////// -- enum binding elseif member.DefType == "enum" then --- 2885,2889 ---- table.insert(interface.objectData[o].BindTable[membercondition], propertyBinding) ! -- /////////////////////////////////////////////////////////////// -- enum binding elseif member.DefType == "enum" then *************** *** 2891,2902 **** local enumBinding = { Map = " { \""..luaname.."\", "..namespace..member.Name.." },\n", Condition = fullcondition } ! if not enumBindingTable[fullcondition] then enumBindingTable[fullcondition] = {} end ! enumBindingTable[fullcondition][member.Name] = enumBinding ! -- ////////////////////////////////////////////////////////////////////////////////// -- define binding elseif member.DefType == "define" then --- 2911,2928 ---- local enumBinding = { + Name = luaname, Map = " { \""..luaname.."\", "..namespace..member.Name.." },\n", Condition = fullcondition } ! if enumBindingTable[member.Name] then ! print("Warning: '"..member.Name.."' already has an %enum binding!") ! print(TableDump(enumBindingTable[member.Name], "Old: ")) ! print(TableDump(enumBinding, "New: ")) ! end ! enumBindingTable[luaname] = enumBinding -- overwrite it anyway ! ! -- /////////////////////////////////////////////////////////////// -- define binding elseif member.DefType == "define" then *************** *** 2904,2944 **** local defineBinding = { Map = " { \""..member.Name.."\", "..value.." },\n", Condition = fullcondition } ! if not defineBindingTable[fullcondition] then defineBindingTable[fullcondition] = {} end ! defineBindingTable[fullcondition][member.Name] = defineBinding ! ! -- Define Includes ! for condition, includeBindingList in pairs(interface.includeBindingTable) do ! if not defineIncludeBindingTable[condition] then defineIncludeBindingTable[condition] = {} end ! ! for idx, includeBinding in pairs(includeBindingList) do ! defineIncludeBindingTable[condition][idx] = includeBinding ! end end ! -- ////////////////////////////////////////////////////////////////////////////////// -- define string binding elseif member.DefType == "define_string" then local value = member.Value or member.Name ! local definestringBinding = { Map = " { \""..member.Name.."\", "..value.." },\n", Condition = fullcondition } ! if not stringBindingTable[fullcondition] then stringBindingTable[fullcondition] = {} end ! stringBindingTable[fullcondition][member.Name] = definestringBinding ! ! -- Define Includes ! for condition, includeBindingList in pairs(interface.includeBindingTable) do ! if not defineIncludeBindingTable[condition] then defineIncludeBindingTable[condition] = {} end ! ! for idx, includeBinding in pairs(includeBindingList) do ! defineIncludeBindingTable[condition][idx] = includeBinding ! end end -- ////////////////////////////////////////////////////////////////////////////////// --- 2930,2962 ---- local defineBinding = { + Name = member.Name, Map = " { \""..member.Name.."\", "..value.." },\n", Condition = fullcondition } ! if defineBindingTable[member.Name] then ! print("Warning: '"..member.Name.."' already has a %define binding!") ! print(TableDump(defineBindingTable[member.Name], "Old: ")) ! print(TableDump(defineBinding, "New: ")) end + defineBindingTable[member.Name] = defineBinding ! -- /////////////////////////////////////////////////////////////// -- define string binding elseif member.DefType == "define_string" then local value = member.Value or member.Name ! local stringBinding = { + Name = member.Name, Map = " { \""..member.Name.."\", "..value.." },\n", Condition = fullcondition } ! if stringBindingTable[member.Name] then ! print("Warning: '"..member.Name.."' already has a %define %string binding!") ! print(TableDump(stringBindingTable[member.Name], "Old: ")) ! print(TableDump(stringBinding, "New: ")) end + stringBindingTable[member.Name] = stringBinding -- ////////////////////////////////////////////////////////////////////////////////// *************** *** 2948,2976 **** local objectBinding = { Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", 0 },\n", Condition = fullcondition } ! if not objectBindingTable[fullcondition] then objectBindingTable[fullcondition] = {} end ! objectBindingTable[fullcondition][member.Name] = objectBinding ! ! -- Object Class Tag Binding ! local objectTagBinding = ! { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! Condition = fullcondition ! } ! ! if not objectTagBindingTable[fullcondition] then objectTagBindingTable[fullcondition] = {} end ! objectTagBindingTable[fullcondition][parseObject.Name] = objectTagBinding ! ! -- Object Includes ! for condition, includeBindingList in pairs(interface.includeBindingTable) do ! if not objectIncludeBindingTable[condition] then objectIncludeBindingTable[condition] = {} end ! ! for idx, includeBinding in pairs(includeBindingList) do ! objectIncludeBindingTable[condition][idx] = includeBinding ! end end -- ////////////////////////////////////////////////////////////////////////////////// --- 2966,2980 ---- local objectBinding = { + Name = luaname, Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", 0 },\n", Condition = fullcondition } ! if objectBindingTable[luaname] then ! print("Warning: '"..luaname.."' already has a %define %object binding!") ! print(TableDump(objectBindingTable[luaname], "Old: ")) ! print(TableDump(objectBinding, "New: ")) end + objectBindingTable[luaname] = objectBinding -- ////////////////////////////////////////////////////////////////////////////////// *************** *** 2980,3008 **** local pointerBinding = { Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0, (const void **) &"..member.Name.." },\n", Condition = fullcondition } ! if not pointerBindingTable[fullcondition] then pointerBindingTable[fullcondition] = {} end ! pointerBindingTable[fullcondition][member.Name] = pointerBinding ! ! -- Object Class Tag Binding ! local objectTagBinding = ! { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! Condition = fullcondition ! } ! ! if not objectTagBindingTable[fullcondition] then objectTagBindingTable[fullcondition] = {} end ! objectTagBindingTable[fullcondition][parseObject.Name] = objectTagBinding ! ! -- Object Includes ! for condition, includeBindingList in pairs(interface.includeBindingTable) do ! if not objectIncludeBindingTable[condition] then objectIncludeBindingTable[condition] = {} end ! ! for idx, includeBinding in pairs(includeBindingList) do ! objectIncludeBindingTable[condition][idx] = includeBinding ! end end -- ////////////////////////////////////////////////////////////////////////////////// --- 2984,2998 ---- local pointerBinding = { + Name = luaname, Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0, (const void **) &"..member.Name.." },\n", Condition = fullcondition } ! if pointerBindingTable[luaname] then ! print("Warning: '"..luaname.."' already has a %define %pointer binding!") ! print(TableDump(pointerBindingTable[luaname], "Old: ")) ! print(TableDump(pointerBinding, "New: ")) end + pointerBindingTable[luaname] = pointerBinding -- ////////////////////////////////////////////////////////////////////////////////// *************** *** 3011,3039 **** local eventBinding = { Map = " { &"..member.Name..", \""..member.Name.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } ! if not eventBindingTable[fullcondition] then eventBindingTable[fullcondition] = {} end ! eventBindingTable[fullcondition][member.Name] = eventBinding ! ! -- Event Class Tag Binding ! local eventTagBinding = ! { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! Condition = fullcondition ! } ! ! if not eventTagBindingTable[fullcondition] then eventTagBindingTable[fullcondition] = {} end ! eventTagBindingTable[fullcondition][parseObject.Name] = eventTagBinding ! ! -- Event Includes ! for condition, includeBindingList in pairs(interface.includeBindingTable) do ! if not eventIncludeBindingTable[condition] then eventIncludeBindingTable[condition] = {} end ! ! for idx, includeBinding in pairs(includeBindingList) do ! eventIncludeBindingTable[condition][idx] = includeBinding ! end end -- ////////////////////////////////////////////////////////////////////////////////// --- 3001,3015 ---- local eventBinding = { + Name = member.Name, Map = " { &"..member.Name..", \""..member.Name.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } ! if eventBindingTable[member.Name] then ! print("Warning: '"..member.Name.."' already has a %define %event binding!") ! print(TableDump(eventBindingTable[member.Name], "Old: ")) ! print(TableDump(eventBinding, "New: ")) end + eventBindingTable[member.Name] = eventBinding -- ////////////////////////////////////////////////////////////////////////////////// *************** *** 3611,3615 **** methodcondition = AddCondition(methodcondition, condition) end ! if not methodcondition then methodcondition = "1" end -- bind method --- 3587,3592 ---- methodcondition = AddCondition(methodcondition, condition) end ! ! methodcondition = FixCondition(methodcondition) -- bind method *************** *** 3680,3684 **** -- Extern Class Tag Declaration ! local tagcondition = parseObject.Condition or "1" local classTagBinding = { --- 3657,3661 ---- -- Extern Class Tag Declaration ! local tagcondition = FixCondition(parseObject.Condition) local classTagBinding = { *************** *** 3712,3717 **** end - local gcFunctionName = "NULL" - -- Class Functions if parseObject.DeleteRequired then --- 3689,3692 ---- *************** *** 3731,3735 **** table.insert(codeList, "}\n\n") ! local condition = parseObject.Condition or "1" local delMethodBinding = { --- 3706,3710 ---- table.insert(codeList, "}\n\n") ! local condition = FixCondition(parseObject.Condition) local delMethodBinding = { *************** *** 3743,3747 **** end ! local classcondition = parseObject.Condition or "1" local classBinding = { --- 3718,3722 ---- end ! local classcondition = FixCondition(parseObject.Condition) local classBinding = { *************** *** 4140,4179 **** table.insert(fileData, " // -------------------------------------------------------------------\n") ! table.insert(fileData, " // %define\n") table.insert(fileData, " // -------------------------------------------------------------------\n\n") ! for condition, defineBindingList in pairs_sort(defineBindingTable) do ! if HasCondition(condition) then ! table.insert(fileData, "#if "..condition.."\n") ! end ! ! for idx, defineBinding in pairs_sort(defineBindingList) do ! table.insert(fileData, defineBinding.Map) end - if HasCondition(condition) then - table.insert(fileData, "#endif // "..condition.."\n\n") - else - table.insert(fileData, "\n") end end ! table.insert(fileData, " // -------------------------------------------------------------------\n") ! table.insert(fileData, " // %enum\n") ! table.insert(fileData, " // -------------------------------------------------------------------\n\n") ! for condition, enumBindingList in pairs_sort(enumBindingTable) do ! if HasCondition(condition) then ! table.insert(fileData, "#if "..condition.."\n") end ! for idx, enumBinding in pairs_sort(enumBindingList) do ! table.insert(fileData, enumBinding.Map) ! end ! if HasCondition(condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end --- 4115,4153 ---- table.insert(fileData, " // -------------------------------------------------------------------\n") ! table.insert(fileData, " // %define and %enum\n") table.insert(fileData, " // -------------------------------------------------------------------\n\n") ! -- mix the %define and %enums together since they're both in the same WXLUADEFINE struct ! local defineEnumBindingTable = {} ! for k, v in pairs(defineBindingTable) do ! if (defineEnumBindingTable[k]) then ! print("ERROR: Duplicate WXLUADEFINE entries!") ! print(" '"..k.."' = '"..defineEnumBindingTable[k].Map.."' and '"..v.Map.."'") end + defineEnumBindingTable[k] = v + end + for k, v in pairs(enumBindingTable) do + if (defineEnumBindingTable[k]) then + print("ERROR: Duplicate WXLUADEFINE entries!") + print(" '"..k.."' = '"..defineEnumBindingTable[k].Map.."' and '"..v.Map.."'") end + defineEnumBindingTable[k] = v end ! -- sort the bindings by class name and write them out alphabetically ! local sortedBindings = TableSort(defineEnumBindingTable) ! for n = 1, #sortedBindings do ! local condition = sortedBindings[n].Condition ! -- try to combine the #if statements if possible ! if HasCondition(condition) and ((n == 1) or (condition ~= sortedBindings[n-1].Condition)) then ! table.insert(fileData, "\n#if "..condition.."\n") end ! table.insert(fileData, sortedBindings[n].Map) ! if HasCondition(condition) and ((n >= #sortedBindings) or (condition ~= sortedBindings[n+1].Condition)) then ! table.insert(fileData, "#endif // "..condition.."\n") end end *************** *** 4199,4215 **** table.insert(fileData, " // -------------------------------------------------------------------\n\n") ! for condition, stringBindingList in pairs_sort(stringBindingTable) do ! if HasCondition(condition) then ! table.insert(fileData, "#if "..condition.."\n") ! end ! for idx, stringBinding in pairs_sort(stringBindingList) do ! table.insert(fileData, stringBinding.Map) end ! if HasCondition(condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end --- 4173,4190 ---- table.insert(fileData, " // -------------------------------------------------------------------\n\n") ! -- sort the bindings by class name and write them out alphabetically ! local sortedBindings = TableSort(stringBindingTable) ! for n = 1, #sortedBindings do ! local condition = sortedBindings[n].Condition ! -- try to combine the #if statements if possible ! if HasCondition(condition) and ((n == 1) or (condition ~= sortedBindings[n-1].Condition)) then ! table.insert(fileData, "\n#if "..condition.."\n") end ! table.insert(fileData, sortedBindings[n].Map) ! ! if HasCondition(condition) and ((n >= #sortedBindings) or (condition ~= sortedBindings[n+1].Condition)) then ! table.insert(fileData, "#endif // "..condition.."\n") end end *************** *** 4240,4272 **** table.insert(fileData, " static WXLUAOBJECT objectList[] =\n {\n") ! for condition, objectBindingList in pairs_sort(objectBindingTable) do ! if HasCondition(condition) then ! table.insert(fileData, "\n#if "..condition.."\n") ! end ! ! for idx, objectBinding in pairs_sort(objectBindingList) do ! table.insert(fileData, objectBinding.Map) end - if HasCondition(condition) then - table.insert(fileData, "#endif // "..condition.."\n") - else - table.insert(fileData, "\n") end end ! for condition, pointerBindingList in pairs_sort(pointerBindingTable) do ! if HasCondition(condition) then table.insert(fileData, "\n#if "..condition.."\n") end ! for idx, pointerBinding in pairs_sort(pointerBindingList) do ! table.insert(fileData, pointerBinding.Map) ! end ! if HasCondition(condition) then table.insert(fileData, "#endif // "..condition.."\n") - else - table.insert(fileData, "\n") end end --- 4215,4250 ---- table.insert(fileData, " static WXLUAOBJECT objectList[] =\n {\n") ! -- mix %object and %pointer together since they're both in the same WXLUAOBJECT struct ! local objectPointerBindingTable = {} ! for k, v in pairs(objectBindingTable) do ! if (objectPointerBindingTable[k]) then ! print("ERROR: Duplicate WXLUAOBJECT entries!") ! print(" '"..k.."' = '"..objectPointerBindingTable[k].Map.."' and '"..v.Map.."'") end + objectPointerBindingTable[k] = v + end + for k, v in pairs(pointerBindingTable) do + if (objectPointerBindingTable[k]) then + print("ERROR: Duplicate WXLUAOBJECT entries!") + print(" '"..k.."' = '"..objectPointerBindingTable[k].Map.."' and '"..v.Map.."'") end + objectPointerBindingTable[k] = v end ! -- sort the bindings by class name and write them out alphabetically ! local sortedBindings = TableSort(objectPointerBindingTable) ! ! for n = 1, #sortedBindings do ! local condition = sortedBindings[n].Condition ! -- try to combine the #if statements if possible ! if HasCondition(condition) and ((n == 1) or (condition ~= sortedBindings[n-1].Condition)) then table.insert(fileData, "\n#if "..condition.."\n") end ! table.insert(fileData, sortedBindings[n].Map) ! if HasCondition(condition) and ((n >= #sortedBindings) or (condition ~= sortedBindings[n+1].Condition)) then table.insert(fileData, "#endif // "..condition.."\n") end end *************** *** 4297,4313 **** table.insert(fileData, " static WXLUAEVENT eventList[] =\n {\n") ! for condition, eventBindingList in pairs_sort(eventBindingTable) do ! if HasCondition(condition) then ! table.insert(fileData, "#if "..condition.."\n") ! end ! for idx, eventBinding in pairs_sort(eventBindingList) do ! table.insert(fileData, eventBinding.Map) end ! if HasCondition(condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end --- 4275,4292 ---- table.insert(fileData, " static WXLUAEVENT eventList[] =\n {\n") ! -- sort the bindings by class name and write them out alphabetically ! local sortedBindings = TableSort(eventBindingTable) ! for n = 1, #sortedBindings do ! local condition = sortedBindings[n].Condition ! -- try to combine the #if statements if possible ! if HasCondition(condition) and ((n == 1) or (condition ~= sortedBindings[n-1].Condition)) then ! table.insert(fileData, "\n#if "..condition.."\n") end ! table.insert(fileData, sortedBindings[n].Map) ! ! if HasCondition(condition) and ((n >= #sortedBindings) or (condition ~= sortedBindings[n+1].Condition)) then ! table.insert(fileData, "#endif // "..condition.."\n") end end |
