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...> - 2006-07-19 22:08:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9454/wxLua/modules/wxbindstc/src Modified Files: wxstc_bind.cpp Log Message: update wxSTC for 2.7 where wxSTC_LEX_ASP/PHP have been removed Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxstc_bind.cpp 9 Jun 2006 22:51:34 -0000 1.10 --- wxstc_bind.cpp 19 Jul 2006 22:08:27 -0000 1.11 *************** *** 95,98 **** --- 95,103 ---- #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_DEFAULT", wxSTC_ADA_DEFAULT }, *************** *** 441,445 **** { "wxSTC_LEXER_START", wxSTC_LEXER_START }, { "wxSTC_LEX_ADA", wxSTC_LEX_ADA }, - { "wxSTC_LEX_ASP", wxSTC_LEX_ASP }, { "wxSTC_LEX_AUTOMATIC", wxSTC_LEX_AUTOMATIC }, { "wxSTC_LEX_AVE", wxSTC_LEX_AVE }, --- 446,449 ---- *************** *** 464,468 **** { "wxSTC_LEX_PASCAL", wxSTC_LEX_PASCAL }, { "wxSTC_LEX_PERL", wxSTC_LEX_PERL }, - { "wxSTC_LEX_PHP", wxSTC_LEX_PHP }, { "wxSTC_LEX_PROPERTIES", wxSTC_LEX_PROPERTIES }, { "wxSTC_LEX_PYTHON", wxSTC_LEX_PYTHON }, --- 468,471 ---- |
|
From: John L. <jr...@us...> - 2006-07-19 22:08:31
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9454/wxLua/bindings/wxstc Modified Files: stc.i Log Message: update wxSTC for 2.7 where wxSTC_LEX_ASP/PHP have been removed Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** stc.i 24 May 2006 04:50:00 -0000 1.4 --- stc.i 19 Jul 2006 22:08:27 -0000 1.5 *************** *** 244,249 **** %define wxSTC_LEX_BULLANT %define wxSTC_LEX_VBSCRIPT ! %define wxSTC_LEX_ASP ! %define wxSTC_LEX_PHP %define wxSTC_LEX_BAAN %define wxSTC_LEX_MATLAB --- 244,249 ---- %define wxSTC_LEX_BULLANT %define wxSTC_LEX_VBSCRIPT ! !%wxchkver27 %define wxSTC_LEX_ASP ! !%wxchkver27 %define wxSTC_LEX_PHP %define wxSTC_LEX_BAAN %define wxSTC_LEX_MATLAB |
|
From: Francesco M. <fr...@us...> - 2006-07-19 19:09:08
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2218 Modified Files: index.php Log Message: fixed problem of news box overlapping with lua sample code Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index.php 21 May 2006 13:20:22 -0000 1.18 --- index.php 19 Jul 2006 19:09:02 -0000 1.19 *************** *** 1,52 **** ! <!-- $Id$ --> ! <?php ! $pagetitle="index"; ! $anchors_href=array("whatis", "start"); ! $anchors_text=array("What is wxLua?", "Getting started"); ! include_once("header.inc.php"); ! ?> ! ! <!-- ##### News sidebar ##### --> ! <div class="rightSideBar"> ! <p class="sideBarTitle">News</p> ! <div class="sideBarText"><?php include_once("news.inc.php"); ?></div> ! </div> ! ! ! <h1 id="whatis" class="first">What is wxLua ?</h1> ! <p>wxLua is a set of bindings to the <a href="http://www.wxwidgets.org">wxWidgets</a> library for the ! <a href="http://www.lua.org">Lua</a> programming language. With <strong>wxLua</strong> you can write programs ! in Lua that use the wxWidgets <a href="http://en.wikipedia.org/wiki/Cross-platform">cross-platform</a> GUI library to ! develop and deliver your software with the programming ease of an interpreted language like Lua. ! Nearly all of the functionality of wxWidgets is exposed to Lua, meaning that your ! programs can have windows, dialogs, menus, toolbars, controls, image loading and saving, ! drawing, sockets, streams, printing, clipboard access... and much more.</p> ! ! <p>Additionally, wxLua can be used in your C++ programs to embed a <em>lua interpreter</em> ! with the wxWidgets API bindings. See the <a href="documentation.php">wxLua documentation</a> for more info.</p> ! ! <p>Want an example of how easy it is to write a cross-platform GUI? Here is a simple lua script which creates a ! wxFrame top level window and a menubar, just add your program to it:</p> ! <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> ! ! <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> ! ! ! <h1 id="start">Getting started</h1> ! <ol> ! <li><p><strong>get the tools</strong>; the <a href="download.php">download page</a> contains ! the binary packages which allow you to get started in few minutes. You will find the <strong>wxLua</strong> ! and <strong>wxLuaEdit</strong> applications there which allow you to write and test your (wx)Lua programs.</p></li> ! ! <li> ! <p><strong>learn Lua</strong>; once you've got wxLua installed and running, you need to learn how to use it: a good way to learn <a href="http://www.lua.org">Lua</a>, in case you don't already know, is to refer to the ! <a href="http://lua-users.org/wiki/TutorialDirectory">tutorial</a> hosted in the Lua wiki.</p></li> ! ! <li> ! <p><strong>learn wxLua</strong>; once you've got some experience with Lua language you can start to learn wxLua bindings looking at the <a href="documentation.php">documentation page</a> and at the samples in the <tt>wxLua/samples</tt> directory.</p></li> ! </ol> ! ! <p>Last, if you need help look at the <a href="support.php">support page</a>.</p> ! <?php include_once("footer.inc.php"); ?> \ No newline at end of file --- 1,53 ---- ! <!-- $Id$ --> ! <?php ! $pagetitle="index"; ! $anchors_href=array("whatis", "start"); ! $anchors_text=array("What is wxLua?", "Getting started"); ! include_once("header.inc.php"); ! ?> ! ! <!-- ##### News sidebar ##### --> ! <div class="rightSideBar"> ! <p class="sideBarTitle">News</p> ! <!-- we want this box to be always on top of others --> ! <div class="sideBarText" style="z-index: 1000"><?php include_once("news.inc.php"); ?></div> ! </div> ! ! ! <h1 id="whatis" class="first">What is wxLua ?</h1> ! <p>wxLua is a set of bindings to the <a href="http://www.wxwidgets.org">wxWidgets</a> library for the ! <a href="http://www.lua.org">Lua</a> programming language. With <strong>wxLua</strong> you can write programs ! in Lua that use the wxWidgets <a href="http://en.wikipedia.org/wiki/Cross-platform">cross-platform</a> GUI library to ! develop and deliver your software with the programming ease of an interpreted language like Lua. ! Nearly all of the functionality of wxWidgets is exposed to Lua, meaning that your ! programs can have windows, dialogs, menus, toolbars, controls, image loading and saving, ! drawing, sockets, streams, printing, clipboard access... and much more.</p> ! ! <p>Additionally, wxLua can be used in your C++ programs to embed a <em>lua interpreter</em> ! with the wxWidgets API bindings. See the <a href="documentation.php">wxLua documentation</a> for more info.</p> ! ! <p>Want an example of how easy it is to write a cross-platform GUI? Here is a simple lua script which creates a ! wxFrame top level window and a menubar, just add your program to it:</p> ! <?php include_once("luasample.lua.html"); ?> ! <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> ! ! <p><strong>If you use wxLua or you wrote a wxLua-based application, don't forget to <a href="http://news.gmane.org/gmane.comp.lib.wxwidgets.wxlua.user">tell us</a> about it !</strong></p> ! ! ! <h1 id="start">Getting started</h1> ! <ol> ! <li><p><strong>get the tools</strong>; the <a href="download.php">download page</a> contains ! the binary packages which allow you to get started in few minutes. You will find the <strong>wxLua</strong> ! and <strong>wxLuaEdit</strong> applications there which allow you to write and test your (wx)Lua programs.</p></li> ! ! <li> ! <p><strong>learn Lua</strong>; once you've got wxLua installed and running, you need to learn how to use it: a good way to learn <a href="http://www.lua.org">Lua</a>, in case you don't already know, is to refer to the ! <a href="http://lua-users.org/wiki/TutorialDirectory">tutorial</a> hosted in the Lua wiki.</p></li> ! ! <li> ! <p><strong>learn wxLua</strong>; once you've got some experience with Lua language you can start to learn wxLua bindings looking at the <a href="documentation.php">documentation page</a> and at the samples in the <tt>wxLua/samples</tt> directory.</p></li> ! </ol> ! ! <p>Last, if you need help look at the <a href="support.php">support page</a>.</p> ! <?php include_once("footer.inc.php"); ?> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2006-06-21 03:58:07
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30674/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: fix garbage collection function wxLua_lua_garbageCollect to use tracked and derived hash maps add wxLIGHT_GREY Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wx_rules.lua 9 Jun 2006 03:24:49 -0000 1.19 --- wx_rules.lua 21 Jun 2006 03:58:02 -0000 1.20 *************** *** 187,196 **** [[ // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX ! wxLua_wxBLACK = (wxColour*)wxBLACK; ! wxLua_wxWHITE = (wxColour*)wxWHITE; ! wxLua_wxRED = (wxColour*)wxRED; ! wxLua_wxBLUE = (wxColour*)wxBLUE; ! wxLua_wxGREEN = (wxColour*)wxGREEN; ! wxLua_wxCYAN = (wxColour*)wxCYAN; wxLua_wxRED_PEN = (wxPen*)wxRED_PEN; --- 187,197 ---- [[ // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX ! wxLua_wxBLACK = (wxColour*)wxBLACK; ! wxLua_wxWHITE = (wxColour*)wxWHITE; ! wxLua_wxRED = (wxColour*)wxRED; ! wxLua_wxBLUE = (wxColour*)wxBLUE; ! wxLua_wxGREEN = (wxColour*)wxGREEN; ! wxLua_wxCYAN = (wxColour*)wxCYAN; ! wxLua_wxLIGHT_GREY = (wxColour*)wxLIGHT_GREY; wxLua_wxRED_PEN = (wxPen*)wxRED_PEN; |
|
From: John L. <jr...@us...> - 2006-06-21 03:58:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30674/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: fix garbage collection function wxLua_lua_garbageCollect to use tracked and derived hash maps add wxLIGHT_GREY Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** wxlstate.cpp 6 Jun 2006 05:14:32 -0000 1.72 --- wxlstate.cpp 21 Jun 2006 03:58:03 -0000 1.73 *************** *** 1548,1551 **** --- 1548,1552 ---- wxLongToLongHashMap::iterator it = M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.find((long) pObject); + if (it != M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.end()) { Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxlbind.cpp 6 Jun 2006 05:14:32 -0000 1.36 --- wxlbind.cpp 21 Jun 2006 03:58:03 -0000 1.37 *************** *** 65,74 **** --- 65,84 ---- WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); + //bool tracked = false; + if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) { long key = (long)wxlState.ttouserdata(1, true); + + wxCHECK_MSG(key != 0, 0, wxT("NULL user data in wxLua_lua_garbageCollect")); + + //tracked = + wxlState.RemoveTrackedMemory((void*)key, true); // delete from m_pTrackedList + wxLongToLongHashMap::iterator it = wxlState.GetLuaStateData()->m_pDerivedList.find(key); if (it != wxlState.GetLuaStateData()->m_pDerivedList.end()) { + //wxPrintf(wxT("wxLua_lua_garbageCollect - Derived GC '%s'\n"), lua2wx(pClass->name).c_str()); + wxLuaStringToLongHashMap *pHashTable = (wxLuaStringToLongHashMap *)it->second; if (pHashTable != NULL) *************** *** 79,82 **** --- 89,93 ---- wxlState.GetLuaStateData()->m_pDerivedList.erase(it); } + //else wxPrintf(wxT("wxLua_lua_garbageCollect - Invalid WXLUACLASS derived hashmap iterator key %d!\n"), key); int iMethod; *************** *** 91,94 **** --- 102,110 ---- } } + //else wxPrintf(wxT("wxLua_lua_garbageCollect - NULL WXLUACLASS!\n")); + + //wxPrintf(wxT("wxLua_lua_garbageCollect - '%s' tag %d lua %d tracked %d return value %d\n"), + // lua2wx(pClass ? pClass->name : "").c_str(), pClass ? *pClass->class_tag : 0, (int)L, (int)tracked, retVal); + return retVal; } *************** *** 191,195 **** const char *cpIndex = lua_tostring(L, 2); ! wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str()); if ((pClass != NULL) && lua_isuserdata(L, 1) && --- 207,211 ---- const char *cpIndex = lua_tostring(L, 2); ! //wxPrintf(wxT("wxLua_lua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str()); if ((pClass != NULL) && lua_isuserdata(L, 1) && |
|
From: John L. <jr...@us...> - 2006-06-21 03:58:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30674/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: fix garbage collection function wxLua_lua_garbageCollect to use tracked and derived hash maps add wxLIGHT_GREY Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wx_bind.cpp 12 Jun 2006 02:48:09 -0000 1.49 --- wx_bind.cpp 21 Jun 2006 03:58:02 -0000 1.50 *************** *** 6009,6018 **** { // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX ! wxLua_wxBLACK = (wxColour*)wxBLACK; ! wxLua_wxWHITE = (wxColour*)wxWHITE; ! wxLua_wxRED = (wxColour*)wxRED; ! wxLua_wxBLUE = (wxColour*)wxBLUE; ! wxLua_wxGREEN = (wxColour*)wxGREEN; ! wxLua_wxCYAN = (wxColour*)wxCYAN; wxLua_wxRED_PEN = (wxPen*)wxRED_PEN; --- 6009,6019 ---- { // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX ! wxLua_wxBLACK = (wxColour*)wxBLACK; ! wxLua_wxWHITE = (wxColour*)wxWHITE; ! wxLua_wxRED = (wxColour*)wxRED; ! wxLua_wxBLUE = (wxColour*)wxBLUE; ! wxLua_wxGREEN = (wxColour*)wxGREEN; ! wxLua_wxCYAN = (wxColour*)wxCYAN; ! wxLua_wxLIGHT_GREY = (wxColour*)wxLIGHT_GREY; wxLua_wxRED_PEN = (wxPen*)wxRED_PEN; |
|
From: John L. <jr...@us...> - 2006-06-12 22:27:16
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32582/wxLua/apps/wxluacan/src Modified Files: cansim.cpp Log Message: remove unused parameter warnings Index: cansim.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cansim.cpp 14 May 2006 01:49:10 -0000 1.9 --- cansim.cpp 12 Jun 2006 22:27:14 -0000 1.10 *************** *** 158,182 **** } ! void MyFrame::OnUndo(wxCommandEvent& event) { m_canvas->GetCmdh()->Undo(); } ! void MyFrame::OnRedo(wxCommandEvent& event) { m_canvas->GetCmdh()->Redo(); } ! void MyFrame::OnQuit( wxCommandEvent &event ) { Close( true ); } ! void MyFrame::OnCloseWindow( wxCloseEvent &event ) { Destroy(); } ! void MyFrame::OnTimer( wxTimerEvent &event ) { wxWakeUpIdle(); --- 158,182 ---- } ! void MyFrame::OnUndo(wxCommandEvent& ) { m_canvas->GetCmdh()->Undo(); } ! void MyFrame::OnRedo(wxCommandEvent& ) { m_canvas->GetCmdh()->Redo(); } ! void MyFrame::OnQuit( wxCommandEvent & ) { Close( true ); } ! void MyFrame::OnCloseWindow( wxCloseEvent & ) { Destroy(); } ! void MyFrame::OnTimer( wxTimerEvent & ) { wxWakeUpIdle(); *************** *** 255,259 **** ! void MyFrame::OnRunScript(wxCommandEvent& event) { wxString fullPath = wxFileSelector( _("Select a script file"), --- 255,259 ---- ! void MyFrame::OnRunScript(wxCommandEvent& ) { wxString fullPath = wxFileSelector( _("Select a script file"), |
|
From: John L. <jr...@us...> - 2006-06-12 03:51:08
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/bindings Modified Files: genwxbind.lua Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** genwxbind.lua 12 Jun 2006 02:48:09 -0000 1.74 --- genwxbind.lua 12 Jun 2006 03:50:35 -0000 1.75 *************** *** 3515,3521 **** if (not member.IsOverload) or (member.Name ~= parseObject.Name) or (overloadCount[funcNameBase] == 1) then local f = funcNameBase - if string.find(funcNameBase, "wxLua_wxControlWithItems_Append", 1, 1) then - print(funcNameBase, funcName, member.Name, member.AltName) - end if member.AltName and (member.AltName ~= member.Name) then f = funcName end funcMap = " { "..funcType..", \""..funcLuaCall.."\", "..f..", "..paramCount..", "..requiredParamCount..", "..overload_argList.."0 } },\n" --- 3515,3518 ---- |
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua/src Modified Files: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h ldo.c lgc.c liolib.c llex.c llex.h lopcodes.h loslib.c lparser.c lparser.h lstate.c lstrlib.c lua.c lua.h luac.c luaconf.h lvm.c print.c Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 13 May 2006 21:05:36 -0000 1.4 --- Makefile 12 Jun 2006 03:50:37 -0000 1.5 *************** *** 84,88 **** aix: ! $(MAKE) all CC="xlc" CFLAGS="-O2" MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall" ansi: --- 84,88 ---- aix: ! $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall" ansi: *************** *** 125,137 **** lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ ! lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \ ! ldo.h lgc.h ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \ ! llex.h lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h \ ! ltm.h ldo.h lfunc.h lstring.h lgc.h lvm.h ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ ! lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h ltable.h \ ! lstring.h lundump.h lvm.h ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \ lzio.h lmem.h lundump.h --- 125,137 ---- lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ ! lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \ ! ltable.h ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \ ! llex.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \ ! lfunc.h lstring.h lgc.h ltable.h lvm.h ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ ! lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h lstring.h \ ! ltable.h lundump.h lvm.h ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \ lzio.h lmem.h lundump.h *************** *** 143,147 **** liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \ ! lzio.h lmem.h llex.h lparser.h ltable.h lstring.h lgc.h lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ --- 143,147 ---- liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \ ! lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ *************** *** 154,159 **** loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ ! lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \ ! ldo.h lfunc.h lstring.h lgc.h lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h --- 154,159 ---- loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ ! lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \ ! lfunc.h lstring.h lgc.h ltable.h lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h Index: lauxlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lauxlib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lauxlib.c 29 Mar 2006 06:00:00 -0000 1.1 --- lauxlib.c 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 124,128 **** LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { void *p = lua_touserdata(L, ud); ! if (p != NULL) { /* value is a userdata? */ /* lua 5.1 bug fix */ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */ --- 124,128 ---- LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { void *p = lua_touserdata(L, ud); ! if (p != NULL) { /* value is a userdata? */ if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */ Index: lauxlib.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lauxlib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lauxlib.h 29 Mar 2006 06:00:00 -0000 1.1 --- lauxlib.h 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 109,115 **** #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) ! #define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, 0, 0)) ! #define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, 0, 0)) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) --- 109,117 ---- #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) ! #define luaL_dofile(L, fn) \ ! (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) ! #define luaL_dostring(L, s) \ ! (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) Index: lopcodes.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lopcodes.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lopcodes.h 29 Mar 2006 05:48:11 -0000 1.2 --- lopcodes.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 198,203 **** OP_FORPREP,/* A sBx R(A)-=R(A+2); pc+=sBx */ ! OP_TFORLOOP,/* A C R(A+3), ... ,R(A+3+C) := R(A)(R(A+1), R(A+2)); ! if R(A+3) ~= nil then { pc++; R(A+2)=R(A+3); } */ OP_SETLIST,/* A B C R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B */ --- 198,203 ---- OP_FORPREP,/* A sBx R(A)-=R(A+2); pc+=sBx */ ! OP_TFORLOOP,/* A C R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); ! if R(A+3) ~= nil then R(A+2)=R(A+3) else pc++ */ OP_SETLIST,/* A B C R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B */ Index: print.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/print.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** print.c 29 Mar 2006 06:00:00 -0000 1.1 --- print.c 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 21,31 **** #define VOID(p) ((const void*)(p)) ! static void PrintString(const Proto* f, int n) { ! const char* s=svalue(&f->k[n]); putchar('"'); ! for (; *s; s++) { ! switch (*s) { case '"': printf("\\\""); break; --- 21,34 ---- #define VOID(p) ((const void*)(p)) ! static void PrintString(const TString* ts) { ! const char* s=getstr(ts); ! int n=ts->tsv.len; ! int i; putchar('"'); ! for (i=0; i<n; i++) { ! int c=s[i]; ! switch (c) { case '"': printf("\\\""); break; *************** *** 37,44 **** case '\t': printf("\\t"); break; case '\v': printf("\\v"); break; ! default: if (isprint((unsigned char)*s)) ! printf("%c",*s); else ! printf("\\%03u",(unsigned char)*s); } } --- 40,47 ---- case '\t': printf("\\t"); break; case '\v': printf("\\v"); break; ! default: if (isprint((unsigned char)c)) ! putchar(c); else ! printf("\\%03u",(unsigned char)c); } } *************** *** 61,65 **** break; case LUA_TSTRING: ! PrintString(f,i); break; default: /* cannot happen */ --- 64,68 ---- break; case LUA_TSTRING: ! PrintString(rawtsvalue(o)); break; default: /* cannot happen */ Index: lgc.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lgc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lgc.c 29 Mar 2006 05:48:11 -0000 1.2 --- lgc.c 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 321,326 **** ! static void propagateall (global_State *g) { ! while (g->gray) propagatemark(g); } --- 321,328 ---- ! static size_t propagateall (global_State *g) { ! size_t m = 0; ! while (g->gray) m += propagatemark(g); ! return m; } *************** *** 541,545 **** udsize = luaC_separateudata(L, 0); /* separate userdata to be finalized */ marktmu(g); /* mark `preserved' userdata */ ! propagateall(g); /* remark, to propagate `preserveness' */ cleartable(g->weak); /* remove collected objects from weak tables */ /* flip current white */ --- 543,547 ---- udsize = luaC_separateudata(L, 0); /* separate userdata to be finalized */ marktmu(g); /* mark `preserved' userdata */ ! udsize += propagateall(g); /* remark, to propagate `preserveness' */ cleartable(g->weak); /* remove collected objects from weak tables */ /* flip current white */ *************** *** 591,594 **** --- 593,598 ---- if (g->tmudata) { GCTM(L); + if (g->estimate > GCFINALIZECOST) + g->estimate -= GCFINALIZECOST; return GCFINALIZECOST; } Index: lstate.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstate.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lstate.c 13 May 2006 21:05:36 -0000 1.4 --- lstate.c 12 Jun 2006 03:50:37 -0000 1.5 *************** *** 254,258 **** LUA_API void lua_close (lua_State *L) { L = G(L)->mainthread; /* only the main thread can be closed */ - luai_userstateclose(L); lua_lock(L); luaF_close(L, L->stack); /* close all upvalues for this thread */ --- 254,257 ---- *************** *** 265,268 **** --- 264,268 ---- } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0); lua_assert(G(L)->tmudata == NULL); + luai_userstateclose(L); close_state(L); } Index: liolib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/liolib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** liolib.c 29 Mar 2006 06:00:00 -0000 1.1 --- liolib.c 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 100,104 **** FILE **p = topfile(L); int ok = lua_pclose(L, *p); ! if (ok) *p = NULL; return pushresult(L, ok, NULL); } --- 100,104 ---- FILE **p = topfile(L); int ok = lua_pclose(L, *p); ! *p = NULL; return pushresult(L, ok, NULL); } *************** *** 108,112 **** FILE **p = topfile(L); int ok = (fclose(*p) == 0); ! if (ok) *p = NULL; return pushresult(L, ok, NULL); } --- 108,112 ---- FILE **p = topfile(L); int ok = (fclose(*p) == 0); ! *p = NULL; return pushresult(L, ok, NULL); } Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lua.h 29 Mar 2006 06:00:00 -0000 1.1 --- lua.h 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- #define LUA_VERSION "Lua 5.1" + #define LUA_RELEASE "Lua 5.1.1" #define LUA_VERSION_NUM 501 #define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio" Index: llex.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/llex.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** llex.h 29 Mar 2006 05:48:11 -0000 1.2 --- llex.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 69,75 **** LUAI_FUNC void luaX_init (lua_State *L); ! LUAI_FUNC void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source); ! LUAI_FUNC TString *luaX_newstring (LexState *LS, const char *str, size_t l); LUAI_FUNC void luaX_next (LexState *ls); LUAI_FUNC void luaX_lookahead (LexState *ls); --- 69,75 ---- LUAI_FUNC void luaX_init (lua_State *L); ! LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source); ! LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l); LUAI_FUNC void luaX_next (LexState *ls); LUAI_FUNC void luaX_lookahead (LexState *ls); Index: loslib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/loslib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** loslib.c 29 Mar 2006 06:00:00 -0000 1.1 --- loslib.c 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 29,36 **** else { lua_pushnil(L); ! if (filename) ! lua_pushfstring(L, "%s: %s", filename, strerror(en)); ! else ! lua_pushfstring(L, "%s", strerror(en)); lua_pushinteger(L, en); return 3; --- 29,33 ---- else { lua_pushnil(L); ! lua_pushfstring(L, "%s: %s", filename, strerror(en)); lua_pushinteger(L, en); return 3; *************** *** 127,132 **** static int os_date (lua_State *L) { const char *s = luaL_optstring(L, 1, "%c"); ! time_t t = lua_isnoneornil(L, 2) ? time(NULL) : ! (time_t)luaL_checknumber(L, 2); struct tm *stm; if (*s == '!') { /* UTC? */ --- 124,128 ---- static int os_date (lua_State *L) { const char *s = luaL_optstring(L, 1, "%c"); ! time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL)); struct tm *stm; if (*s == '!') { /* UTC? */ *************** *** 200,206 **** static const char *const catnames[] = {"all", "collate", "ctype", "monetary", "numeric", "time", NULL}; ! const char *l = lua_tostring(L, 1); int op = luaL_checkoption(L, 2, "all", catnames); - luaL_argcheck(L, l || lua_isnoneornil(L, 1), 1, "string expected"); lua_pushstring(L, setlocale(cat[op], l)); return 1; --- 196,201 ---- static const char *const catnames[] = {"all", "collate", "ctype", "monetary", "numeric", "time", NULL}; ! const char *l = luaL_optstring(L, 1, NULL); int op = luaL_checkoption(L, 2, "all", catnames); lua_pushstring(L, setlocale(cat[op], l)); return 1; Index: llex.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/llex.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** llex.c 29 Mar 2006 05:48:11 -0000 1.2 --- llex.c 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 21,24 **** --- 21,25 ---- #include "lstate.h" #include "lstring.h" + #include "ltable.h" #include "lzio.h" Index: lua.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lua.c 29 Mar 2006 06:00:00 -0000 1.1 --- lua.c 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 108,112 **** static void print_version (void) { ! l_message(NULL, LUA_VERSION " " LUA_COPYRIGHT); } --- 108,112 ---- static void print_version (void) { ! l_message(NULL, LUA_RELEASE " " LUA_COPYRIGHT); } *************** *** 253,256 **** --- 253,260 ---- + /* check that argument has no extra characters at the end */ + #define notail(x) {if ((x)[2] != '\0') return -1;} + + static int collectargs (char **argv, int *pi, int *pv, int *pe) { int i; *************** *** 259,267 **** return i; switch (argv[i][1]) { /* option */ ! case '-': return (argv[i+1] != NULL ? i+1 : 0); ! case '\0': return i; ! case 'i': *pi = 1; /* go through */ ! case 'v': *pv = 1; break; ! case 'e': *pe = 1; /* go through */ case 'l': if (argv[i][2] == '\0') { --- 263,280 ---- return i; switch (argv[i][1]) { /* option */ ! case '-': ! notail(argv[i]); ! return (argv[i+1] != NULL ? i+1 : 0); ! case '\0': ! return i; ! case 'i': ! notail(argv[i]); ! *pi = 1; /* go through */ ! case 'v': ! notail(argv[i]); ! *pv = 1; ! break; ! case 'e': ! *pe = 1; /* go through */ case 'l': if (argv[i][2] == '\0') { *************** *** 307,316 **** static int handle_luainit (lua_State *L) { ! const char *init = getenv("LUA_INIT"); if (init == NULL) return 0; /* status OK */ else if (init[0] == '@') return dofile(L, init+1); else ! return dostring(L, init, "=LUA_INIT"); } --- 320,329 ---- static int handle_luainit (lua_State *L) { ! const char *init = getenv(LUA_INIT); if (init == NULL) return 0; /* status OK */ else if (init[0] == '@') return dofile(L, init+1); else ! return dostring(L, init, "=" LUA_INIT); } Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/luaconf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luaconf.h 29 Mar 2006 06:00:00 -0000 1.1 --- luaconf.h 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 61,64 **** --- 61,76 ---- /* + @@ LUA_PATH and LUA_CPATH are the names of the environment variables that + @* Lua check to set its paths. + @@ LUA_INIT is the name of the environment variable that Lua + @* checks for initialization code. + ** CHANGE them if you want different names. + */ + #define LUA_PATH "LUA_PATH" + #define LUA_CPATH "LUA_CPATH" + #define LUA_INIT "LUA_INIT" + + + /* @@ LUA_PATH_DEFAULT is the default path that Lua uses to look for @* Lua libraries. *************** *** 544,547 **** --- 556,570 ---- #if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \ (defined(__i386) || defined (_M_IX86) || defined(__i386__)) + + /* On a Microsoft compiler, use assembler */ + #if defined(_MSC_VER) + + #define lua_number2int(i,d) __asm fld d __asm fistp i + #define lua_number2integer(i,n) lua_number2int(i, n) + + /* the next trick should work on any Pentium, but sometimes clashes + with a DirectX idiosyncrasy */ + #else + union luai_Cast { double l_d; long l_l; }; #define lua_number2int(i,d) \ *************** *** 549,552 **** --- 572,578 ---- #define lua_number2integer(i,n) lua_number2int(i, n) + #endif + + /* this option always works, but may be slow */ #else Index: lcode.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lcode.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lcode.h 29 Mar 2006 05:48:11 -0000 1.2 --- lcode.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 33,37 **** } BinOpr; - #define binopistest(op) ((op) >= OPR_NE) typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr; --- 33,36 ---- Index: lcode.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lcode.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lcode.c 29 Mar 2006 05:56:08 -0000 1.3 --- lcode.c 12 Jun 2006 03:50:37 -0000 1.4 *************** *** 732,736 **** lua_assert(e1->t == NO_JUMP); /* list must be closed */ luaK_dischargevars(fs, e2); ! luaK_concat(fs, &e2->f, e1->f); /* fixed 5.1 bug */ *e1 = *e2; break; --- 732,736 ---- lua_assert(e1->t == NO_JUMP); /* list must be closed */ luaK_dischargevars(fs, e2); ! luaK_concat(fs, &e2->f, e1->f); *e1 = *e2; break; *************** *** 739,743 **** lua_assert(e1->f == NO_JUMP); /* list must be closed */ luaK_dischargevars(fs, e2); ! luaK_concat(fs, &e2->t, e1->t); /* fixed 5.1 bug */ *e1 = *e2; break; --- 739,743 ---- lua_assert(e1->f == NO_JUMP); /* list must be closed */ luaK_dischargevars(fs, e2); ! luaK_concat(fs, &e2->t, e1->t); *e1 = *e2; break; *************** *** 749,753 **** freeexp(fs, e1); SETARG_B(getcode(fs, e2), e1->u.s.info); ! e1->k = e2->k; e1->u.s.info = e2->u.s.info; } else { --- 749,753 ---- freeexp(fs, e1); SETARG_B(getcode(fs, e2), e1->u.s.info); ! e1->k = VRELOCABLE; e1->u.s.info = e2->u.s.info; } else { Index: ldo.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ldo.c 29 Mar 2006 05:48:11 -0000 1.2 --- ldo.c 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 384,388 **** StkId firstArg = cast(StkId, ud); CallInfo *ci = L->ci; ! if (L->status != LUA_YIELD) { /* start coroutine */ lua_assert(ci == L->base_ci && firstArg > L->base); if (luaD_precall(L, firstArg - 1, LUA_MULTRET) != PCRLUA) --- 384,388 ---- StkId firstArg = cast(StkId, ud); CallInfo *ci = L->ci; ! if (L->status == 0) { /* start coroutine? */ lua_assert(ci == L->base_ci && firstArg > L->base); if (luaD_precall(L, firstArg - 1, LUA_MULTRET) != PCRLUA) *************** *** 390,393 **** --- 390,395 ---- } else { /* resuming from previous yield */ + lua_assert(L->status == LUA_YIELD); + L->status = 0; if (!f_isLua(ci)) { /* `common' yield? */ /* finish interrupted execution of `OP_CALL' */ *************** *** 400,404 **** L->base = L->ci->base; } - L->status = 0; luaV_execute(L, cast_int(L->ci - L->base_ci)); } --- 402,405 ---- Index: lparser.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lparser.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lparser.h 29 Mar 2006 05:48:11 -0000 1.2 --- lparser.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 10,14 **** #include "llimits.h" #include "lobject.h" - #include "ltable.h" #include "lzio.h" --- 10,13 ---- Index: lstrlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstrlib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lstrlib.c 29 Mar 2006 06:00:00 -0000 1.1 --- lstrlib.c 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 704,707 **** --- 704,711 ---- break; } + case '\r': { + luaL_addlstring(b, "\\r", 2); + break; + } case '\0': { luaL_addlstring(b, "\\000", 4); *************** *** 806,810 **** } default: { /* also treat cases `pnLlh' */ ! return luaL_error(L, "invalid option to " LUA_QL("format")); } } --- 810,815 ---- } default: { /* also treat cases `pnLlh' */ ! return luaL_error(L, "invalid option " LUA_QL("%%%c") " to " ! LUA_QL("format"), *(strfrmt - 1)); } } Index: lparser.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lparser.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lparser.c 29 Mar 2006 05:48:11 -0000 1.2 --- lparser.c 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 24,28 **** #include "lstate.h" #include "lstring.h" ! --- 24,28 ---- #include "lstate.h" #include "lstring.h" ! #include "ltable.h" *************** *** 300,304 **** if (bl->upval) luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0); ! lua_assert(!bl->isbreakable || !bl->upval); /* loops have no body */ lua_assert(bl->nactvar == fs->nactvar); fs->freereg = fs->nactvar; /* free registers */ --- 300,305 ---- if (bl->upval) luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0); ! /* a block either controls scope or breaks (never both) */ ! lua_assert(!bl->isbreakable || !bl->upval); lua_assert(bl->nactvar == fs->nactvar); fs->freereg = fs->nactvar; /* free registers */ *************** *** 445,448 **** --- 446,450 ---- int reg = ls->fs->freereg; expdesc key, val; + int rkkey; if (ls->t.token == TK_NAME) { luaY_checklimit(fs, cc->nh, MAX_INT, "items in a constructor"); *************** *** 453,460 **** cc->nh++; checknext(ls, '='); ! luaK_exp2RK(fs, &key); expr(ls, &val); ! luaK_codeABC(fs, OP_SETTABLE, cc->t->u.s.info, luaK_exp2RK(fs, &key), ! luaK_exp2RK(fs, &val)); fs->freereg = reg; /* free registers */ } --- 455,461 ---- cc->nh++; checknext(ls, '='); ! rkkey = luaK_exp2RK(fs, &key); expr(ls, &val); ! luaK_codeABC(fs, OP_SETTABLE, cc->t->u.s.info, rkkey, luaK_exp2RK(fs, &val)); fs->freereg = reg; /* free registers */ } Index: luac.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/luac.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luac.c 29 Mar 2006 06:00:00 -0000 1.1 --- luac.c 12 Jun 2006 03:50:38 -0000 1.2 *************** *** 71,74 **** --- 71,75 ---- { int i; + int version=0; if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0]; for (i=1; i<argc; i++) *************** *** 79,82 **** --- 80,84 ---- { ++i; + if (version) ++version; break; } *************** *** 96,103 **** stripping=1; else if (IS("-v")) /* show version */ ! { ! printf("%s %s\n",LUA_VERSION,LUA_COPYRIGHT); ! if (argc==2) exit(EXIT_SUCCESS); ! } else /* unknown option */ usage(argv[i]); --- 98,102 ---- stripping=1; else if (IS("-v")) /* show version */ ! ++version; else /* unknown option */ usage(argv[i]); *************** *** 108,111 **** --- 107,115 ---- argv[--i]=Output; } + if (version) + { + printf("%s %s\n",LUA_RELEASE,LUA_COPYRIGHT); + if (version==argc-1) exit(EXIT_SUCCESS); + } return i; } *************** *** 113,117 **** #define toproto(L,i) (clvalue(L->top+(i))->l.p) ! static Proto* combine(lua_State* L, int n) { if (n==1) --- 117,121 ---- #define toproto(L,i) (clvalue(L->top+(i))->l.p) ! static const Proto* combine(lua_State* L, int n) { if (n==1) *************** *** 157,161 **** int argc=s->argc; char** argv=s->argv; ! Proto* f; int i; if (!lua_checkstack(L,argc)) fatal("too many input files"); --- 161,165 ---- int argc=s->argc; char** argv=s->argv; ! const Proto* f; int i; if (!lua_checkstack(L,argc)) fatal("too many input files"); Index: lapi.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lapi.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lapi.c 29 Mar 2006 05:48:11 -0000 1.2 --- lapi.c 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 33,37 **** const char lua_ident[] = ! "$Lua: " LUA_VERSION " " LUA_COPYRIGHT " $\n" "$Authors: " LUA_AUTHORS " $\n" "$URL: www.lua.org $\n"; --- 33,37 ---- const char lua_ident[] = ! "$Lua: " LUA_RELEASE " " LUA_COPYRIGHT " $\n" "$Authors: " LUA_AUTHORS " $\n" "$URL: www.lua.org $\n"; *************** *** 200,203 **** --- 200,206 ---- StkId o; lua_lock(L); + /* explicit test for incompatible code */ + if (idx == LUA_ENVIRONINDEX && L->ci == L->base_ci) + luaG_runerror(L, "no calling environment"); api_checknelems(L, 1); o = index2adr(L, idx); Index: lvm.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lvm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvm.c 29 Mar 2006 05:48:11 -0000 1.2 --- lvm.c 12 Jun 2006 03:50:38 -0000 1.3 *************** *** 377,380 **** --- 377,381 ---- const Instruction *pc; reentry: /* entry point */ + lua_assert(isLua(L->ci)); pc = L->savedpc; cl = &clvalue(L->ci->func)->l; |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:43
|
Update of /cvsroot/wxlua/wxLua/modules/lua/doc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua/doc Modified Files: contents.html lua.css lua.html luac.html manual.html Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: lua.css =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/lua.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lua.css 29 Mar 2006 05:48:10 -0000 1.1 --- lua.css 12 Jun 2006 03:50:36 -0000 1.2 *************** *** 7,10 **** --- 7,17 ---- a:link { color: #000080 ; + background-color: #FFFFFF ; + text-decoration: none ; + } + + a:visited { + background-color: #FFFFFF ; + text-decoration: none ; } Index: manual.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/manual.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** manual.html 29 Mar 2006 05:48:10 -0000 1.2 --- manual.html 12 Jun 2006 03:50:36 -0000 1.3 *************** *** 7,15 **** </head> ! <body bgcolor="#FFFFFF"> ! <hr></hr> <h1> ! <a href="http://www.lua.org/home.html"><img src="logo.gif" alt="[Lua logo]" border="0"></img></a> Lua 5.1 Reference Manual </h1> --- 7,15 ---- [...14107 lines suppressed...] </body></html> --- 8439,8455 ---- <p> ! ! ! ! ! ! <HR> ! <SMALL> ! Last update: ! Mon Jun 5 17:05:27 BRT 2006 ! </SMALL> ! <!-- ! Last change: ready for Lua 5.1.1 ! --> </body></html> Index: contents.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/contents.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** contents.html 29 Mar 2006 05:48:10 -0000 1.2 --- contents.html 12 Jun 2006 03:50:36 -0000 1.3 *************** *** 3,26 **** <TITLE>Lua 5.1 reference manual - contents</TITLE> <LINK REL="stylesheet" TYPE="text/css" HREF="lua.css"> </HEAD> ! <BODY BGCOLOR="#FFFFFF"> <HR> <H1> <A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua" BORDER=0></A> ! Lua 5.1 Reference Manual </H1> ! <SMALL> ! <A HREF="http://www.lua.org/copyright.html">Copyright</A> ! © 2006 Lua.org, PUC-Rio. All rights reserved. ! </SMALL> <HR> - - <H2>Contents</H2> - <UL> - <LI><A HREF="#quick">Quick index</A> <P> <LI><A HREF="manual.html">Top</A> <LI><A HREF="manual.html#1">1 - Introduction</A> --- 3,30 ---- <TITLE>Lua 5.1 reference manual - contents</TITLE> <LINK REL="stylesheet" TYPE="text/css" HREF="lua.css"> + <style type="text/css"> + ul { + list-style-type: none ; + list-style-position: outside ; + } + </style> </HEAD> ! <BODY> <HR> <H1> <A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua" BORDER=0></A> ! Reference manual for Lua 5.1 </H1> ! <A HREF="#contents">contents</A> ! · ! <A HREF="#index">index</A> <HR> <P> + + <H2><A NAME="contents">Contents</A></H2> + <UL style="padding: 0"> <LI><A HREF="manual.html">Top</A> <LI><A HREF="manual.html#1">1 - Introduction</A> *************** *** 87,90 **** --- 91,97 ---- <LI><A HREF="manual.html#5.3">5.3 - Modules</A> <LI><A HREF="manual.html#5.4">5.4 - String Manipulation</A> + <UL> + <LI><A HREF="manual.html#5.4.1">5.4.1 - Patterns</A> + </UL> <LI><A HREF="manual.html#5.5">5.5 - Table Manipulation</A> <LI><A HREF="manual.html#5.6">5.6 - Mathematical Functions</A> *************** *** 94,111 **** </UL> <LI><A HREF="manual.html#6">6 - Lua Stand-alone</A> ! <LI><A HREF="manual.html#incompat">Incompatibilities with the Previous Version</A> ! <LI><A HREF="manual.html#BNF">The Complete Syntax of Lua</A> </UL> ! <H2><A NAME="quick">Quick index</A></H2> <TABLE> <TR VALIGN="top"> ! <TD WIDTH="35%"> ! <H3><A NAME="functions">Functions</A></H3> <A HREF="manual.html#pdf-_G">_G</A><BR> <A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR> <A HREF="manual.html#pdf-assert">assert</A><BR> <A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR> <A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR> <A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR> --- 101,152 ---- </UL> <LI><A HREF="manual.html#6">6 - Lua Stand-alone</A> ! <LI><A HREF="manual.html#7">7 - Incompatibilities with the Previous Version</A> ! <UL> ! <LI><A HREF="manual.html#7.1">7.1 - Changes in the Language</A> ! <LI><A HREF="manual.html#7.2">7.2 - Changes in the Libraries</A> ! <LI><A HREF="manual.html#7.3">7.3 - Changes in the API</A> ! </UL> ! <LI><A HREF="manual.html#8">8 - The Complete Syntax of Lua</A> </UL> ! <H2><A NAME="index">Index</A></H2> <TABLE> <TR VALIGN="top"> ! <TD WIDTH="20%"> ! <H3><A NAME="functions">Lua functions</A></H3> <A HREF="manual.html#pdf-_G">_G</A><BR> <A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR> <A HREF="manual.html#pdf-assert">assert</A><BR> <A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR> + <A HREF="manual.html#pdf-dofile">dofile</A><BR> + <A HREF="manual.html#pdf-error">error</A><BR> + <A HREF="manual.html#pdf-getfenv">getfenv</A><BR> + <A HREF="manual.html#pdf-getmetatable">getmetatable</A><BR> + <A HREF="manual.html#pdf-ipairs">ipairs</A><BR> + <A HREF="manual.html#pdf-load">load</A><BR> + <A HREF="manual.html#pdf-loadfile">loadfile</A><BR> + <A HREF="manual.html#pdf-loadstring">loadstring</A><BR> + <A HREF="manual.html#pdf-module">module</A><BR> + <A HREF="manual.html#pdf-next">next</A><BR> + <A HREF="manual.html#pdf-pairs">pairs</A><BR> + <A HREF="manual.html#pdf-pcall">pcall</A><BR> + <A HREF="manual.html#pdf-print">print</A><BR> + <A HREF="manual.html#pdf-rawequal">rawequal</A><BR> + <A HREF="manual.html#pdf-rawget">rawget</A><BR> + <A HREF="manual.html#pdf-rawset">rawset</A><BR> + <A HREF="manual.html#pdf-require">require</A><BR> + <A HREF="manual.html#pdf-select">select</A><BR> + <A HREF="manual.html#pdf-setfenv">setfenv</A><BR> + <A HREF="manual.html#pdf-setmetatable">setmetatable</A><BR> + <A HREF="manual.html#pdf-tonumber">tonumber</A><BR> + <A HREF="manual.html#pdf-tostring">tostring</A><BR> + <A HREF="manual.html#pdf-type">type</A><BR> + <A HREF="manual.html#pdf-unpack">unpack</A><BR> + <A HREF="manual.html#pdf-xpcall">xpcall</A><BR> + + </TD> + <TD WIDTH="30%"> + <H3> </H3> <A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR> <A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR> *************** *** 128,133 **** <A HREF="manual.html#pdf-debug.setupvalue">debug.setupvalue</A><BR> <A HREF="manual.html#pdf-debug.traceback">debug.traceback</A><BR> - <A HREF="manual.html#pdf-dofile">dofile</A><BR> - <A HREF="manual.html#pdf-error">error</A><BR> <A HREF="manual.html#pdf-file:close">file:close</A><BR> <A HREF="manual.html#pdf-file:flush">file:flush</A><BR> --- 169,172 ---- *************** *** 137,142 **** <A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR> <A HREF="manual.html#pdf-file:write">file:write</A><BR> - <A HREF="manual.html#pdf-getfenv">getfenv</A><BR> - <A HREF="manual.html#pdf-getmetatable">getmetatable</A><BR> <A HREF="manual.html#pdf-io.close">io.close</A><BR> <A HREF="manual.html#pdf-io.flush">io.flush</A><BR> --- 176,179 ---- *************** *** 150,157 **** <A HREF="manual.html#pdf-io.type">io.type</A><BR> <A HREF="manual.html#pdf-io.write">io.write</A><BR> - <A HREF="manual.html#pdf-ipairs">ipairs</A><BR> - <A HREF="manual.html#pdf-load">load</A><BR> - <A HREF="manual.html#pdf-loadfile">loadfile</A><BR> - <A HREF="manual.html#pdf-loadstring">loadstring</A><BR> <A HREF="manual.html#pdf-math.abs">math.abs</A><BR> <A HREF="manual.html#pdf-math.acos">math.acos</A><BR> --- 187,190 ---- *************** *** 167,170 **** --- 200,204 ---- <A HREF="manual.html#pdf-math.fmod">math.fmod</A><BR> <A HREF="manual.html#pdf-math.frexp">math.frexp</A><BR> + <A HREF="manual.html#pdf-math.huge">math.huge</A><BR> <A HREF="manual.html#pdf-math.ldexp">math.ldexp</A><BR> <A HREF="manual.html#pdf-math.log10">math.log10</A><BR> *************** *** 173,176 **** --- 207,211 ---- <A HREF="manual.html#pdf-math.min">math.min</A><BR> <A HREF="manual.html#pdf-math.modf">math.modf</A><BR> + <A HREF="manual.html#pdf-math.pi">math.pi</A><BR> <A HREF="manual.html#pdf-math.pow">math.pow</A><BR> <A HREF="manual.html#pdf-math.rad">math.rad</A><BR> *************** *** 182,187 **** <A HREF="manual.html#pdf-math.tanh">math.tanh</A><BR> <A HREF="manual.html#pdf-math.tan">math.tan</A><BR> - <A HREF="manual.html#pdf-module">module</A><BR> - <A HREF="manual.html#pdf-next">next</A><BR> <A HREF="manual.html#pdf-os.clock">os.clock</A><BR> <A HREF="manual.html#pdf-os.date">os.date</A><BR> --- 217,220 ---- *************** *** 201,214 **** <A HREF="manual.html#pdf-package.preload">package.preload</A><BR> <A HREF="manual.html#pdf-package.seeall">package.seeall</A><BR> - <A HREF="manual.html#pdf-pairs">pairs</A><BR> - <A HREF="manual.html#pdf-pcall">pcall</A><BR> - <A HREF="manual.html#pdf-print">print</A><BR> - <A HREF="manual.html#pdf-rawequal">rawequal</A><BR> - <A HREF="manual.html#pdf-rawget">rawget</A><BR> - <A HREF="manual.html#pdf-rawset">rawset</A><BR> - <A HREF="manual.html#pdf-require">require</A><BR> - <A HREF="manual.html#pdf-select">select</A><BR> - <A HREF="manual.html#pdf-setfenv">setfenv</A><BR> - <A HREF="manual.html#pdf-setmetatable">setmetatable</A><BR> <A HREF="manual.html#pdf-string.byte">string.byte</A><BR> <A HREF="manual.html#pdf-string.char">string.char</A><BR> --- 234,237 ---- *************** *** 230,242 **** <A HREF="manual.html#pdf-table.remove">table.remove</A><BR> <A HREF="manual.html#pdf-table.sort">table.sort</A><BR> - <A HREF="manual.html#pdf-tonumber">tonumber</A><BR> - <A HREF="manual.html#pdf-tostring">tostring</A><BR> - <A HREF="manual.html#pdf-type">type</A><BR> - <A HREF="manual.html#pdf-unpack">unpack</A><BR> - <A HREF="manual.html#pdf-xpcall">xpcall</A><BR> </TD> ! <TD> ! <H3>API</H3> <A HREF="manual.html#lua_Alloc">lua_Alloc</A><BR> <A HREF="manual.html#lua_CFunction">lua_CFunction</A><BR> --- 253,260 ---- <A HREF="manual.html#pdf-table.remove">table.remove</A><BR> <A HREF="manual.html#pdf-table.sort">table.sort</A><BR> </TD> ! <TD WIDTH="25%"> ! <H3>C API</H3> <A HREF="manual.html#lua_Alloc">lua_Alloc</A><BR> <A HREF="manual.html#lua_CFunction">lua_CFunction</A><BR> *************** *** 338,341 **** --- 356,360 ---- <A HREF="manual.html#lua_type">lua_type</A><BR> <A HREF="manual.html#lua_typename">lua_typename</A><BR> + <A HREF="manual.html#lua_upvalueindex">lua_upvalueindex</A><BR> <A HREF="manual.html#lua_xmove">lua_xmove</A><BR> <A HREF="manual.html#lua_yield">lua_yield</A><BR> *************** *** 343,347 **** </TD> <TD> ! <H3>Auxiliary library</H3> <A HREF="manual.html#luaL_Buffer">luaL_Buffer</A><BR> <A HREF="manual.html#luaL_Reg">luaL_Reg</A><BR> --- 362,366 ---- </TD> <TD> ! <H3>auxiliary library</H3> <A HREF="manual.html#luaL_Buffer">luaL_Buffer</A><BR> <A HREF="manual.html#luaL_Reg">luaL_Reg</A><BR> *************** *** 366,369 **** --- 385,390 ---- <A HREF="manual.html#luaL_checktype">luaL_checktype</A><BR> <A HREF="manual.html#luaL_checkudata">luaL_checkudata</A><BR> + <A HREF="manual.html#luaL_dofile">luaL_dofile</A><BR> + <A HREF="manual.html#luaL_dostring">luaL_dostring</A><BR> <A HREF="manual.html#luaL_error">luaL_error</A><BR> <A HREF="manual.html#luaL_getmetafield">luaL_getmetafield</A><BR> *************** *** 399,404 **** <SMALL> Last update: ! Fri Feb 10 17:15:37 BRST 2006 </SMALL> </BODY> --- 420,428 ---- <SMALL> Last update: ! Tue Jun 6 14:55:31 BRT 2006 </SMALL> + <!-- + Last change: reformatted index + --> </BODY> |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/wxbind/src Modified Files: gdi.cpp html.cpp Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** html.cpp 9 Jun 2006 22:51:32 -0000 1.16 --- html.cpp 12 Jun 2006 03:50:38 -0000 1.17 *************** *** 36,39 **** --- 36,135 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // %override wxLua_wxHtmlCell_AdjustPagebreak + // virtual bool AdjustPagebreak(int * pagebreak) + + #if !wxCHECK_VERSION(2, 7, 0) + static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int * pagebreak + int pagebreak = (int)wxlState.GetNumberType(2); + // get this + wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); + // call AdjustPagebreak + returns = self->AdjustPagebreak(&pagebreak); + // push the result number + lua_pushboolean(L, returns); + // + lua_pushnumber(L, pagebreak); + // return the number of parameters + return 2; + } + #else + // virtual bool AdjustPagebreak(int * pagebreak, wxArrayInt& known_pagebreaks) + static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int * pagebreak + int pagebreak = (int)wxlState.GetNumberType(3); + // wxArrayInt& known_pagebreaks + wxArrayInt* known_pagebreaks = (wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt); + // get this + wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); + // call AdjustPagebreak + returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); + // push the result number + lua_pushboolean(L, returns); + // + lua_pushnumber(L, pagebreak); + // return the number of parameters + return 2; + } + #endif + + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + // %override wxLua_wxHtmlCell_AdjustPagebreak + // virtual bool AdjustPagebreak(int * pagebreak) + + #if !wxCHECK_VERSION(2, 7, 0) + static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int * pagebreak + int pagebreak = (int)wxlState.GetNumberType(2); + // get this + wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); + // call AdjustPagebreak + returns = self->AdjustPagebreak(&pagebreak); + // push the result number + lua_pushboolean(L, returns); + // + lua_pushnumber(L, pagebreak); + // return the number of parameters + return 2; + } + #else + // virtual bool AdjustPagebreak(int * pagebreak, wxArrayInt& known_pagebreaks) + static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int * pagebreak + int pagebreak = (int)wxlState.GetNumberType(3); + // wxArrayInt& known_pagebreaks + wxArrayInt* known_pagebreaks = (wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt); + // get this + wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); + // call AdjustPagebreak + returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); + // push the result number + lua_pushboolean(L, returns); + // + lua_pushnumber(L, pagebreak); + // return the number of parameters + return 2; + } + #endif + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + + #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxHTML) // %wxchkver23 virtual wxString GetId() const *************** *** 84,107 **** } - // %override wxLua_wxHtmlCell_AdjustPagebreak - // virtual bool AdjustPagebreak(int * pagebreak) - static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // int * pagebreak - int pagebreak = (int)wxlState.GetNumberType(2); - // get this - wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); - // call AdjustPagebreak - returns = self->AdjustPagebreak(&pagebreak); - // push the result number - lua_pushboolean(L, returns); - // - lua_pushnumber(L, pagebreak); - // return the number of parameters - return 2; - } - // %override wxLua_wxHtmlCell_Find // virtual const wxHtmlCell* Find(int condition, void *param = 0) --- 180,183 ---- *************** *** 371,374 **** --- 447,460 ---- static WXLUAMETHOD s_wxHtmlCell_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 1, 1, { &s_wxluaarg_Number, 0 } }, + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + + #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxHTML) { LuaMethod, "GetId", wxLua_wxHtmlCell_GetId, 0, 0, { 0 } }, *************** *** 379,383 **** { LuaConstructor, "wxHtmlCell", wxLua_wxHtmlCell_constructor, 0, 0, { 0 } }, - { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "Find", wxLua_wxHtmlCell_Find, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "GetDescent", wxLua_wxHtmlCell_GetDescent, 0, 0, { 0 } }, --- 465,468 ---- *************** *** 2438,2441 **** --- 2523,2588 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // !%wxchkver27 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) + static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get number of arguments + int argCount = lua_gettop(L); + // int dont_render = false + int dont_render = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : false); + // int from = 0 + int from = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0); + // int y + int y = (int)wxlState.GetNumberType(3); + // int x + int x = (int)wxlState.GetNumberType(2); + // get this + wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer); + // call Render + returns = self->Render(x, y, from, dont_render); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + // %wxchkver27 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); + static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get number of arguments + int argCount = lua_gettop(L); + // int to = INT_MAX + int to = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : INT_MAX); + // int dont_render = false + int dont_render = (argCount >= 6 ? (int)wxlState.GetNumberType(6) : false); + // int from = 0 + int from = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0); + // wxArrayInt known_pagebreaks + wxArrayInt * known_pagebreaks = (wxArrayInt *)wxlState.GetUserDataType(4, s_wxluatag_wxArrayInt); + // int y + int y = (int)wxlState.GetNumberType(3); + // int x + int x = (int)wxlState.GetNumberType(2); + // get this + wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer); + // call Render + returns = self->Render(x, y, *known_pagebreaks, from, dont_render, to); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + + #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxHTML) // void SetDC(wxDC* dc, double pixel_scale = 1.0) *************** *** 2510,2538 **** } - // int Render(int x, int y, int from = 0, int dont_render = false) - static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get number of arguments - int argCount = lua_gettop(L); - // int dont_render = false - int dont_render = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : false); - // int from = 0 - int from = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0); - // int y - int y = (int)wxlState.GetNumberType(3); - // int x - int x = (int)wxlState.GetNumberType(2); - // get this - wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer); - // call Render - returns = self->Render(x, y, from, dont_render); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // int GetTotalHeight() static int LUACALL wxLua_wxHtmlDCRenderer_GetTotalHeight(lua_State *L) --- 2657,2660 ---- *************** *** 2582,2585 **** --- 2704,2717 ---- static WXLUAMETHOD s_wxHtmlDCRenderer_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 6, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt) + + #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxHTML) { LuaMethod, "SetDC", wxLua_wxHtmlDCRenderer_SetDC, 2, 1, { &s_wxluatag_wxDC, &s_wxluaarg_Number, 0 } }, *************** *** 2589,2593 **** { LuaMethod, "SetSize", wxLua_wxHtmlDCRenderer_SetSize, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetHtmlText", wxLua_wxHtmlDCRenderer_SetHtmlText, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, - { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetTotalHeight", wxLua_wxHtmlDCRenderer_GetTotalHeight, 0, 0, { 0 } }, { LuaGetProp, "TotalHeight", wxLua_wxHtmlDCRenderer_GetTotalHeight, 0, 0, {0} }, --- 2721,2724 ---- Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** gdi.cpp 9 Jun 2006 22:51:32 -0000 1.29 --- gdi.cpp 12 Jun 2006 03:50:38 -0000 1.30 *************** *** 2992,3001 **** ! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator) ! // wxArrayString* GetEncodings() static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L) { --- 2992,3033 ---- ! #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString) ! // %wxchkver27 static wxArrayString GetEncodings() ! static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxArrayString *returns; ! // call GetEncodings ! // allocate a new object using the copy constructor ! returns = new wxArrayString(wxFontEnumerator::GetEncodings()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxArrayString *)returns); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns); + return 1; + } ! // %wxchkver27 static wxArrayString GetFacenames() ! static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxArrayString *returns; ! // call GetFacenames ! // allocate a new object using the copy constructor ! returns = new wxArrayString(wxFontEnumerator::GetFacenames()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxArrayString *)returns); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns); ! ! return 1; ! } ! ! #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString) ! ! ! #if (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) ! // !%wxchkver27 wxArrayString* GetEncodings() static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L) { *************** *** 3012,3016 **** } ! // wxArrayString* GetFacenames() static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L) { --- 3044,3048 ---- } ! // !%wxchkver27 wxArrayString* GetFacenames() static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L) { *************** *** 3027,3031 **** } ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator) --- 3059,3067 ---- } ! #endif // (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) ! ! ! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) *************** *** 3120,3133 **** static WXLUAMETHOD s_wxFontEnumerator_methods[] = { ! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! { LuaGetProp, "Encodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, {0} }, ! { LuaGetProp, "Facenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, {0} }, ! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator) { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } }, { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator) --- 3156,3175 ---- static WXLUAMETHOD s_wxFontEnumerator_methods[] = { ! #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString) ! { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } }, ! { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } }, ! #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString) ! #if (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } }, { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) ! ! ! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) ! { LuaGetProp, "Encodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, {0} }, ! { LuaGetProp, "Facenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, {0} }, ! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator)) |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:41
|
Update of /cvsroot/wxlua/wxLua/modules/lua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua/include Modified Files: lauxlib.h lua.h luaconf.h lualib.h Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/luaconf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luaconf.h 29 Mar 2006 05:48:11 -0000 1.1 --- luaconf.h 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 61,64 **** --- 61,76 ---- /* + @@ LUA_PATH and LUA_CPATH are the names of the environment variables that + @* Lua check to set its paths. + @@ LUA_INIT is the name of the environment variable that Lua + @* checks for initialization code. + ** CHANGE them if you want different names. + */ + #define LUA_PATH "LUA_PATH" + #define LUA_CPATH "LUA_CPATH" + #define LUA_INIT "LUA_INIT" + + + /* @@ LUA_PATH_DEFAULT is the default path that Lua uses to look for @* Lua libraries. *************** *** 544,547 **** --- 556,570 ---- #if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \ (defined(__i386) || defined (_M_IX86) || defined(__i386__)) + + /* On a Microsoft compiler, use assembler */ + #if defined(_MSC_VER) + + #define lua_number2int(i,d) __asm fld d __asm fistp i + #define lua_number2integer(i,n) lua_number2int(i, n) + + /* the next trick should work on any Pentium, but sometimes clashes + with a DirectX idiosyncrasy */ + #else + union luai_Cast { double l_d; long l_l; }; #define lua_number2int(i,d) \ *************** *** 549,552 **** --- 572,578 ---- #define lua_number2integer(i,n) lua_number2int(i, n) + #endif + + /* this option always works, but may be slow */ #else Index: lauxlib.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lauxlib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lauxlib.h 29 Mar 2006 05:48:11 -0000 1.2 --- lauxlib.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 109,115 **** #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) ! #define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, 0, 0)) ! #define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, 0, 0)) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) --- 109,117 ---- #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) ! #define luaL_dofile(L, fn) \ ! (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) ! #define luaL_dostring(L, s) \ ! (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lua.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lua.h 29 Mar 2006 05:48:11 -0000 1.2 --- lua.h 12 Jun 2006 03:50:37 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- #define LUA_VERSION "Lua 5.1" + #define LUA_RELEASE "Lua 5.1.1" #define LUA_VERSION_NUM 501 #define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio" |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:41
|
Update of /cvsroot/wxlua/wxLua/modules/lua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua Modified Files: Makefile Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 29 Mar 2006 05:48:10 -0000 1.3 --- Makefile 12 Jun 2006 03:50:36 -0000 1.4 *************** *** 46,51 **** TO_MAN= lua.1 luac.1 ! # Lua version. Currently used only for messages. V= 5.1 all: $(PLAT) --- 46,52 ---- TO_MAN= lua.1 luac.1 ! # Lua version and release. V= 5.1 + R= 5.1.1 all: $(PLAT) *************** *** 81,89 **** echo: @echo "" ! @echo "These are the parameters currently set in src/Makefile to build Lua $V:" @echo "" @cd src && $(MAKE) -s echo @echo "" ! @echo "These are the parameters currently set in Makefile to install Lua $V:" @echo "" @echo "PLAT = $(PLAT)" --- 82,90 ---- echo: @echo "" ! @echo "These are the parameters currently set in src/Makefile to build Lua $R:" @echo "" @cd src && $(MAKE) -s echo @echo "" ! @echo "These are the parameters currently set in Makefile to install Lua $R:" @echo "" @echo "PLAT = $(PLAT)" *************** *** 104,107 **** --- 105,109 ---- pecho: @echo "V = $(V)" + @echo "R = $(R)" @echo "TO_BIN = $(TO_BIN)" @echo "TO_INC = $(TO_INC)" *************** *** 112,117 **** # uncomment the last sed expression if you want nil instead of empty strings lecho: ! @echo "-- installation parameters for Lua $V" @echo "VERSION = '$V'" @$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/' @echo "-- EOF" --- 114,120 ---- # uncomment the last sed expression if you want nil instead of empty strings lecho: ! @echo "-- installation parameters for Lua $R" @echo "VERSION = '$V'" + @echo "RELEASE = '$R'" @$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/' @echo "-- EOF" |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:41
|
Update of /cvsroot/wxlua/wxLua/modules/lua/etc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/modules/lua/etc Modified Files: lua.pc Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: lua.pc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/lua.pc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lua.pc 29 Mar 2006 05:48:10 -0000 1.1 --- lua.pc 12 Jun 2006 03:50:37 -0000 1.2 *************** *** 5,8 **** --- 5,10 ---- # grep '^V=' ../Makefile V= 5.1 + # grep '^R=' ../Makefile + R= 5.1.1 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' *************** *** 15,18 **** --- 17,21 ---- INSTALL_CMOD= ${prefix}/lib/lua/${V} + # canonical vars exec_prefix=${prefix} libdir=${exec_prefix}/lib *************** *** 21,27 **** Name: Lua Description: An Extensible Extension Language ! Version: ${V} Requires: Libs: -L${libdir} -llua -lm Cflags: -I${includedir} --- 24,31 ---- Name: Lua Description: An Extensible Extension Language ! Version: ${R} Requires: Libs: -L${libdir} -llua -lm Cflags: -I${includedir} + # (end of lua.pc) |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/bindings/wxwidgets Modified Files: gdi.i html.i override.hpp Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** gdi.i 25 May 2006 22:50:04 -0000 1.25 --- gdi.i 12 Jun 2006 03:50:36 -0000 1.26 *************** *** 376,381 **** virtual bool EnumerateFacenames( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) virtual bool EnumerateEncodings( const wxString &font = "" ) ! wxArrayString* GetEncodings() ! wxArrayString* GetFacenames() %win %property=Encodings, read --- 376,384 ---- virtual bool EnumerateFacenames( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) virtual bool EnumerateEncodings( const wxString &font = "" ) ! ! %wxchkver27 static wxArrayString GetEncodings() ! %wxchkver27 static wxArrayString GetFacenames() ! !%wxchkver27 wxArrayString* GetEncodings() ! !%wxchkver27 wxArrayString* GetFacenames() %win %property=Encodings, read Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** html.i 17 May 2006 05:02:04 -0000 1.8 --- html.i 12 Jun 2006 03:50:36 -0000 1.9 *************** *** 23,27 **** // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak) ! virtual bool AdjustPagebreak(int pagebreak) // (int* pagebreak) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info) --- 23,28 ---- // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak) ! !%wxchkver27 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) ! %wxchkver27 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info) *************** *** 306,310 **** void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! int Render(int x, int y, int from = 0, int dont_render = false) int GetTotalHeight() --- 307,312 ---- void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! !%wxchkver27 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) ! %wxchkver27 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); int GetTotalHeight() Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** override.hpp 29 May 2006 22:31:17 -0000 1.50 --- override.hpp 12 Jun 2006 03:50:36 -0000 1.51 *************** *** 2834,2837 **** --- 2834,2839 ---- %override wxLua_wxHtmlCell_AdjustPagebreak // virtual bool AdjustPagebreak(int * pagebreak) + + #if !wxCHECK_VERSION(2, 7, 0) static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) { *************** *** 2851,2854 **** --- 2853,2878 ---- return 2; } + #else + // virtual bool AdjustPagebreak(int * pagebreak, wxArrayInt& known_pagebreaks) + static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int * pagebreak + int pagebreak = (int)wxlState.GetNumberType(3); + // wxArrayInt& known_pagebreaks + wxArrayInt* known_pagebreaks = (wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt); + // get this + wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell); + // call AdjustPagebreak + returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); + // push the result number + lua_pushboolean(L, returns); + // + lua_pushnumber(L, pagebreak); + // return the number of parameters + return 2; + } + #endif %end |
|
From: John L. <jr...@us...> - 2006-06-12 03:50:40
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13456/wxLua/docs Modified Files: changelog.txt Log Message: update lua to 5.1.1 update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0 Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** changelog.txt 25 May 2006 03:55:22 -0000 1.12 --- changelog.txt 12 Jun 2006 03:50:36 -0000 1.13 *************** *** 6,10 **** -------------------------------------------------------------------- ! - Switched from lua 5.0 to lua 5.1 - All bindings for wxWidgets have been updated to 2.6.3 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files --- 6,10 ---- -------------------------------------------------------------------- ! - Switched from lua 5.0 to lua 5.1, updated to 5.1.1 (6/11/06) - All bindings for wxWidgets have been updated to 2.6.3 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files |
|
From: John L. <jr...@us...> - 2006-06-12 02:48:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16835/wxLua/bindings/wxwidgets Modified Files: windows.i Log Message: Fix %enum ns1::ns2::EnumName to work Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** windows.i 17 May 2006 05:02:04 -0000 1.19 --- windows.i 12 Jun 2006 02:48:09 -0000 1.20 *************** *** 100,104 **** virtual void Enable(bool enable) static wxWindow* FindFocus() ! %overload %rename FindWindow wxWindow* FindWindow(long id) %overload %rename FindWindowName wxWindow* FindWindow(const wxString& name) static wxWindow* FindWindowById(long id, wxWindow* parent = NULL) --- 100,104 ---- virtual void Enable(bool enable) static wxWindow* FindFocus() ! %overload wxWindow* FindWindow(long id) %overload %rename FindWindowName wxWindow* FindWindow(const wxString& name) static wxWindow* FindWindowById(long id, wxWindow* parent = NULL) *************** *** 144,148 **** // %override [int x, int y] GetPositionXY(int x, int y) const - specify dummy x to get overload %overload %rename GetPositionXY virtual void GetPosition(int x=0, int y=0) const // (int* x, int* y) const ! %overload %rename GetPosition wxPoint GetPosition() const // FIXME virtual wxRect GetRect() const virtual int GetScrollPos(int orientation) --- 144,148 ---- // %override [int x, int y] GetPositionXY(int x, int y) const - specify dummy x to get overload %overload %rename GetPositionXY virtual void GetPosition(int x=0, int y=0) const // (int* x, int* y) const ! %overload wxPoint GetPosition() const virtual wxRect GetRect() const virtual int GetScrollPos(int orientation) *************** *** 213,217 **** void SetBestFittingSize(const wxSize& size = wxDefaultSize) void SetCaret(wxCaret *caret) const ! %overload %rename SetClientSize virtual void SetClientSize(const wxSize& size) %overload %rename SetClientSizeWH virtual void SetClientSize(int width, int height) void SetContainingSizer(wxSizer* sizer) --- 213,217 ---- void SetBestFittingSize(const wxSize& size = wxDefaultSize) void SetCaret(wxCaret *caret) const ! %overload virtual void SetClientSize(const wxSize& size) %overload %rename SetClientSizeWH virtual void SetClientSize(int width, int height) void SetContainingSizer(wxSizer* sizer) |
|
From: John L. <jr...@us...> - 2006-06-12 02:48:43
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16835/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix %enum ns1::ns2::EnumName to work Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** genwxbind.lua 9 Jun 2006 22:51:30 -0000 1.73 --- genwxbind.lua 12 Jun 2006 02:48:09 -0000 1.74 *************** *** 1386,1393 **** } - if not member.AltName then - member.AltName = member.Name - end - return member end --- 1386,1389 ---- *************** *** 2892,2907 **** -- if we have wxDateTime::TZ, only take the wxDateTime part local dataType = member.DataType or "" ! local pos = string.find(dataType, "::") local namespace = "" local luaname = member.AltName or member.Name -- for %rename if pos then -- search for last ::, eg. ns1::ns2::enumName -> ns1::ns2 is namespace while pos do ! local p = string.find(dataType, "::", 1, pos) ! if p then pos = p end end namespace = string.sub(dataType, 0, pos - 1) ! luaname = MakeVar(namespace).."_"..luaname -- wxFile::read -> wxFile_read namespace = namespace.."::" end --- 2888,2907 ---- -- if we have wxDateTime::TZ, only take the wxDateTime part local dataType = member.DataType or "" ! local pos = string.find(dataType, "::", 1, 1) local namespace = "" local luaname = member.AltName or member.Name -- for %rename + if pos then -- search for last ::, eg. ns1::ns2::enumName -> ns1::ns2 is namespace while pos do ! local p = string.find(dataType, "::", pos+2, 1) ! if p then pos = p else break end end namespace = string.sub(dataType, 0, pos - 1) ! if not member.AltName then ! luaname = MakeVar(namespace).."_"..luaname -- wxFile::read -> wxFile_read ! end ! namespace = namespace.."::" end *************** *** 3350,3354 **** local funcLuaCall = nil if member.Name == parseObject.Name then ! funcName = "wxLua_"..MakeVar(member.AltName).."_constructor" funcNameBase = funcName if member.IsOverload then --- 3350,3354 ---- local funcLuaCall = nil if member.Name == parseObject.Name then ! funcName = "wxLua_"..MakeVar(member.AltName or member.Name).."_constructor" funcNameBase = funcName if member.IsOverload then *************** *** 3358,3362 **** funcType = "LuaConstructor" ! funcLuaCall = MakeVar(member.AltName) elseif member.Name == "~"..parseObject.Name then funcName = "wxLua_"..MakeVar(parseObject.Name).."_destructor" --- 3358,3362 ---- funcType = "LuaConstructor" ! funcLuaCall = MakeVar(member.AltName or member.Name) elseif member.Name == "~"..parseObject.Name then funcName = "wxLua_"..MakeVar(parseObject.Name).."_destructor" *************** *** 3364,3390 **** funcLuaCall = MakeVar(parseObject.Name) elseif member.IsConstructor then ! funcName = "wxLua_"..MakeVar(member.AltName).."_constructor" funcType = "LuaConstructor" ! funcLuaCall = MakeVar(member.AltName) elseif member.IsStaticFunction then -- static functions have two parts one as a member and one as a function ! funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.AltName) funcType = "LuaMethod" ! funcLuaCall = MakeVar(member.AltName) if member.IsBuiltin then funcType = "LuaGlobal" ! funcLuaCall = MakeVar(parseObject.Name).."_"..MakeVar(member.AltName) end elseif parseObject.Name == "builtin" or member.IsBuiltin then ! funcName = "wxLua_function_"..MakeVar(member.AltName) funcType = "LuaGlobal" ! funcLuaCall = MakeVar(member.AltName) else if not parseObject.Name then print("parseObject.Name nil File: "..member.File..": (line "..member.LineNumber..") "..member.LineData.."\n") end - if not member.AltName then - print("member.AltName nil File: "..member.File..": (line "..member.LineNumber..") "..member.LineData.."\n") - end -- special case for unary -, convert from op_sub to op_neg if necessary --- 3364,3387 ---- funcLuaCall = MakeVar(parseObject.Name) elseif member.IsConstructor then ! funcName = "wxLua_"..MakeVar(member.AltName or member.Name).."_constructor" funcType = "LuaConstructor" ! funcLuaCall = MakeVar(member.AltName or member.Name) elseif member.IsStaticFunction then -- static functions have two parts one as a member and one as a function ! funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.AltName or member.Name) funcType = "LuaMethod" ! funcLuaCall = MakeVar(member.AltName or member.Name) if member.IsBuiltin then funcType = "LuaGlobal" ! funcLuaCall = MakeVar(parseObject.Name).."_"..MakeVar(member.AltName or member.Name) end elseif parseObject.Name == "builtin" or member.IsBuiltin then ! funcName = "wxLua_function_"..MakeVar(member.AltName or member.Name) funcType = "LuaGlobal" ! funcLuaCall = MakeVar(member.AltName or member.Name) else if not parseObject.Name then print("parseObject.Name nil File: "..member.File..": (line "..member.LineNumber..") "..member.LineData.."\n") end -- special case for unary -, convert from op_sub to op_neg if necessary *************** *** 3396,3404 **** end ! funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.AltName) if member.IsOverload then -- if not the default function then call it directly funcNameBase = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.Name) ! if (member.Name == member.AltName) then overloadCount[funcName] = (overloadCount[funcName] or 0)+1 funcName = funcName..tostring(overloadCount[funcName]) --- 3393,3401 ---- end ! funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.AltName or member.Name) if member.IsOverload then -- if not the default function then call it directly funcNameBase = "wxLua_"..MakeVar(parseObject.Name).."_"..MakeVar(member.Name) ! if not member.AltName then overloadCount[funcName] = (overloadCount[funcName] or 0)+1 funcName = funcName..tostring(overloadCount[funcName]) *************** *** 3407,3411 **** funcType = "LuaMethod" ! funcLuaCall = MakeVar(member.AltName) end --- 3404,3408 ---- funcType = "LuaMethod" ! funcLuaCall = MakeVar(member.AltName or member.Name) end *************** *** 3518,3522 **** if (not member.IsOverload) or (member.Name ~= parseObject.Name) or (overloadCount[funcNameBase] == 1) then local f = funcNameBase ! if (member.Name ~= member.AltName) then f = funcName end funcMap = " { "..funcType..", \""..funcLuaCall.."\", "..f..", "..paramCount..", "..requiredParamCount..", "..overload_argList.."0 } },\n" end --- 3515,3522 ---- if (not member.IsOverload) or (member.Name ~= parseObject.Name) or (overloadCount[funcNameBase] == 1) then local f = funcNameBase ! if string.find(funcNameBase, "wxLua_wxControlWithItems_Append", 1, 1) then ! print(funcNameBase, funcName, member.Name, member.AltName) ! end ! if member.AltName and (member.AltName ~= member.Name) then f = funcName end funcMap = " { "..funcType..", \""..funcLuaCall.."\", "..f..", "..paramCount..", "..requiredParamCount..", "..overload_argList.."0 } },\n" end *************** *** 3717,3721 **** -- FIXME add the include function stuff here? if not functionBindingTable[methodcondition] then functionBindingTable[methodcondition] = {} end ! functionBindingTable[methodcondition][member.AltName] = methodBinding else if not interface.objectData[o].BindTable[methodcondition] then interface.objectData[o].BindTable[methodcondition] = {} end --- 3717,3721 ---- -- FIXME add the include function stuff here? if not functionBindingTable[methodcondition] then functionBindingTable[methodcondition] = {} end ! functionBindingTable[methodcondition][member.AltName or member.Name] = methodBinding else if not interface.objectData[o].BindTable[methodcondition] then interface.objectData[o].BindTable[methodcondition] = {} end *************** *** 3946,3951 **** indent = " " table.insert(fileData, "#if "..condition.."\n") - else - print("Condition '"..condition.."'") end --- 3946,3949 ---- |
|
From: John L. <jr...@us...> - 2006-06-12 02:48:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16835/wxLua/modules/wxbind/src Modified Files: windows.cpp wx_bind.cpp Log Message: Fix %enum ns1::ns2::EnumName to work Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** windows.cpp 9 Jun 2006 22:51:33 -0000 1.24 --- windows.cpp 12 Jun 2006 02:48:09 -0000 1.25 *************** *** 578,582 **** } ! // %overload %rename FindWindow wxWindow* FindWindow(long id) static int LUACALL wxLua_wxWindow_FindWindow1(lua_State *L) { --- 578,582 ---- } ! // %overload wxWindow* FindWindow(long id) static int LUACALL wxLua_wxWindow_FindWindow1(lua_State *L) { *************** *** 2612,2616 **** } ! // %overload %rename GetPosition wxPoint GetPosition() const // FIXME static int LUACALL wxLua_wxWindow_GetPosition1(lua_State *L) { --- 2612,2616 ---- } ! // %overload wxPoint GetPosition() const static int LUACALL wxLua_wxWindow_GetPosition1(lua_State *L) { *************** *** 2788,2792 **** } ! // %overload %rename SetClientSize virtual void SetClientSize(const wxSize& size) static int LUACALL wxLua_wxWindow_SetClientSize1(lua_State *L) { --- 2788,2792 ---- } ! // %overload virtual void SetClientSize(const wxSize& size) static int LUACALL wxLua_wxWindow_SetClientSize1(lua_State *L) { Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wx_bind.cpp 9 Jun 2006 22:51:33 -0000 1.48 --- wx_bind.cpp 12 Jun 2006 02:48:09 -0000 1.49 *************** *** 5030,5033 **** --- 5030,5037 ---- + // ---------------------------------------------------------------------------- + // wxLuaGetClassList_wx() is called to register classes + // ---------------------------------------------------------------------------- + WXLUACLASS* wxLuaGetClassList_wx(size_t &count) { |
|
From: John L. <jr...@us...> - 2006-06-09 22:52:07
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/bindings Modified Files: genwxbind.lua Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** genwxbind.lua 9 Jun 2006 03:24:49 -0000 1.72 --- genwxbind.lua 9 Jun 2006 22:51:30 -0000 1.73 *************** *** 2896,2901 **** local luaname = member.AltName or member.Name -- for %rename if pos then namespace = string.sub(dataType, 0, pos - 1) ! luaname = namespace.."_"..luaname -- wxFile::read -> wxFile_read namespace = namespace.."::" end --- 2896,2907 ---- local luaname = member.AltName or member.Name -- for %rename if pos then + -- search for last ::, eg. ns1::ns2::enumName -> ns1::ns2 is namespace + while pos do + local p = string.find(dataType, "::", 1, pos) + if p then pos = p end + end + namespace = string.sub(dataType, 0, pos - 1) ! luaname = MakeVar(namespace).."_"..luaname -- wxFile::read -> wxFile_read namespace = namespace.."::" end *************** *** 3927,3942 **** -- Object Include List -- ------------------------------------------------------------------------ for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classIncludeBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end for idx, classIncludeBinding in pairs_sort(classIncludeBindingList) do ! table.insert(fileData, classIncludeBinding.Include) end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 3933,3961 ---- -- Object Include List -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// Includes\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classIncludeBindingList then ! local has_condition = condition ~= "1" ! local indent = "" ! ! if has_condition then ! indent = " " ! table.insert(fileData, "#if "..condition.."\n") ! else ! print("Condition '"..condition.."'") end for idx, classIncludeBinding in pairs_sort(classIncludeBindingList) do ! table.insert(fileData, indent..classIncludeBinding.Include) end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 3948,3964 **** -- Class Tag Declaration -- ------------------------------------------------------------------------ table.insert(fileData, "// Lua Tag Method Values for each Class\n") for condition, classTagBindingList in pairs_sort(classTagBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end for idx, classTagBinding in pairs_sort(classTagBindingList) do ! table.insert(fileData, classTagBinding.ExternDeclaration) end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 3967,3993 ---- -- Class Tag Declaration -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") table.insert(fileData, "// Lua Tag Method Values for each Class\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + for condition, classTagBindingList in pairs_sort(classTagBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then ! local has_condition = condition ~= "1" ! local indent = "" ! ! if has_condition then ! indent = " " ! table.insert(fileData, "#if "..condition.."\n") end for idx, classTagBinding in pairs_sort(classTagBindingList) do ! table.insert(fileData, indent..classTagBinding.ExternDeclaration) end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 3970,3987 **** -- Class Method Table Declaration -- ------------------------------------------------------------------------ ! table.insert(fileData, "// Method Table\n") for condition, classTagBindingList in pairs_sort(classTagBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end for idx, classTagBinding in pairs_sort(classTagBindingList) do ! table.insert(fileData, classTagBinding.ExternMethodDeclaration) ! table.insert(fileData, classTagBinding.ExternMethodCountDeclaration) end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 3999,4026 ---- -- Class Method Table Declaration -- ------------------------------------------------------------------------ ! ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// Method Tables\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") ! for condition, classTagBindingList in pairs_sort(classTagBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then ! local has_condition = condition ~= "1" ! local indent = "" ! ! if has_condition then ! indent = " " ! table.insert(fileData, "#if "..condition.."\n") end for idx, classTagBinding in pairs_sort(classTagBindingList) do ! table.insert(fileData, indent..classTagBinding.ExternMethodDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternMethodCountDeclaration) end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 3993,4015 **** -- Encapsulation Declarations -- ------------------------------------------------------------------------ for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and encapsulationBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end for idx, encapsulationBinding in pairs_sort(encapsulationBindingList) do if encapsulationBinding and encapsulationBinding.Declaration then ! table.insert(fileData, encapsulationBinding.Declaration) end end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end end ! table.insert(fileData, "\n\n") table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n") --- 4032,4065 ---- -- Encapsulation Declarations -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// Encapsulation Declarations\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and encapsulationBindingList then ! local has_condition = condition ~= "1" ! local indent = "" ! ! if has_condition then ! indent = " " ! table.insert(fileData, "#if "..condition.."\n") end for idx, encapsulationBinding in pairs_sort(encapsulationBindingList) do if encapsulationBinding and encapsulationBinding.Declaration then ! table.insert(fileData, indent..encapsulationBinding.Declaration) end end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end end ! table.insert(fileData, "\n") table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n") *************** *** 4059,4062 **** --- 4109,4117 ---- -- GetClassList -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n") table.insert(fileData, " static WXLUACLASS classList[] =\n {\n") *************** *** 4064,4068 **** for condition, classBindingList in pairs_sort(classBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then ! if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") end --- 4119,4125 ---- for condition, classBindingList in pairs_sort(classBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then table.insert(fileData, "\n#if "..condition.."\n") end *************** *** 4072,4077 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4129,4134 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4182,4186 **** for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and encapsulationBindingList then ! if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") end --- 4239,4245 ---- for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and encapsulationBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then table.insert(fileData, "\n#if "..condition.."\n") end *************** *** 4192,4197 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4251,4256 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4221,4230 **** table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %define\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n") for condition, defineBindingList in pairs_sort(defineBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end --- 4280,4291 ---- table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %define\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n\n") for condition, defineBindingList in pairs_sort(defineBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then ! table.insert(fileData, "#if "..condition.."\n") end *************** *** 4233,4238 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4294,4301 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4241,4250 **** table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %enum\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n") for condition, enumBindingList in pairs_sort(enumBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and enumBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end --- 4304,4315 ---- table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %enum\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n\n") for condition, enumBindingList in pairs_sort(enumBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and enumBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then ! table.insert(fileData, "#if "..condition.."\n") end *************** *** 4253,4258 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4318,4325 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4277,4286 **** table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %define %string\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n") for condition, stringBindingList in pairs_sort(stringBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and stringBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end --- 4344,4355 ---- table.insert(fileData, " // --------------------------------------------------------------------\n") table.insert(fileData, " // %define %string\n") ! table.insert(fileData, " // --------------------------------------------------------------------\n\n") for condition, stringBindingList in pairs_sort(stringBindingTable) do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and stringBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then ! table.insert(fileData, "#if "..condition.."\n") end *************** *** 4289,4294 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4358,4365 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4322,4326 **** for condition, objectBindingList in pairs_sort(objectBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and objectBindingList then ! if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") end --- 4393,4399 ---- for condition, objectBindingList in pairs_sort(objectBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and objectBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then table.insert(fileData, "\n#if "..condition.."\n") end *************** *** 4330,4335 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4403,4410 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4338,4342 **** for condition, pointerBindingList in pairs_sort(pointerBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and pointerBindingList then ! if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") end --- 4413,4419 ---- for condition, pointerBindingList in pairs_sort(pointerBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and pointerBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then table.insert(fileData, "\n#if "..condition.."\n") end *************** *** 4346,4351 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4423,4430 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4379,4384 **** for condition, eventBindingList in pairs_sort(eventBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and eventBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end --- 4458,4465 ---- for condition, eventBindingList in pairs_sort(eventBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and eventBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then ! table.insert(fileData, "#if "..condition.."\n") end *************** *** 4387,4392 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4468,4475 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n") end end *************** *** 4414,4428 **** for condition, functionBindingList in pairs_sort(functionBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") end table.insert(fileData, "\n") - --local bindCount = table.getn(functionBindingList) - --for i=1,bindCount do for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then - local lineCount = table.getn(functionBinding.Method) for line=1, lineCount do --- 4497,4510 ---- for condition, functionBindingList in pairs_sort(functionBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then ! table.insert(fileData, "#if "..condition.."\n") end table.insert(fileData, "\n") for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then local lineCount = table.getn(functionBinding.Method) for line=1, lineCount do *************** *** 4432,4439 **** end ! table.insert(fileData, "\n\n") ! ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4514,4521 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") ! else ! table.insert(fileData, "\n\n") end end *************** *** 4443,4446 **** --- 4525,4533 ---- -- GetBuiltinList -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n") table.insert(fileData, " static WXLUAMETHOD functionList[] =\n {\n") *************** *** 4448,4452 **** for condition, functionBindingList in pairs_sort(functionBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then ! if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") end --- 4535,4541 ---- for condition, functionBindingList in pairs_sort(functionBindingTable) do if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then ! local has_condition = condition ~= "1" ! ! if has_condition then table.insert(fileData, "\n#if "..condition.."\n") end *************** *** 4456,4461 **** end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end --- 4545,4550 ---- end ! if has_condition then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4525,4529 **** if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif\n\n") end end --- 4614,4618 ---- if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4573,4577 **** if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif\n\n") end end --- 4662,4666 ---- if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4586,4592 **** end ! if overload_condition ~= "" then ! table.insert(fileData, "#endif\n\n") ! end end --- 4675,4681 ---- end ! if overload_condition ~= "" then ! table.insert(fileData, "#endif // "..overload_condition.."\n\n") ! end end *************** *** 4616,4620 **** if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif\n\n") end end --- 4705,4709 ---- if (condition ~= "1") and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end *************** *** 4631,4635 **** if object.Condition then ! table.insert(fileData, "#endif\n") end --- 4720,4724 ---- if object.Condition then ! table.insert(fileData, "#endif // "..object.Condition.."\n") end |
|
From: John L. <jr...@us...> - 2006-06-09 22:52:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxbind.h 9 Jun 2006 03:24:49 -0000 1.34 --- wxbind.h 9 Jun 2006 22:51:30 -0000 1.35 *************** *** 43,136 **** extern WXDLLIMPEXP_WXBIND bool wxLuaBinding_wx_init(); #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #include "wx/generic/helpext.h" ! #endif ! #if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__)) && (wxLUA_USE_wxMetafile) ! #include "wx/metafile.h" [...5394 lines suppressed...] #if wxLUA_USE_wxTextCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTextAttr, wxTextAttr) ! #endif // wxLUA_USE_wxTextCtrl #if wxLUA_USE_wxTimeSpan ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan #if wxLUA_USE_wxTreeCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayTreeItemIds, wxArrayTreeItemIds) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTreeItemId, wxTreeItemId) ! #endif // wxLUA_USE_wxTreeCtrl #if wxLUA_USE_wxXMLResource ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlNode, wxXmlNode) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlProperty, wxXmlProperty) ! #endif // wxLUA_USE_wxXMLResource |
|
From: John L. <jr...@us...> - 2006-06-09 22:52:04
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/bindings/wxwidgets Modified Files: defsutil.i Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** defsutil.i 26 May 2006 03:19:51 -0000 1.25 --- defsutil.i 9 Jun 2006 22:51:30 -0000 1.26 *************** *** 16,20 **** // Application initialization and termination ! %function bool wxHandleFatalExceptions(bool doIt = true) %function void wxInitAllImageHandlers() %function bool wxSafeYield(wxWindow* win = NULL, bool onlyIfNeeded = false) --- 16,23 ---- // Application initialization and termination ! %if wxUSE_ON_FATAL_EXCEPTION ! %function bool wxHandleFatalExceptions(bool doIt = true) ! %endif // wxUSE_ON_FATAL_EXCEPTION ! %function void wxInitAllImageHandlers() %function bool wxSafeYield(wxWindow* win = NULL, bool onlyIfNeeded = false) |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/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: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** xml.cpp 8 Jun 2006 03:22:10 -0000 1.13 --- xml.cpp 9 Jun 2006 22:51:34 -0000 1.14 *************** *** 533,537 **** WXLUAMETHOD* wxXmlNode_methods = s_wxXmlNode_methods; int wxXmlNode_methodCount = sizeof(s_wxXmlNode_methods)/sizeof(s_wxXmlNode_methods[0]); ! #endif --- 533,537 ---- WXLUAMETHOD* wxXmlNode_methods = s_wxXmlNode_methods; int wxXmlNode_methodCount = sizeof(s_wxXmlNode_methods)/sizeof(s_wxXmlNode_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 719,723 **** WXLUAMETHOD* wxXmlProperty_methods = s_wxXmlProperty_methods; int wxXmlProperty_methodCount = sizeof(s_wxXmlProperty_methods)/sizeof(s_wxXmlProperty_methods[0]); ! #endif --- 719,723 ---- WXLUAMETHOD* wxXmlProperty_methods = s_wxXmlProperty_methods; int wxXmlProperty_methodCount = sizeof(s_wxXmlProperty_methods)/sizeof(s_wxXmlProperty_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 961,965 **** WXLUAMETHOD* wxXmlDocument_methods = s_wxXmlDocument_methods; int wxXmlDocument_methodCount = sizeof(s_wxXmlDocument_methods)/sizeof(s_wxXmlDocument_methods[0]); ! #endif --- 961,965 ---- WXLUAMETHOD* wxXmlDocument_methods = s_wxXmlDocument_methods; int wxXmlDocument_methodCount = sizeof(s_wxXmlDocument_methods)/sizeof(s_wxXmlDocument_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 989,993 **** WXLUAMETHOD* wxXmlResourceHandler_methods = s_wxXmlResourceHandler_methods; int wxXmlResourceHandler_methodCount = sizeof(s_wxXmlResourceHandler_methods)/sizeof(s_wxXmlResourceHandler_methods[0]); ! #endif --- 989,993 ---- WXLUAMETHOD* wxXmlResourceHandler_methods = s_wxXmlResourceHandler_methods; int wxXmlResourceHandler_methodCount = sizeof(s_wxXmlResourceHandler_methods)/sizeof(s_wxXmlResourceHandler_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 1022,1026 **** } ! #endif --- 1022,1026 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) *************** *** 1091,1095 **** } ! #endif --- 1091,1095 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) *************** *** 1141,1145 **** } ! #endif --- 1141,1145 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) *************** *** 1165,1169 **** } ! #endif --- 1165,1169 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) *************** *** 1222,1226 **** } ! #endif --- 1222,1226 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) *************** *** 1245,1249 **** } ! #endif // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); --- 1245,1249 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); *************** *** 1569,1573 **** #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif --- 1569,1573 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) *************** *** 1576,1580 **** { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif --- 1576,1580 ---- { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) *************** *** 1582,1591 **** { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif --- 1582,1591 ---- { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) *************** *** 1594,1603 **** { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, --- 1594,1603 ---- { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, *************** *** 1627,1630 **** WXLUAMETHOD* wxXmlResource_methods = s_wxXmlResource_methods; int wxXmlResource_methodCount = sizeof(s_wxXmlResource_methods)/sizeof(s_wxXmlResource_methods[0]); ! #endif --- 1627,1630 ---- WXLUAMETHOD* wxXmlResource_methods = s_wxXmlResource_methods; int wxXmlResource_methodCount = sizeof(s_wxXmlResource_methods)/sizeof(s_wxXmlResource_methods[0]); ! #endif // wxLUA_USE_wxXMLResource Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** defsutil.cpp 8 Jun 2006 03:22:08 -0000 1.17 --- defsutil.cpp 9 Jun 2006 22:51:31 -0000 1.18 *************** *** 100,104 **** } ! #endif --- 100,104 ---- } ! #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 161,165 **** } ! #endif // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) --- 161,165 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) *************** *** 315,319 **** { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, ! #endif --- 315,319 ---- { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, ! #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 323,327 **** { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, ! #endif { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, --- 323,327 ---- { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, *************** *** 339,343 **** WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); ! #endif --- 339,343 ---- WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); ! #endif // wxLUA_USE_wxProcess *************** *** 699,703 **** WXLUAMETHOD* wxMouseState_methods = s_wxMouseState_methods; int wxMouseState_methodCount = sizeof(s_wxMouseState_methods)/sizeof(s_wxMouseState_methods[0]); ! #endif --- 699,703 ---- WXLUAMETHOD* wxMouseState_methods = s_wxMouseState_methods; int wxMouseState_methodCount = sizeof(s_wxMouseState_methods)/sizeof(s_wxMouseState_methods[0]); ! #endif // wxCHECK_VERSION(2,7,0) *************** *** 734,738 **** } ! #endif static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) --- 734,738 ---- } ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) *************** *** 770,774 **** #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, ! #endif { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, --- 770,774 ---- #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, *************** *** 779,783 **** WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); ! #endif --- 779,783 ---- WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); ! #endif // wxLUA_USE_wxBusyCursor *************** *** 850,853 **** WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); ! #endif --- 850,853 ---- WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); ! #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlua.cpp 8 Jun 2006 03:22:10 -0000 1.19 --- wxlua.cpp 9 Jun 2006 22:51:34 -0000 1.20 *************** *** 306,310 **** WXLUAMETHOD* wxLuaPrintout_methods = s_wxLuaPrintout_methods; int wxLuaPrintout_methodCount = sizeof(s_wxLuaPrintout_methods)/sizeof(s_wxLuaPrintout_methods[0]); ! #endif --- 306,310 ---- WXLUAMETHOD* wxLuaPrintout_methods = s_wxLuaPrintout_methods; int wxLuaPrintout_methodCount = sizeof(s_wxLuaPrintout_methods)/sizeof(s_wxLuaPrintout_methods[0]); ! #endif // wxLUA_USE_wxLuaPrintout *************** *** 350,354 **** } ! #endif static int LUACALL wxLua_wxLuaHtmlWindow_destructor(lua_State *) --- 350,354 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxLuaHtmlWindow_destructor(lua_State *) *************** *** 366,370 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaDelete, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_destructor, 0, 0, {0} }, --- 366,370 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaDelete, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_destructor, 0, 0, {0} }, *************** *** 374,378 **** WXLUAMETHOD* wxLuaHtmlWindow_methods = s_wxLuaHtmlWindow_methods; int wxLuaHtmlWindow_methodCount = sizeof(s_wxLuaHtmlWindow_methods)/sizeof(s_wxLuaHtmlWindow_methods[0]); ! #endif --- 374,378 ---- WXLUAMETHOD* wxLuaHtmlWindow_methods = s_wxLuaHtmlWindow_methods; int wxLuaHtmlWindow_methodCount = sizeof(s_wxLuaHtmlWindow_methods)/sizeof(s_wxLuaHtmlWindow_methods[0]); ! #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 417,421 **** } ! #endif // void SetParseInnerCalled(bool fParseInnerCalled = true) --- 417,421 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) // void SetParseInnerCalled(bool fParseInnerCalled = true) *************** *** 487,491 **** { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, ! #endif { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, { &s_wxluaarg_Boolean, 0 } }, --- 487,491 ---- { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, { &s_wxluaarg_Boolean, 0 } }, *************** *** 500,504 **** WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods = s_wxLuaHtmlWinTagEvent_methods; int wxLuaHtmlWinTagEvent_methodCount = sizeof(s_wxLuaHtmlWinTagEvent_methods)/sizeof(s_wxLuaHtmlWinTagEvent_methods[0]); ! #endif --- 500,504 ---- WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods = s_wxLuaHtmlWinTagEvent_methods; int wxLuaHtmlWinTagEvent_methodCount = sizeof(s_wxLuaHtmlWinTagEvent_methods)/sizeof(s_wxLuaHtmlWinTagEvent_methods[0]); ! #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 579,582 **** WXLUAMETHOD* wxLuaTreeItemData_methods = s_wxLuaTreeItemData_methods; int wxLuaTreeItemData_methodCount = sizeof(s_wxLuaTreeItemData_methods)/sizeof(s_wxLuaTreeItemData_methods[0]); ! #endif --- 579,582 ---- WXLUAMETHOD* wxLuaTreeItemData_methods = s_wxLuaTreeItemData_methods; int wxLuaTreeItemData_methodCount = sizeof(s_wxLuaTreeItemData_methods)/sizeof(s_wxLuaTreeItemData_methods[0]); ! #endif // wxLUA_USE_wxTreeCtrl Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** image.cpp 8 Jun 2006 03:22:10 -0000 1.15 --- image.cpp 9 Jun 2006 22:51:32 -0000 1.16 *************** *** 55,59 **** } ! #endif --- 55,59 ---- } ! #endif // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) *************** *** 142,146 **** } ! #endif --- 142,146 ---- } ! #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage) *************** *** 159,163 **** } ! #endif --- 159,163 ---- } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) *************** *** 195,199 **** } ! #endif --- 195,199 ---- } ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) *************** *** 324,328 **** } ! #endif --- 324,328 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) *************** *** 370,374 **** } ! #endif // wxImage(const wxImage& image) --- 370,374 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) // wxImage(const wxImage& image) *************** *** 1449,1453 **** #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, ! #endif --- 1449,1453 ---- #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, ! #endif // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) *************** *** 1458,1467 **** { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! #endif #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, { 0 } }, ! #endif --- 1458,1467 ---- { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage) #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) *************** *** 1469,1473 **** { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, { 0 } }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, { &s_wxluatag_wxPalette, 0 } }, ! #endif --- 1469,1473 ---- { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, { 0 } }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, { &s_wxluatag_wxPalette, 0 } }, ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) *************** *** 1478,1482 **** { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, { &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, { &s_wxluatag_wxRect, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif --- 1478,1482 ---- { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, { &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, { &s_wxluatag_wxRect, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) *************** *** 1484,1488 **** { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 } }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, { &s_wxluatag_wxImage, 0 } }, --- 1484,1488 ---- { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 } }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, { &s_wxluatag_wxImage, 0 } }, *************** *** 1551,1555 **** WXLUAMETHOD* wxImage_methods = s_wxImage_methods; int wxImage_methodCount = sizeof(s_wxImage_methods)/sizeof(s_wxImage_methods[0]); ! #endif --- 1551,1555 ---- WXLUAMETHOD* wxImage_methods = s_wxImage_methods; int wxImage_methodCount = sizeof(s_wxImage_methods)/sizeof(s_wxImage_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1625,1629 **** } ! #endif // wxString GetName() const --- 1625,1629 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) // wxString GetName() const *************** *** 1779,1783 **** { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxInputStream, &s_wxluaarg_Boolean, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxOutputStream, 0 } }, ! #endif { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, { 0 } }, --- 1779,1783 ---- { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxInputStream, &s_wxluaarg_Boolean, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxOutputStream, 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, { 0 } }, *************** *** 1804,1808 **** WXLUAMETHOD* wxImageHandler_methods = s_wxImageHandler_methods; int wxImageHandler_methodCount = sizeof(s_wxImageHandler_methods)/sizeof(s_wxImageHandler_methods[0]); ! #endif --- 1804,1808 ---- WXLUAMETHOD* wxImageHandler_methods = s_wxImageHandler_methods; int wxImageHandler_methodCount = sizeof(s_wxImageHandler_methods)/sizeof(s_wxImageHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1849,1853 **** WXLUAMETHOD* wxBMPHandler_methods = s_wxBMPHandler_methods; int wxBMPHandler_methodCount = sizeof(s_wxBMPHandler_methods)/sizeof(s_wxBMPHandler_methods[0]); ! #endif --- 1849,1853 ---- WXLUAMETHOD* wxBMPHandler_methods = s_wxBMPHandler_methods; int wxBMPHandler_methodCount = sizeof(s_wxBMPHandler_methods)/sizeof(s_wxBMPHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1894,1898 **** WXLUAMETHOD* wxICOHandler_methods = s_wxICOHandler_methods; int wxICOHandler_methodCount = sizeof(s_wxICOHandler_methods)/sizeof(s_wxICOHandler_methods[0]); ! #endif --- 1894,1898 ---- WXLUAMETHOD* wxICOHandler_methods = s_wxICOHandler_methods; int wxICOHandler_methodCount = sizeof(s_wxICOHandler_methods)/sizeof(s_wxICOHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1939,1943 **** WXLUAMETHOD* wxCURHandler_methods = s_wxCURHandler_methods; int wxCURHandler_methodCount = sizeof(s_wxCURHandler_methods)/sizeof(s_wxCURHandler_methods[0]); ! #endif --- 1939,1943 ---- WXLUAMETHOD* wxCURHandler_methods = s_wxCURHandler_methods; int wxCURHandler_methodCount = sizeof(s_wxCURHandler_methods)/sizeof(s_wxCURHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1984,1988 **** WXLUAMETHOD* wxANIHandler_methods = s_wxANIHandler_methods; int wxANIHandler_methodCount = sizeof(s_wxANIHandler_methods)/sizeof(s_wxANIHandler_methods[0]); ! #endif --- 1984,1988 ---- WXLUAMETHOD* wxANIHandler_methods = s_wxANIHandler_methods; int wxANIHandler_methodCount = sizeof(s_wxANIHandler_methods)/sizeof(s_wxANIHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 2029,2033 **** WXLUAMETHOD* wxIFFHandler_methods = s_wxIFFHandler_methods; int wxIFFHandler_methodCount = sizeof(s_wxIFFHandler_methods)/sizeof(s_wxIFFHandler_methods[0]); ! #endif --- 2029,2033 ---- WXLUAMETHOD* wxIFFHandler_methods = s_wxIFFHandler_methods; int wxIFFHandler_methodCount = sizeof(s_wxIFFHandler_methods)/sizeof(s_wxIFFHandler_methods[0]); ! #endif // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) *************** *** 2074,2078 **** WXLUAMETHOD* wxGIFHandler_methods = s_wxGIFHandler_methods; int wxGIFHandler_methodCount = sizeof(s_wxGIFHandler_methods)/sizeof(s_wxGIFHandler_methods[0]); ! #endif --- 2074,2078 ---- WXLUAMETHOD* wxGIFHandler_methods = s_wxGIFHandler_methods; int wxGIFHandler_methodCount = sizeof(s_wxGIFHandler_methods)/sizeof(s_wxGIFHandler_methods[0]); ! #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage) *************** *** 2119,2123 **** WXLUAMETHOD* wxJPEGHandler_methods = s_wxJPEGHandler_methods; int wxJPEGHandler_methodCount = sizeof(s_wxJPEGHandler_methods)/sizeof(s_wxJPEGHandler_methods[0]); ! #endif --- 2119,2123 ---- WXLUAMETHOD* wxJPEGHandler_methods = s_wxJPEGHandler_methods; int wxJPEGHandler_methodCount = sizeof(s_wxJPEGHandler_methods)/sizeof(s_wxJPEGHandler_methods[0]); ! #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) *************** *** 2164,2168 **** WXLUAMETHOD* wxPCXHandler_methods = s_wxPCXHandler_methods; int wxPCXHandler_methodCount = sizeof(s_wxPCXHandler_methods)/sizeof(s_wxPCXHandler_methods[0]); ! #endif --- 2164,2168 ---- WXLUAMETHOD* wxPCXHandler_methods = s_wxPCXHandler_methods; int wxPCXHandler_methodCount = sizeof(s_wxPCXHandler_methods)/sizeof(s_wxPCXHandler_methods[0]); ! #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage) *************** *** 2209,2213 **** WXLUAMETHOD* wxPNGHandler_methods = s_wxPNGHandler_methods; int wxPNGHandler_methodCount = sizeof(s_wxPNGHandler_methods)/sizeof(s_wxPNGHandler_methods[0]); ! #endif --- 2209,2213 ---- WXLUAMETHOD* wxPNGHandler_methods = s_wxPNGHandler_methods; int wxPNGHandler_methodCount = sizeof(s_wxPNGHandler_methods)/sizeof(s_wxPNGHandler_methods[0]); ! #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) *************** *** 2254,2258 **** WXLUAMETHOD* wxPNMHandler_methods = s_wxPNMHandler_methods; int wxPNMHandler_methodCount = sizeof(s_wxPNMHandler_methods)/sizeof(s_wxPNMHandler_methods[0]); ! #endif --- 2254,2258 ---- WXLUAMETHOD* wxPNMHandler_methods = s_wxPNMHandler_methods; int wxPNMHandler_methodCount = sizeof(s_wxPNMHandler_methods)/sizeof(s_wxPNMHandler_methods[0]); ! #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage) *************** *** 2299,2303 **** WXLUAMETHOD* wxTIFFHandler_methods = s_wxTIFFHandler_methods; int wxTIFFHandler_methodCount = sizeof(s_wxTIFFHandler_methods)/sizeof(s_wxTIFFHandler_methods[0]); ! #endif --- 2299,2303 ---- WXLUAMETHOD* wxTIFFHandler_methods = s_wxTIFFHandler_methods; int wxTIFFHandler_methodCount = sizeof(s_wxTIFFHandler_methods)/sizeof(s_wxTIFFHandler_methods[0]); ! #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) *************** *** 2344,2348 **** WXLUAMETHOD* wxXPMHandler_methods = s_wxXPMHandler_methods; int wxXPMHandler_methodCount = sizeof(s_wxXPMHandler_methods)/sizeof(s_wxXPMHandler_methods[0]); ! #endif --- 2344,2348 ---- WXLUAMETHOD* wxXPMHandler_methods = s_wxXPMHandler_methods; int wxXPMHandler_methodCount = sizeof(s_wxXPMHandler_methods)/sizeof(s_wxXPMHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 2381,2385 **** } ! #endif --- 2381,2385 ---- } ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2409,2413 **** } ! #endif --- 2409,2413 ---- } ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2435,2439 **** } ! #endif static int LUACALL wxLua_wxArtProvider_destructor(lua_State *) --- 2435,2439 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) static int LUACALL wxLua_wxArtProvider_destructor(lua_State *) *************** *** 2451,2465 **** #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetIcon", wxLua_wxArtProvider_GetIcon, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetSizeHint", wxLua_wxArtProvider_GetSizeHint, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, ! #endif { LuaDelete, "wxArtProvider", wxLua_wxArtProvider_destructor, 0, 0, {0} }, --- 2451,2465 ---- #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetIcon", wxLua_wxArtProvider_GetIcon, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #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_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaDelete, "wxArtProvider", wxLua_wxArtProvider_destructor, 0, 0, {0} }, *************** *** 2469,2472 **** WXLUAMETHOD* wxArtProvider_methods = s_wxArtProvider_methods; int wxArtProvider_methodCount = sizeof(s_wxArtProvider_methods)/sizeof(s_wxArtProvider_methods[0]); ! #endif --- 2469,2472 ---- WXLUAMETHOD* wxArtProvider_methods = s_wxArtProvider_methods; int wxArtProvider_methodCount = sizeof(s_wxArtProvider_methods)/sizeof(s_wxArtProvider_methods[0]); ! #endif // wxLUA_USE_wxArtProvider Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mdi.cpp 8 Jun 2006 03:22:10 -0000 1.15 --- mdi.cpp 9 Jun 2006 22:51:32 -0000 1.16 *************** *** 52,56 **** WXLUAMETHOD* wxMDIClientWindow_methods = s_wxMDIClientWindow_methods; int wxMDIClientWindow_methodCount = sizeof(s_wxMDIClientWindow_methods)/sizeof(s_wxMDIClientWindow_methods[0]); ! #endif --- 52,56 ---- WXLUAMETHOD* wxMDIClientWindow_methods = s_wxMDIClientWindow_methods; int wxMDIClientWindow_methodCount = sizeof(s_wxMDIClientWindow_methods)/sizeof(s_wxMDIClientWindow_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 128,132 **** } ! #endif --- 128,132 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) *************** *** 146,150 **** } ! #endif --- 146,150 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) *************** *** 179,183 **** } ! #endif // %constructor wxMDIParentFrameDefault() --- 179,183 ---- } ! #endif // (wxLUA_USE_wxMenu) && ((defined(__WXMSW__)) && (wxLUA_USE_MDI)) // %constructor wxMDIParentFrameDefault() *************** *** 337,346 **** { LuaConstructor, "wxMDIParentFrame", wxLua_wxMDIParentFrame_constructor, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIParentFrame_Create, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) { LuaMethod, "SetToolBar", wxLua_wxMDIParentFrame_SetToolBar, 1, 1, { &s_wxluatag_wxToolBar, 0 } }, ! #endif --- 337,346 ---- { LuaConstructor, "wxMDIParentFrame", wxLua_wxMDIParentFrame_constructor, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIParentFrame_Create, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) { LuaMethod, "SetToolBar", wxLua_wxMDIParentFrame_SetToolBar, 1, 1, { &s_wxluatag_wxToolBar, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) *************** *** 350,354 **** { LuaGetProp, "WindowMenu", wxLua_wxMDIParentFrame_GetWindowMenu, 0, 0, {0} }, { LuaSetProp, "WindowMenu", wxLua_wxMDIParentFrame_SetWindowMenu, 1, 1, {0} }, ! #endif { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, { 0 } }, --- 350,354 ---- { LuaGetProp, "WindowMenu", wxLua_wxMDIParentFrame_GetWindowMenu, 0, 0, {0} }, { LuaSetProp, "WindowMenu", wxLua_wxMDIParentFrame_SetWindowMenu, 1, 1, {0} }, ! #endif // (wxLUA_USE_wxMenu) && ((defined(__WXMSW__)) && (wxLUA_USE_MDI)) { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, { 0 } }, *************** *** 372,376 **** WXLUAMETHOD* wxMDIParentFrame_methods = s_wxMDIParentFrame_methods; int wxMDIParentFrame_methodCount = sizeof(s_wxMDIParentFrame_methods)/sizeof(s_wxMDIParentFrame_methods[0]); ! #endif --- 372,376 ---- WXLUAMETHOD* wxMDIParentFrame_methods = s_wxMDIParentFrame_methods; int wxMDIParentFrame_methodCount = sizeof(s_wxMDIParentFrame_methods)/sizeof(s_wxMDIParentFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 397,401 **** } ! #endif --- 397,401 ---- } ! #endif // (defined(__WXMSW__)) && (wxLUA_USE_MDI) *************** *** 464,468 **** } ! #endif // %constructor wxMDIChildFrameDefault() --- 464,468 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) // %constructor wxMDIChildFrameDefault() *************** *** 520,524 **** #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) { LuaMethod, "Maximize", wxLua_wxMDIChildFrame_Maximize, 0, 0, { 0 } }, ! #endif --- 520,524 ---- #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) { LuaMethod, "Maximize", wxLua_wxMDIChildFrame_Maximize, 0, 0, { 0 } }, ! #endif // (defined(__WXMSW__)) && (wxLUA_USE_MDI) *************** *** 526,530 **** { LuaConstructor, "wxMDIChildFrame", wxLua_wxMDIChildFrame_constructor, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIChildFrame_Create, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, { 0 } }, --- 526,530 ---- { LuaConstructor, "wxMDIChildFrame", wxLua_wxMDIChildFrame_constructor, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIChildFrame_Create, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, { 0 } }, *************** *** 537,541 **** WXLUAMETHOD* wxMDIChildFrame_methods = s_wxMDIChildFrame_methods; int wxMDIChildFrame_methodCount = sizeof(s_wxMDIChildFrame_methods)/sizeof(s_wxMDIChildFrame_methods[0]); ! #endif --- 537,541 ---- WXLUAMETHOD* wxMDIChildFrame_methods = s_wxMDIChildFrame_methods; int wxMDIChildFrame_methodCount = sizeof(s_wxMDIChildFrame_methods)/sizeof(s_wxMDIChildFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 586,590 **** } ! #endif // wxDocument* GetDocument() const --- 586,590 ---- } ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) // wxDocument* GetDocument() const *************** *** 660,664 **** #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocChildFrame", wxLua_wxDocChildFrame_constructor, 9, 5, { &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaMethod, "GetDocument", wxLua_wxDocChildFrame_GetDocument, 0, 0, { 0 } }, --- 660,664 ---- #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocChildFrame", wxLua_wxDocChildFrame_constructor, 9, 5, { &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetDocument", wxLua_wxDocChildFrame_GetDocument, 0, 0, { 0 } }, *************** *** 674,678 **** WXLUAMETHOD* wxDocChildFrame_methods = s_wxDocChildFrame_methods; int wxDocChildFrame_methodCount = sizeof(s_wxDocChildFrame_methods)/sizeof(s_wxDocChildFrame_methods[0]); ! #endif --- 674,678 ---- WXLUAMETHOD* wxDocChildFrame_methods = s_wxDocChildFrame_methods; int wxDocChildFrame_methodCount = sizeof(s_wxDocChildFrame_methods)/sizeof(s_wxDocChildFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 702,706 **** } ! #endif --- 702,706 ---- } ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 724,728 **** } ! #endif --- 724,728 ---- } ! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) *************** *** 744,748 **** } ! #endif --- 744,748 ---- } ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) *************** *** 763,767 **** } ! #endif --- 763,767 ---- } ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 795,799 **** } ! #endif --- 795,799 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig) *************** *** 829,833 **** } ! #endif --- 829,833 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFileHistory) *************** *** 867,871 **** } ! #endif --- 867,871 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 913,917 **** } ! #endif // wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true) --- 913,917 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxMenu) // wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true) *************** *** 1327,1346 **** #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetNoHistoryFiles", wxLua_wxDocManager_GetNoHistoryFiles, 0, 0, { 0 } }, ! #endif #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } }, ! #endif #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 2, 2, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 } }, ! #endif #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetHistoryFilesCount", wxLua_wxDocManager_GetHistoryFilesCount, 0, 0, { 0 } }, ! #endif --- 1327,1346 ---- #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetNoHistoryFiles", wxLua_wxDocManager_GetNoHistoryFiles, 0, 0, { 0 } }, ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } }, ! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 2, 2, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 } }, ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetHistoryFilesCount", wxLua_wxDocManager_GetHistoryFilesCount, 0, 0, { 0 } }, ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 1348,1352 **** { LuaMethod, "FileHistoryLoad", wxLua_wxDocManager_FileHistoryLoad, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "FileHistorySave", wxLua_wxDocManager_FileHistorySave, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif --- 1348,1352 ---- { LuaMethod, "FileHistoryLoad", wxLua_wxDocManager_FileHistoryLoad, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "FileHistorySave", wxLua_wxDocManager_FileHistorySave, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig) *************** *** 1354,1358 **** { LuaMethod, "GetFileHistory", wxLua_wxDocManager_GetFileHistory, 0, 0, { 0 } }, { LuaMethod, "OnCreateFileHistory", wxLua_wxDocManager_OnCreateFileHistory, 0, 0, { 0 } }, ! #endif --- 1354,1358 ---- { LuaMethod, "GetFileHistory", wxLua_wxDocManager_GetFileHistory, 0, 0, { 0 } }, { LuaMethod, "OnCreateFileHistory", wxLua_wxDocManager_OnCreateFileHistory, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFileHistory) *************** *** 1360,1364 **** { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, { 0 } }, { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, { 0 } }, ! #endif --- 1360,1364 ---- { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, { 0 } }, { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 1367,1371 **** { LuaMethod, "FileHistoryRemoveMenu", wxLua_wxDocManager_FileHistoryRemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "FileHistoryUseMenu", wxLua_wxDocManager_FileHistoryUseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, --- 1367,1371 ---- { LuaMethod, "FileHistoryRemoveMenu", wxLua_wxDocManager_FileHistoryRemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "FileHistoryUseMenu", wxLua_wxDocManager_FileHistoryUseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxMenu) { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, *************** *** 1405,1409 **** WXLUAMETHOD* wxDocManager_methods = s_wxDocManager_methods; int wxDocManager_methodCount = sizeof(s_wxDocManager_methods)/sizeof(s_wxDocManager_methods[0]); ! #endif --- 1405,1409 ---- WXLUAMETHOD* wxDocManager_methods = s_wxDocManager_methods; int wxDocManager_methodCount = sizeof(s_wxDocManager_methods)/sizeof(s_wxDocManager_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1452,1456 **** } ! #endif static int LUACALL wxLua_wxDocParentFrame_destructor(lua_State *) --- 1452,1456 ---- } ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxDocParentFrame_destructor(lua_State *) *************** *** 1468,1472 **** #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocParentFrame", wxLua_wxDocParentFrame_constructor, 8, 4, { &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaDelete, "wxDocParentFrame", wxLua_wxDocParentFrame_destructor, 0, 0, {0} }, --- 1468,1472 ---- #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocParentFrame", wxLua_wxDocParentFrame_constructor, 8, 4, { &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaDelete, "wxDocParentFrame", wxLua_wxDocParentFrame_destructor, 0, 0, {0} }, *************** *** 1476,1480 **** WXLUAMETHOD* wxDocParentFrame_methods = s_wxDocParentFrame_methods; int wxDocParentFrame_methodCount = sizeof(s_wxDocParentFrame_methods)/sizeof(s_wxDocParentFrame_methods[0]); ! #endif --- 1476,1480 ---- WXLUAMETHOD* wxDocParentFrame_methods = s_wxDocParentFrame_methods; int wxDocParentFrame_methodCount = sizeof(s_wxDocParentFrame_methods)/sizeof(s_wxDocParentFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1527,1531 **** } ! #endif // wxDocument * CreateDocument(const wxString& path, long flags = 0) --- 1527,1531 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) // wxDocument * CreateDocument(const wxString& path, long flags = 0) *************** *** 1827,1831 **** #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaConstructor, "wxDocTemplate", wxLua_wxDocTemplate_constructor, 10, 7, { &s_wxluatag_wxDocManager, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxClassInfo, &s_wxluatag_wxClassInfo, &s_wxluaarg_Number, 0 } }, ! #endif { LuaMethod, "CreateDocument", wxLua_wxDocTemplate_CreateDocument, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, --- 1827,1831 ---- #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaConstructor, "wxDocTemplate", wxLua_wxDocTemplate_constructor, 10, 7, { &s_wxluatag_wxDocManager, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxClassInfo, &s_wxluatag_wxClassInfo, &s_wxluaarg_Number, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaMethod, "CreateDocument", wxLua_wxDocTemplate_CreateDocument, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, *************** *** 1865,1869 **** WXLUAMETHOD* wxDocTemplate_methods = s_wxDocTemplate_methods; int wxDocTemplate_methodCount = sizeof(s_wxDocTemplate_methods)/sizeof(s_wxDocTemplate_methods[0]); ! #endif --- 1865,1869 ---- WXLUAMETHOD* wxDocTemplate_methods = s_wxDocTemplate_methods; int wxDocTemplate_methodCount = sizeof(s_wxDocTemplate_methods)/sizeof(s_wxDocTemplate_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1922,1926 **** } ! #endif --- 1922,1926 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) *************** *** 1943,1947 **** } ! #endif --- 1943,1947 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 1965,1969 **** } ! #endif // wxDocument() --- 1965,1969 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) // wxDocument() *************** *** 2413,2427 **** { LuaMethod, "OnCreateCommandProcessor", wxLua_wxDocument_OnCreateCommandProcessor, 0, 0, { 0 } }, { LuaMethod, "SetCommandProcessor", wxLua_wxDocument_SetCommandProcessor, 1, 1, { &s_wxluatag_wxCommandProcessor, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxList) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, { 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "UpdateAllViews", wxLua_wxDocument_UpdateAllViews, 2, 0, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, { 0 } }, --- 2413,2427 ---- { LuaMethod, "OnCreateCommandProcessor", wxLua_wxDocument_OnCreateCommandProcessor, 0, 0, { 0 } }, { LuaMethod, "SetCommandProcessor", wxLua_wxDocument_SetCommandProcessor, 1, 1, { &s_wxluatag_wxCommandProcessor, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxList) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "UpdateAllViews", wxLua_wxDocument_UpdateAllViews, 2, 0, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, { 0 } }, *************** *** 2467,2471 **** WXLUAMETHOD* wxDocument_methods = s_wxDocument_methods; int wxDocument_methodCount = sizeof(s_wxDocument_methods)/sizeof(s_wxDocument_methods[0]); ! #endif --- 2467,2471 ---- WXLUAMETHOD* wxDocument_methods = s_wxDocument_methods; int wxDocument_methodCount = sizeof(s_wxDocument_methods)/sizeof(s_wxDocument_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 2494,2498 **** } ! #endif --- 2494,2498 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) *************** *** 2514,2518 **** } ! #endif --- 2514,2518 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) *************** *** 2533,2537 **** } ! #endif // virtual void Activate(bool activate) --- 2533,2537 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) // virtual void Activate(bool activate) *************** *** 2736,2750 **** #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) { LuaMethod, "SetFrame", wxLua_wxView_SetFrame, 1, 1, { &s_wxluatag_wxFrame, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "OnUpdate", wxLua_wxView_OnUpdate, 2, 2, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "OnCreatePrintout", wxLua_wxView_OnCreatePrintout, 0, 0, { 0 } }, ! #endif { LuaMethod, "Activate", wxLua_wxView_Activate, 1, 1, { &s_wxluaarg_Boolean, 0 } }, --- 2736,2750 ---- #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) { LuaMethod, "SetFrame", wxLua_wxView_SetFrame, 1, 1, { &s_wxluatag_wxFrame, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "OnUpdate", wxLua_wxView_OnUpdate, 2, 2, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "OnCreatePrintout", wxLua_wxView_OnCreatePrintout, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "Activate", wxLua_wxView_Activate, 1, 1, { &s_wxluaarg_Boolean, 0 } }, *************** *** 2772,2776 **** WXLUAMETHOD* wxView_methods = s_wxView_methods; int wxView_methodCount = sizeof(s_wxView_methods)/sizeof(s_wxView_methods[0]); ! #endif --- 2772,2776 ---- WXLUAMETHOD* wxView_methods = s_wxView_methods; int wxView_methodCount = sizeof(s_wxView_methods)/sizeof(s_wxView_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 2814,2818 **** } ! #endif --- 2814,2818 ---- } ! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor) *************** *** 2835,2839 **** } ! #endif --- 2835,2839 ---- } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) *************** *** 2868,2872 **** } ! #endif // wxCommandProcessor(int maxCommands = -1) --- 2868,2872 ---- } ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxCommandProcessor) // wxCommandProcessor(int maxCommands = -1) *************** *** 3152,3161 **** { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } }, { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } }, ! #endif #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, { 0 } }, ! #endif --- 3152,3161 ---- { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } }, { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } }, ! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor) #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) *************** *** 3163,3167 **** { LuaMethod, "GetEditMenu", wxLua_wxCommandProcessor_GetEditMenu, 0, 0, { 0 } }, { LuaMethod, "SetEditMenu", wxLua_wxCommandProcessor_SetEditMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, --- 3163,3167 ---- { LuaMethod, "GetEditMenu", wxLua_wxCommandProcessor_GetEditMenu, 0, 0, { 0 } }, { LuaMethod, "SetEditMenu", wxLua_wxCommandProcessor_SetEditMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxCommandProcessor) { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, *************** *** 3189,3193 **** WXLUAMETHOD* wxCommandProcessor_methods = s_wxCommandProcessor_methods; int wxCommandProcessor_methodCount = sizeof(s_wxCommandProcessor_methods)/sizeof(s_wxCommandProcessor_methods[0]); ! #endif --- 3189,3193 ---- WXLUAMETHOD* wxCommandProcessor_methods = s_wxCommandProcessor_methods; int wxCommandProcessor_methodCount = sizeof(s_wxCommandProcessor_methods)/sizeof(s_wxCommandProcessor_methods[0]); ! #endif // wxLUA_USE_wxCommandProcessor *************** *** 3281,3285 **** WXLUAMETHOD* wxCommand_methods = s_wxCommand_methods; int wxCommand_methodCount = sizeof(s_wxCommand_methods)/sizeof(s_wxCommand_methods[0]); ! #endif --- 3281,3285 ---- WXLUAMETHOD* wxCommand_methods = s_wxCommand_methods; int wxCommand_methodCount = sizeof(s_wxCommand_methods)/sizeof(s_wxCommand_methods[0]); ! #endif // wxLUA_USE_wxCommandProcessor *************** *** 3322,3326 **** } ! #endif --- 3322,3326 ---- } ! #endif // (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) *************** *** 3368,3372 **** } ! #endif // wxFileHistory(int maxFiles = 9, wxWindowID idBase = wxID_FILE1) --- 3368,3372 ---- } ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxFileHistory) // wxFileHistory(int maxFiles = 9, wxWindowID idBase = wxID_FILE1) *************** *** 3494,3498 **** { LuaMethod, "Load", wxLua_wxFileHistory_Load, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "Save", wxLua_wxFileHistory_Save, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif --- 3494,3498 ---- { LuaMethod, "Load", wxLua_wxFileHistory_Load, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "Save", wxLua_wxFileHistory_Save, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif // (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) *************** *** 3501,3505 **** { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, --- 3501,3505 ---- { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxFileHistory) { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, *************** *** 3516,3519 **** WXLUAMETHOD* wxFileHistory_methods = s_wxFileHistory_methods; int wxFileHistory_methodCount = sizeof(s_wxFileHistory_methods)/sizeof(s_wxFileHistory_methods[0]); ! #endif --- 3516,3519 ---- WXLUAMETHOD* wxFileHistory_methods = s_wxFileHistory_methods; int wxFileHistory_methodCount = sizeof(s_wxFileHistory_methods)/sizeof(s_wxFileHistory_methods[0]); ! #endif // wxLUA_USE_wxFileHistory Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config.cpp 8 Jun 2006 03:22:07 -0000 1.19 --- config.cpp 9 Jun 2006 22:51:31 -0000 1.20 *************** *** 767,771 **** WXLUAMETHOD* wxConfigBase_methods = s_wxConfigBase_methods; int wxConfigBase_methodCount = sizeof(s_wxConfigBase_methods)/sizeof(s_wxConfigBase_methods[0]); ! #endif --- 767,771 ---- WXLUAMETHOD* wxConfigBase_methods = s_wxConfigBase_methods; int wxConfigBase_methodCount = sizeof(s_wxConfigBase_methods)/sizeof(s_wxConfigBase_methods[0]); ! #endif // wxLUA_USE_wxConfig *************** *** 821,825 **** WXLUAMETHOD* wxConfig_methods = s_wxConfig_methods; int wxConfig_methodCount = sizeof(s_wxConfig_methods)/sizeof(s_wxConfig_methods[0]); ! #endif --- 821,825 ---- WXLUAMETHOD* wxConfig_methods = s_wxConfig_methods; int wxConfig_methodCount = sizeof(s_wxConfig_methods)/sizeof(s_wxConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig *************** *** 890,893 **** WXLUAMETHOD* wxFileConfig_methods = s_wxFileConfig_methods; int wxFileConfig_methodCount = sizeof(s_wxFileConf... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-06-09 22:51:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_bind.cpp Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluasocket_bind.cpp 8 Jun 2006 03:22:11 -0000 1.2 --- wxluasocket_bind.cpp 9 Jun 2006 22:51:34 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- { &wxEVT_WXLUA_DEBUG_STACK_ENUM, "wxEVT_WXLUA_DEBUG_STACK_ENUM", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_TABLE_ENUM, "wxEVT_WXLUA_DEBUG_TABLE_ENUM", &s_wxluatag_wxLuaDebugEvent }, + { 0, 0, 0 }, }; *************** *** 54,60 **** --- 55,63 ---- // %define // -------------------------------------------------------------------- + // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 75,78 **** --- 78,82 ---- // %define %string // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 99,102 **** --- 103,110 ---- // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // wxLuaGetFunctionList_wxluasocket() is called to register global functions + // ---------------------------------------------------------------------------- + WXLUAMETHOD* wxLuaGetFunctionList_wxluasocket(size_t &count) { *************** *** 111,114 **** --- 119,126 ---- + // ---------------------------------------------------------------------------- + // wxLuaGetClassList_wxluasocket() is called to register classes + // ---------------------------------------------------------------------------- + WXLUACLASS* wxLuaGetClassList_wxluasocket(size_t &count) { |
|
From: John L. <jr...@us...> - 2006-06-09 22:51:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxstc_bind.cpp 8 Jun 2006 03:22:11 -0000 1.9 --- wxstc_bind.cpp 9 Jun 2006 22:51:34 -0000 1.10 *************** *** 28,35 **** static WXLUAEVENT eventList[] = { - #if !wxCHECK_VERSION(2,5,0) { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, ! #endif { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, --- 28,34 ---- 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_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, *************** *** 55,58 **** --- 54,58 ---- { &wxEVT_STC_USERLISTSELECTION, "wxEVT_STC_USERLISTSELECTION", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_ZOOM, "wxEVT_STC_ZOOM", &s_wxluatag_wxStyledTextEvent }, + { 0, 0, 0 }, }; *************** *** 93,97 **** { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, --- 93,97 ---- { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif // !wxCHECK_VERSION(2,5,0) { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, *************** *** 674,682 **** { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- { 0, 0 }, }; --- 674,683 ---- { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // wxCHECK_VERSION(2,5,0) // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 697,700 **** --- 698,702 ---- // %define %string // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 721,724 **** --- 723,730 ---- // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // wxLuaGetFunctionList_wxstc() is called to register global functions + // ---------------------------------------------------------------------------- + WXLUAMETHOD* wxLuaGetFunctionList_wxstc(size_t &count) { *************** *** 733,736 **** --- 739,746 ---- + // ---------------------------------------------------------------------------- + // wxLuaGetClassList_wxstc() is called to register classes + // ---------------------------------------------------------------------------- + WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count) { Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** stc.cpp 8 Jun 2006 03:22:11 -0000 1.14 --- stc.cpp 9 Jun 2006 22:51:34 -0000 1.15 *************** *** 58,62 **** } ! #endif // void AddText(const wxString& text) --- 58,62 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) // void AddText(const wxString& text) *************** *** 4223,4227 **** } ! #endif --- 4223,4227 ---- } ! #endif // wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) *************** *** 4256,4260 **** } ! #endif --- 4256,4260 ---- } ! #endif // wxCHECK_VERSION(2,4,0) *************** *** 4556,4560 **** } ! #endif --- 4556,4560 ---- } ! #endif // wxLUA_USE_wxColourPenBrush *************** *** 4576,4580 **** } ! #endif --- 4576,4580 ---- } ! #endif // wxLUA_USE_wxFont *************** *** 4647,4651 **** } ! #endif --- 4647,4651 ---- } ! #endif // wxLUA_USE_wxPointSizeRect *************** *** 4679,4683 **** } ! #endif --- 4679,4683 ---- } ! #endif // wxLUA_USE_wxScrollBar *************** *** 4690,4694 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "FormatRange", wxLua_wxStyledTextCtrl_FormatRange, 7, 7, { &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, 0 } }, ! #endif { LuaMethod, "AddText", wxLua_wxStyledTextCtrl_AddText, 1, 1, { &s_wxluaarg_String, 0 } }, --- 4690,4694 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "FormatRange", wxLua_wxStyledTextCtrl_FormatRange, 7, 7, { &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "AddText", wxLua_wxStyledTextCtrl_AddText, 1, 1, { &s_wxluaarg_String, 0 } }, *************** *** 5080,5084 **** { LuaGetProp, "Cursor", wxLua_wxStyledTextCtrl_GetCursor, 0, 0, {0} }, { LuaSetProp, "Cursor", wxLua_wxStyledTextCtrl_SetCursor, 1, 1, {0} }, ! #endif --- 5080,5084 ---- { LuaGetProp, "Cursor", wxLua_wxStyledTextCtrl_GetCursor, 0, 0, {0} }, { LuaSetProp, "Cursor", wxLua_wxStyledTextCtrl_SetCursor, 1, 1, {0} }, ! #endif // wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) *************** *** 5088,5092 **** { LuaGetProp, "STCCursor", wxLua_wxStyledTextCtrl_GetSTCCursor, 0, 0, {0} }, { LuaSetProp, "STCCursor", wxLua_wxStyledTextCtrl_SetSTCCursor, 1, 1, {0} }, ! #endif --- 5088,5092 ---- { LuaGetProp, "STCCursor", wxLua_wxStyledTextCtrl_GetSTCCursor, 0, 0, {0} }, { LuaSetProp, "STCCursor", wxLua_wxStyledTextCtrl_SetSTCCursor, 1, 1, {0} }, ! #endif // wxCHECK_VERSION(2,4,0) *************** *** 5114,5123 **** { LuaGetProp, "EdgeColour", wxLua_wxStyledTextCtrl_GetEdgeColour, 0, 0, {0} }, { LuaSetProp, "EdgeColour", wxLua_wxStyledTextCtrl_SetEdgeColour, 1, 1, {0} }, ! #endif #if wxLUA_USE_wxFont { LuaMethod, "StyleSetFont", wxLua_wxStyledTextCtrl_StyleSetFont, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxFont, 0 } }, ! #endif --- 5114,5123 ---- { LuaGetProp, "EdgeColour", wxLua_wxStyledTextCtrl_GetEdgeColour, 0, 0, {0} }, { LuaSetProp, "EdgeColour", wxLua_wxStyledTextCtrl_SetEdgeColour, 1, 1, {0} }, ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxFont { LuaMethod, "StyleSetFont", wxLua_wxStyledTextCtrl_StyleSetFont, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxFont, 0 } }, ! #endif // wxLUA_USE_wxFont *************** *** 5126,5130 **** { LuaMethod, "PositionFromPoint", wxLua_wxStyledTextCtrl_PositionFromPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "PointFromPosition", wxLua_wxStyledTextCtrl_PointFromPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, ! #endif --- 5126,5130 ---- { LuaMethod, "PositionFromPoint", wxLua_wxStyledTextCtrl_PositionFromPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "PointFromPosition", wxLua_wxStyledTextCtrl_PointFromPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, ! #endif // wxLUA_USE_wxPointSizeRect *************** *** 5132,5136 **** { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, ! #endif }; --- 5132,5136 ---- { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, ! #endif // wxLUA_USE_wxScrollBar }; *************** *** 5822,5826 **** } ! #endif --- 5822,5826 ---- } ! #endif // wxLUA_USE_wxDragDrop *************** *** 5921,5925 **** { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, {0} }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, {0} }, ! #endif }; --- 5921,5925 ---- { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, {0} }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, {0} }, ! #endif // wxLUA_USE_wxDragDrop }; |
