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...> - 2009-05-28 05:49:39
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20367/docs Modified Files: wxlua.html Log Message: Start to colorize it Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxlua.html 24 May 2009 22:37:53 -0000 1.43 --- wxlua.html 28 May 2009 05:49:21 -0000 1.44 *************** *** 1,20 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head><body> <h2><u>wxLua 2.8.10 - Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">Lua</a> [...4476 lines suppressed...] ! <li>Run a Lua file from disk.</li> ! <li>Returns Lua's error code LUA_ERRXXX or 0 on success</li> ! </ul> ! <li>int LuaPCall(int narg, int nresults)</li> ! <ul> ! <li>Uses lua_call to run a chunk on the stack, but sets things up for wxLua first.</li> ! <li>Returns Lua's error code LUA_ERRXXX or 0 on success</li> + </ul> + <li>There are many + other functions which are documented in <i>wxLua/modules/wxlua/include/wxlstate.h</i>.</li> </ul> ! </body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2009-05-25 18:26:33
|
Update of /cvsroot/wxlua/wxLua/samples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20170/samples Modified Files: media.wx.lua Log Message: Make the sample a little nicer by allowing cursor keys on position scrollbar. Fix unsigned int input to function Index: media.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/media.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** media.wx.lua 22 Jan 2008 04:45:39 -0000 1.4 --- media.wx.lua 25 May 2009 18:26:26 -0000 1.5 *************** *** 53,72 **** local stop_ok = false ! local state = mediaCtrl:GetState() ! ! if not loadedMedia then state = -1 end -- not valid to do anything ! if state == wx.wxMEDIASTATE_PLAYING then ! play_ok = false ! pause_ok = true ! stop_ok = true ! elseif state == wx.wxMEDIASTATE_PAUSED then ! play_ok = true ! pause_ok = false ! stop_ok = true ! else --if state == wx.wxMEDIASTATE_STOPPED then ! play_ok = true ! pause_ok = false ! stop_ok = false end --- 53,73 ---- local stop_ok = false ! if loadedMedia then ! -- Note: state may be -1 after first loading a file ! local state = mediaCtrl:GetState() ! if state == wx.wxMEDIASTATE_PLAYING then ! play_ok = false ! pause_ok = true ! stop_ok = true ! elseif state == wx.wxMEDIASTATE_PAUSED then ! play_ok = true ! pause_ok = false ! stop_ok = true ! else -- if state == wx.wxMEDIASTATE_STOPPED then ! play_ok = true ! pause_ok = false ! stop_ok = false ! end end *************** *** 206,224 **** function (event) settingPos = true end) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBRELEASE, ! function (event) ! if loadedMedia then ! local pos = event:GetPosition() ! local len = mediaCtrl:Length() ! local ok = mediaCtrl:Seek(len*pos/slider_range) ! if ok == wx.wxInvalidOffset then ! wx.wxMessageBox(string.format("Unable to seek in %s: Unsupported format?", fileName), ! "wxLua Media Demo", ! wx.wxICON_ERROR + wx.wxOK) ! end ! end ! settingPos = false ! end ) mediaCtrl:Connect(wx.wxEVT_MEDIA_STATECHANGED, --- 207,232 ---- function (event) settingPos = true end) ! local function scroll_position(event) ! if loadedMedia then ! local pos = event:GetPosition() ! local len = mediaCtrl:Length() ! print(pos, len) ! local ok = mediaCtrl:Seek(math.floor(len*pos/slider_range)) ! if ok == wx.wxInvalidOffset then ! wx.wxMessageBox(string.format("Unable to seek in %s: Unsupported format?", fileName), ! "wxLua Media Demo", ! wx.wxICON_ERROR + wx.wxOK) ! end ! end ! settingPos = false ! end ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBRELEASE, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_TOP, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_BOTTOM, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_LINEUP, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_LINEDOWN, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_PAGEUP, scroll_position) ! panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_PAGEDOWN, scroll_position) mediaCtrl:Connect(wx.wxEVT_MEDIA_STATECHANGED, |
|
From: John L. <jr...@us...> - 2009-05-24 22:38:00
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31553/docs Modified Files: binding.html changelog.txt wxlua.html Log Message: typos Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wxlua.html 24 May 2009 05:34:14 -0000 1.42 --- wxlua.html 24 May 2009 22:37:53 -0000 1.43 *************** *** 177,181 **** <li>The scope of local variables is limited to the current ! scope and it's children.</li> <li>Local variables can be harder to debug because they are stored on the stack and you need the --- 177,181 ---- <li>The scope of local variables is limited to the current ! scope and its children.</li> <li>Local variables can be harder to debug because they are stored on the stack and you need the *************** *** 295,299 **** <li><i>mytable = {}</i> a default empty table, ! you must declare a variable as a table before using it's indexes.</li> <li><i>mytable = { ["index1"] = 1, "first value", "second --- 295,299 ---- <li><i>mytable = {}</i> a default empty table, ! you must declare a variable as a table before using its indexes.</li> <li><i>mytable = { ["index1"] = 1, "first value", "second *************** *** 1189,1193 **** <li>If the member variable is constant (const) the ! variable is read-only and you cannot set it's value.</li> </ul> <li><b>Static --- 1189,1193 ---- <li>If the member variable is constant (const) the ! variable is read-only and you cannot set its value.</li> </ul> <li><b>Static *************** *** 1523,1527 **** using controls from an XRC resource, accelerator tables, and event handling. This programs ! loads the file calculator.xrc to create it's GUI.</li> </ul> <li><b>choices.wx.lua</b></li> --- 1523,1527 ---- using controls from an XRC resource, accelerator tables, and event handling. This programs ! loads the file calculator.xrc to create its GUI.</li> </ul> <li><b>choices.wx.lua</b></li> *************** *** 2066,2070 **** class derived from the wxWidget's wxObject class. The wxLuaState class ! contains as a member of it's ref data the 'C' lua_State struct which is the heart of Lua. Since the class is ref counted, it should be passed as --- 2066,2070 ---- class derived from the wxWidget's wxObject class. The wxLuaState class ! contains as a member of its ref data the 'C' lua_State struct which is the heart of Lua. Since the class is ref counted, it should be passed as *************** *** 2072,2076 **** the same way as a wxBitmap, wxPen, or any of the other wxObject derived classes that make ! use of it's ref counting mechanism. What this means for wxLua is that instead of keeping pointers to the lua_State you have instances of the wxLuaState, --- 2072,2076 ---- the same way as a wxBitmap, wxPen, or any of the other wxObject derived classes that make ! use of its ref counting mechanism. What this means for wxLua is that instead of keeping pointers to the lua_State you have instances of the wxLuaState, *************** *** 2085,2089 **** the wxLuaState wraps this all up.<br> <br> ! When the wxLuaState is Ok() the wxLuaState has it's ref data and the lua_State is created. If it's not Ok() then most wxLuaState functions will assert in debug mode, so it's always best to compile in --- 2085,2089 ---- the wxLuaState wraps this all up.<br> <br> ! When the wxLuaState is Ok() the wxLuaState has its ref data and the lua_State is created. If it's not Ok() then most wxLuaState functions will assert in debug mode, so it's always best to compile in *************** *** 2092,2096 **** The wxLuaState contains all of the Lua 'C' functions, such as lua_gettop(lua_State* L), but as member functions named lua_GetTop() ! which use the internal lua_State and check for it's validity before use. The functions are capitalized to make them easier to find in an editor. If you want the greatest performance just --- 2092,2096 ---- The wxLuaState contains all of the Lua 'C' functions, such as lua_gettop(lua_State* L), but as member functions named lua_GetTop() ! which use the internal lua_State and check for its validity before use. The functions are capitalized to make them easier to find in an editor. If you want the greatest performance just *************** *** 2138,2142 **** then destroyed.</li> <li>The tables and values that wxLua uses to store ! information about the bindings or track it's state are pushed into the LUA_REGISTYINDEX. Information about these items can be found in the next section.</li> --- 2138,2142 ---- then destroyed.</li> <li>The tables and values that wxLua uses to store ! information about the bindings or track its state are pushed into the LUA_REGISTYINDEX. Information about these items can be found in the next section.</li> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** changelog.txt 24 May 2009 05:34:14 -0000 1.70 --- changelog.txt 24 May 2009 22:37:53 -0000 1.71 *************** *** 294,298 **** to be a function name in C++. ! - Moved the wxStyledTextCtrl class and it's 1268 defines into the wxstc table. - Moved wxLuaObject, wxLuaDebugger (and friends) into the wxlua table and added more functions for inspecting userdata and the bindings. --- 294,298 ---- to be a function name in C++. ! - Moved the wxStyledTextCtrl class and its 1268 defines into the wxstc table. - Moved wxLuaObject, wxLuaDebugger (and friends) into the wxlua table and added more functions for inspecting userdata and the bindings. *************** *** 307,311 **** Combined with using integer items in lua's registry ~ %25 faster. - Make wxLuaDebugData a real wxObject refed class that can !Ok(), before ! it always created it's ref data even if it wasn't used. - Add %gc, %ungc, %gc_this, and %ungc_this tags for fine tuning of tracking --- 307,311 ---- Combined with using integer items in lua's registry ~ %25 faster. - Make wxLuaDebugData a real wxObject refed class that can !Ok(), before ! it always created its ref data even if it wasn't used. - Add %gc, %ungc, %gc_this, and %ungc_this tags for fine tuning of tracking Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** binding.html 24 May 2009 05:34:14 -0000 1.32 --- binding.html 24 May 2009 22:37:53 -0000 1.33 *************** *** 425,429 **** %endclass<br> </b></i><ul> <li>Declare a class and ! optionally it's base class.</li> <li>All the methods of the base class can be accessed by an --- 425,429 ---- %endclass<br> </b></i><ul> <li>Declare a class and ! optionally its base class.</li> <li>All the methods of the base class can be accessed by an *************** *** 563,567 **** </ul><b><i>%gc</i></b><i><br> </i><ul> <li>For use before a userdata parameter of ! a function or it's return value only.</li> <li>Declares that the parameter passed to the function or --- 563,567 ---- </ul><b><i>%gc</i></b><i><br> </i><ul> <li>For use before a userdata parameter of ! a function or its return value only.</li> <li>Declares that the parameter passed to the function or *************** *** 797,801 **** </ul><b><i>%ungc</i></b><i><br> </i><ul> <li>For use before a userdata parameter of ! a function or it's return value only.</li> <li>Declares that the parameter passed to the function or return value should not be --- 797,801 ---- </ul><b><i>%ungc</i></b><i><br> </i><ul> <li>For use before a userdata parameter of ! a function or its return value only.</li> <li>Declares that the parameter passed to the function or return value should not be |
|
From: John L. <jr...@us...> - 2009-05-24 16:42:42
|
Update of /cvsroot/wxlua/website In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9526/website Modified Files: download.php Log Message: Update for 2.8.10 Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** download.php 4 Dec 2008 05:20:23 -0000 1.31 --- download.php 24 May 2009 16:42:31 -0000 1.32 *************** *** 10,14 **** // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.7.0"; $winsize="9"; // size of the wxlua-xxx.bin.zip file (in MB) --- 10,14 ---- // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.10.0"; $winsize="9"; // size of the wxlua-xxx.bin.zip file (in MB) |
|
From: John L. <jr...@us...> - 2009-05-24 16:42:03
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9415/docs Modified Files: readme.txt Log Message: typo fix Index: readme.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.txt 26 Jun 2007 03:22:05 -0000 1.3 --- readme.txt 24 May 2009 16:41:51 -0000 1.4 *************** *** 23,27 **** wxLua adds to this small and elegant language the power of the wxWidgets ! cross-platform GUI library. This incudes the ability to create complex user interface dialogs, image manipulation, file manipulation, sockets, displaying HTML, and printing to name a few. --- 23,27 ---- wxLua adds to this small and elegant language the power of the wxWidgets ! cross-platform GUI library. This includes the ability to create complex user interface dialogs, image manipulation, file manipulation, sockets, displaying HTML, and printing to name a few. |
|
From: John L. <jr...@us...> - 2009-05-24 05:36:59
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4637/wxLua/docs Modified Files: wxluaref.html Log Message: Update ref manual for 2.8.10 Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wxluaref.html 21 Oct 2008 04:23:18 -0000 1.51 --- wxluaref.html 24 May 2009 05:36:50 -0000 1.52 *************** *** 8,12 **** <body> ! <h1>wxLua 2.8.7.0 Reference Manual for wxWidgets 2.8.7</h1> <h2>Classes</h2> --- 8,12 ---- <body> ! <h1>wxLua 2.8.10.0 Reference Manual for wxWidgets 2.8.10</h1> <h2>Classes</h2> *************** *** 1379,1382 **** --- 1379,1387 ---- <td> <tr> + <td><a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxGridCellDateTimeRenderer">wxGridCellDateTimeRenderer</a> <td bgcolor=FFAAAA> *************** *** 1919,1922 **** --- 1924,1937 ---- <td> <tr> + <td><a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> + <td><a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxLuaGridTableBase">wxLuaGridTableBase</a> <td bgcolor=FFAAAA> *************** *** 1944,1947 **** --- 1959,1967 ---- <td> <tr> + <td><a href="#wxLuaState">wxLuaState</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxLuaTreeItemData">wxLuaTreeItemData</a> <td bgcolor=FFAAAA> *************** *** 2169,2172 **** --- 2189,2197 ---- <td> <tr> + <td><a href="#wxNotebookPage">wxNotebookPage</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxNotebookSizer">wxNotebookSizer</a> <td align="center" bgcolor=AAFFAA>X *************** *** 3059,3062 **** --- 3084,3092 ---- <td> <tr> + <td><a href="#wxTextUrlEvent">wxTextUrlEvent</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxTextValidator">wxTextValidator</a> <td align="center" bgcolor=AAFFAA>X *************** *** 3447,3450 **** --- 3477,3482 ---- <a href="#wxLocaleInfo">wxLocaleInfo</a><br> <a href="#wxLocaleInitFlags">wxLocaleInitFlags</a><br> + <a href="#wxLuaMethod_Type">wxLuaMethod_Type</a><br> + <a href="#wxLuaObject_Type">wxLuaObject_Type</a><br> <a href="#wxMediaCtrlPlayerControls">wxMediaCtrlPlayerControls</a><br> <a href="#wxMediaState">wxMediaState</a><br> *************** *** 3918,3923 **** <font color=#009900>// void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated</font><br> <br> ! <i>%typedef</i> wxTraceMask unsigned long<br> ! <i>%typedef</i> wxLogLevel unsigned long<br> <br> <b><font size=+1 color=#0066CC><i>%enum</i> <font color=#009900>// wxLogLevel - uses these enums</font></font></b> --- 3950,3955 ---- <font color=#009900>// void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated</font><br> <br> ! <i>%typedef</i> unsigned long wxTraceMask<br> ! <i>%typedef</i> unsigned long wxLogLevel<br> <br> <b><font size=+1 color=#0066CC><i>%enum</i> <font color=#009900>// wxLogLevel - uses these enums</font></font></b> *************** *** 4788,4791 **** --- 4820,4826 ---- void RemoveAt(size_t index)<br> void Shrink()<br> + <br> + <i>%operator</i> int operator[](size_t nIndex)<br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 4825,4828 **** --- 4860,4866 ---- void Shrink()<br> void Sort(bool reverseOrder = false)<br> + <br> + <i>%operator</i> <a href="#wxString">wxString</a>& operator[](size_t nIndex)<br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 5080,5084 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> wxDateTime::wxDateTime_t unsigned short<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxDateTime">wxDateTime</a></font></b> --- 5118,5122 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> unsigned short wxDateTime::wxDateTime_t<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxDateTime">wxDateTime</a></font></b> *************** *** 6860,6864 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%noclassinfo</i> <i>%delete</i> <a name="wxFileSystem">wxFileSystem</a>, <a href="#wxObject">wxObject</a></font></b> <blockquote> <a href="#wxFileSystem">wxFileSystem</a>()<br> --- 6898,6902 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxFileSystem">wxFileSystem</a>, <a href="#wxObject">wxObject</a></font></b> <blockquote> <a href="#wxFileSystem">wxFileSystem</a>()<br> *************** *** 8457,8461 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> wxTextCoord long<br> <font color=#006666><i>%define</i> wxOutOfRangeTextCoord</font><br> <font color=#006666><i>%define</i> wxInvalidTextCoord</font><br> --- 8495,8499 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> long wxTextCoord<br> <font color=#006666><i>%define</i> wxOutOfRangeTextCoord</font><br> <font color=#006666><i>%define</i> wxInvalidTextCoord</font><br> *************** *** 8591,8594 **** --- 8629,8648 ---- </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxTextUrlEvent">wxTextUrlEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxTextUrlEvent">wxTextUrlEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <br> + <font color=#006666> <i>%wxchkver_2_8_0</i> <i>%define_event</i> wxEVT_COMMAND_TEXT_URL <font color=#009900>// EVT_TEXT_URL(id, fn)</font></font><br> + <br> + <a href="#wxTextUrlEvent">wxTextUrlEvent</a>(int winid, const <a href="#wxMouseEvent">wxMouseEvent</a>& evtMouse, long start, long end)<br> + <br> + const <a href="#wxMouseEvent">wxMouseEvent</a>& GetMouseEvent() const<br> + long GetURLStart() const<br> + long GetURLEnd() const<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> <i>%endif</i> <font color=#009900>//wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL</font><br> <br> *************** *** 9758,9763 **** wxEXPAND<br> wxSHAPED<br> - wxADJUST_MINSIZE<br> wxTILE<br> </font> </blockquote><font color=#0066CC><i>%endenum</i></font><br> --- 9812,9821 ---- wxEXPAND<br> wxSHAPED<br> wxTILE<br> + <br> + wxADJUST_MINSIZE <font color=#009900>// deprecated after 2.4 and takes the value of 0</font><br> + <br> + <i>%wxchkver_2_8_8</i> wxFIXED_MINSIZE<br> + <i>%wxchkver_2_8_8</i> wxRESERVE_SPACE_EVEN_IF_HIDDEN<br> </font> </blockquote><font color=#0066CC><i>%endenum</i></font><br> *************** *** 10497,10502 **** <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_ENTER <font color=#009900>// EVT_TEXT_ENTER(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_UPDATED <font color=#009900>// EVT_TEXT(id, fn)</font></font><br> - <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_URL <font color=#009900>// EVT_TEXT_URL(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_MAXLEN <font color=#009900>// EVT_TEXT_MAXLEN(id, fn)</font></font><br> <br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_SPINCTRL_UPDATED <font color=#009900>// EVT_SPINCTRL(id, fn)</font></font><br> --- 10555,10560 ---- <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_ENTER <font color=#009900>// EVT_TEXT_ENTER(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_UPDATED <font color=#009900>// EVT_TEXT(id, fn)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_MAXLEN <font color=#009900>// EVT_TEXT_MAXLEN(id, fn)</font></font><br> + <font color=#006666> !<i>%wxchkver_2_8_0</i> <i>%define_event</i> wxEVT_COMMAND_TEXT_URL <font color=#009900>// EVT_TEXT_URL(id, fn)</font></font><br> <br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_SPINCTRL_UPDATED <font color=#009900>// EVT_SPINCTRL(id, fn)</font></font><br> *************** *** 11425,11429 **** <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - s.GetWidth(), y - s.GetHeight()); }</font><br> <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-() const { return <a href="#wxPoint">wxPoint</a>(-x, -y); }<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 11483,11487 ---- <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - s.GetWidth(), y - s.GetHeight()); }</font><br> <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-() const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(-x, -y); }</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12238,12242 **** <br> <i>%if</i> wxLUA_USE_wxIcon<br> ! <i>%typedef</i> WXHANDLE void*<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxIcon">wxIcon</a>, <a href="#wxGDIObject">wxGDIObject</a></font></b> --- 12296,12300 ---- <br> <i>%if</i> wxLUA_USE_wxIcon<br> ! <i>%typedef</i> void* WXHANDLE<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxIcon">wxIcon</a>, <a href="#wxGDIObject">wxGDIObject</a></font></b> *************** *** 12364,12368 **** <i>%if</i> wxLUA_USE_wxCursor<br> <br> ! <font color=#009900>//<i>%typedef</i> WXHANDLE void*</font><br> <br> <i>%include</i> "wx/cursor.h"<br> --- 12422,12426 ---- <i>%if</i> wxLUA_USE_wxCursor<br> <br> ! <font color=#009900>//<i>%typedef</i> void* WXHANDLE</font><br> <br> <i>%include</i> "wx/cursor.h"<br> *************** *** 12928,12931 **** --- 12986,12992 ---- void RemoveAt(size_t nIndex, size_t count = 1)<br> void Shrink()<br> + <br> + <i>%operator</i> <a href="#wxVideoMode">wxVideoMode</a>& operator[](size_t nIndex)<br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 13176,13181 **** <i>%if</i> wxLUA_USE_Geometry && wxUSE_GEOMETRY<br> <br> ! <i>%typedef</i> wxInt32 int<br> ! <i>%typedef</i> wxDouble double<br> <br> <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxOutCode">wxOutCode</a></font></b> --- 13237,13242 ---- <i>%if</i> wxLUA_USE_Geometry && wxUSE_GEOMETRY<br> <br> ! <i>%typedef</i> int wxInt32<br> ! <i>%typedef</i> double wxDouble<br> <br> <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxOutCode">wxOutCode</a></font></b> *************** *** 13232,13235 **** --- 13293,13299 ---- <i>%operator</i> bool operator==(const <a href="#wxPoint2DInt">wxPoint2DInt</a>& pt) const<br> <font color=#009900>//bool operator!=(const <a href="#wxPoint2DInt">wxPoint2DInt</a>& pt) const</font><br> + <br> + <i>%operator</i> <a href="#wxPoint2DInt">wxPoint2DInt</a> operator*(wxInt32 n)<br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 13974,13978 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#006666><i>%define_string</i> wxIMAGE_OPTION_BMP_FORMAT <font color=#009900>// <a href="#wxString">wxString</a>(_T("wxBMP_FORMAT"))</font></font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxBMPHandler">wxBMPHandler</a>, <a href="#wxImageHandler">wxImageHandler</a></font></b> --- 14038,14042 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#006666><i>%define_string</i> wxIMAGE_OPTION_BMP_FORMAT _T("wxBMP_FORMAT") <font color=#009900>// <a href="#wxString">wxString</a>(_T("wxBMP_FORMAT"))</font></font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxBMPHandler">wxBMPHandler</a>, <a href="#wxImageHandler">wxImageHandler</a></font></b> *************** *** 14148,14153 **** <i>%include</i> "wx/artprov.h"<br> <br> ! <font color=#009900>//<i>%typedef</i> wxArtClient <a href="#wxString">wxString</a> Just treat these as wxStrings</font><br> ! <font color=#009900>//<i>%typedef</i> wxArtID <a href="#wxString">wxString</a></font><br> <br> <font color=#009900>// ----------------------------------------------------------------------------</font><br> --- 14212,14217 ---- <i>%include</i> "wx/artprov.h"<br> <br> ! <font color=#009900>//<i>%typedef</i> <a href="#wxString">wxString</a> wxArtClient Just treat these as wxStrings</font><br> ! <font color=#009900>//<i>%typedef</i> <a href="#wxString">wxString</a> wxArtID</font><br> <br> <font color=#009900>// ----------------------------------------------------------------------------</font><br> *************** *** 14247,14251 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaArtProvider">wxLuaArtProvider</a>, <a href="#wxArtProvider">wxArtProvider</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br> <a href="#wxLuaArtProvider">wxLuaArtProvider</a>()<br> <br> --- 14311,14315 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaArtProvider">wxLuaArtProvider</a>, <a href="#wxArtProvider">wxArtProvider</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br> <a href="#wxLuaArtProvider">wxLuaArtProvider</a>()<br> <br> *************** *** 15367,15371 **** <i>%if</i> wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE<br> <br> ! <i>%typedef</i> wxPreviewWindow <a href="#wxScrolledWindow">wxScrolledWindow</a><br> <br> <i>%include</i> "wx/print.h"<br> --- 15431,15435 ---- <i>%if</i> wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE<br> <br> ! <i>%typedef</i> <a href="#wxScrolledWindow">wxScrolledWindow</a> wxPreviewWindow<br> <br> <i>%include</i> "wx/print.h"<br> *************** *** 15421,15425 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br> <a href="#wxLuaPrintout">wxLuaPrintout</a>(const <a href="#wxString">wxString</a>& title = "Printout", <a href="#wxLuaObject">wxLuaObject</a> *pObject = NULL)<br> <br> --- 15485,15489 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br> <a href="#wxLuaPrintout">wxLuaPrintout</a>(const <a href="#wxString">wxString</a>& title = "Printout", <a href="#wxLuaObject">wxLuaObject</a> *pObject = NULL)<br> <br> *************** *** 15771,15775 **** <i>%include</i> "wx/printdlg.h"<br> <br> ! <font color=#009900>//<i>%typedef</i> <a href="#wxPageSetupDialog">wxPageSetupDialog</a> wxPageSetupDialogBase</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxPageSetupDialog">wxPageSetupDialog</a>, <a href="#wxObject">wxObject</a> <font color=#009900>// NOT a <a href="#wxDialog">wxDialog</a> in 2.6</font></font></b> --- 15835,15839 ---- <i>%include</i> "wx/printdlg.h"<br> <br> ! <font color=#009900>//<i>%typedef</i> wxPageSetupDialogBase <a href="#wxPageSetupDialog">wxPageSetupDialog</a></font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxPageSetupDialog">wxPageSetupDialog</a>, <a href="#wxObject">wxObject</a> <font color=#009900>// NOT a <a href="#wxDialog">wxDialog</a> in 2.6</font></font></b> *************** *** 16493,16500 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#009900>//<i>%mac</i>|<i>%x11</i>|<i>%motif</i> <i>%typedef</i> WXWidget void*</font><br> ! <font color=#009900>//<i>%gtk</i> <i>%typedef</i> WXWidget unsigned long // GtkWidget* what could you do with it?</font><br> ! <font color=#009900>//<i>%mgl</i> <i>%typedef</i> WXWidget window_t</font><br> ! <font color=#009900>//<i>%msw</i>|<i>%os2</i> <i>%typedef</i> WXWidget unsigned long</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> --- 16557,16564 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#009900>//<i>%mac</i>|<i>%x11</i>|<i>%motif</i> <i>%typedef</i> void* WXWidget</font><br> ! <font color=#009900>//<i>%gtk</i> <i>%typedef</i> unsigned long WXWidget // GtkWidget* what could you do with it?</font><br> ! <font color=#009900>//<i>%mgl</i> <i>%typedef</i> window_t WXWidget</font><br> ! <font color=#009900>//<i>%msw</i>|<i>%os2</i> <i>%typedef</i> unsigned long WXWidget</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> *************** *** 16580,16584 **** virtual <a href="#wxColour">wxColour</a> GetForegroundColour()<br> <a href="#wxWindow">wxWindow</a>* GetGrandParent() const<br> ! <font color=#009900>//WXWidget GetHandle() const</font><br> virtual <a href="#wxString">wxString</a> GetHelpText() const<br> int GetId() const<br> --- 16644,16648 ---- virtual <a href="#wxColour">wxColour</a> GetForegroundColour()<br> <a href="#wxWindow">wxWindow</a>* GetGrandParent() const<br> ! void* GetHandle() const<br> virtual <a href="#wxString">wxString</a> GetHelpText() const<br> int GetId() const<br> *************** *** 16904,16908 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> wxNotebookPage <a href="#wxWindow">wxWindow</a><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxNotebook">wxNotebook</a>, <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font></b> --- 16968,16972 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%typedef</i> <a href="#wxWindow">wxWindow</a> <a href="#wxNotebookPage">wxNotebookPage</a><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxNotebook">wxNotebook</a>, <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font></b> *************** *** 16914,16918 **** <font color=#009900>// NOTE: All remmed out functions are located in <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font><br> <br> ! <font color=#009900>//bool AddPage(wxNotebookPage* page, const <a href="#wxString">wxString</a>& text, bool select = false, int imageId = -1)</font><br> <font color=#009900>//void AdvanceSelection(bool forward = true)</font><br> <font color=#009900>//void AssignImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> --- 16978,16982 ---- <font color=#009900>// NOTE: All remmed out functions are located in <a href="#wxBookCtrlBase">wxBookCtrlBase</a></font><br> <br> ! <font color=#009900>//bool AddPage(<a href="#wxNotebookPage">wxNotebookPage</a>* page, const <a href="#wxString">wxString</a>& text, bool select = false, int imageId = -1)</font><br> <font color=#009900>//void AdvanceSelection(bool forward = true)</font><br> <font color=#009900>//void AssignImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> *************** *** 16921,16925 **** <font color=#009900>//<a href="#wxWindow">wxWindow</a>* GetCurrentPage() const</font><br> <font color=#009900>//<a href="#wxImageList">wxImageList</a>* GetImageList() const</font><br> ! <font color=#009900>//wxNotebookPage* GetPage(int page)</font><br> <font color=#009900>//int GetPageCount() const</font><br> <font color=#009900>//int GetPageImage(int nPage) const</font><br> --- 16985,16989 ---- <font color=#009900>//<a href="#wxWindow">wxWindow</a>* GetCurrentPage() const</font><br> <font color=#009900>//<a href="#wxImageList">wxImageList</a>* GetImageList() const</font><br> ! <font color=#009900>//<a href="#wxNotebookPage">wxNotebookPage</a>* GetPage(int page)</font><br> <font color=#009900>//int GetPageCount() const</font><br> <font color=#009900>//int GetPageImage(int nPage) const</font><br> *************** *** 16933,16937 **** int HitTest(const <a href="#wxPoint">wxPoint</a>& pt)<br> <br> ! <font color=#009900>//bool InsertPage(int index, wxNotebookPage* page, const <a href="#wxString">wxString</a>& text, bool select = false, int imageId = -1)</font><br> <font color=#009900>//bool RemovePage(int page)</font><br> <font color=#009900>//void SetImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> --- 16997,17001 ---- int HitTest(const <a href="#wxPoint">wxPoint</a>& pt)<br> <br> ! <font color=#009900>//bool InsertPage(int index, <a href="#wxNotebookPage">wxNotebookPage</a>* page, const <a href="#wxString">wxString</a>& text, bool select = false, int imageId = -1)</font><br> <font color=#009900>//bool RemovePage(int page)</font><br> <font color=#009900>//void SetImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> *************** *** 17577,17581 **** <i>%include</i> "wx/bmpcbox.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxBitmapComboBox">wxBitmapComboBox</a>, <a href="#wxControlWithItems">wxControlWithItems</a></font></b> <blockquote> <a href="#wxBitmapComboBox">wxBitmapComboBox</a>()<br> --- 17641,17645 ---- <i>%include</i> "wx/bmpcbox.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxBitmapComboBox">wxBitmapComboBox</a> <font color=#009900>//, <a href="#wxControlWithItems">wxControlWithItems</a></font></font></b> <blockquote> <a href="#wxBitmapComboBox">wxBitmapComboBox</a>()<br> *************** *** 18287,18290 **** --- 18351,18356 ---- <font color=#006666><i>%define_string</i> wxGRID_VALUE_DATETIME</font><br> <br> + <font color=#006666><i>%wxchkver_2_8_8</i> <i>%define</i> wxGRID_AUTOSIZE</font><br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxGridCellWorker">wxGridCellWorker</a></font><br> *************** *** 18595,18599 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaGridTableBase">wxLuaGridTableBase</a>, <a href="#wxGridTableBase">wxGridTableBase</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the wxLuaState as the first param</font></font><br> <a href="#wxLuaGridTableBase">wxLuaGridTableBase</a>()<br> <br> --- 18661,18665 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaGridTableBase">wxLuaGridTableBase</a>, <a href="#wxGridTableBase">wxGridTableBase</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> - the C++ function takes the <a href="#wxLuaState">wxLuaState</a> as the first param</font></font><br> <a href="#wxLuaGridTableBase">wxLuaGridTableBase</a>()<br> <br> *************** *** 18710,18714 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxGridCellCoords">wxGridCellCoords</a></font></b> <blockquote> ! <font color=#006666> <i>%define_object</i> wxGridNoCellRect</font><br> <br> <a href="#wxGridCellCoords">wxGridCellCoords</a>( int r = -1, int c = -1 )<br> --- 18776,18780 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxGridCellCoords">wxGridCellCoords</a></font></b> <blockquote> ! <font color=#006666> <i>%define_object</i> wxGridNoCellCoords</font><br> <br> <a href="#wxGridCellCoords">wxGridCellCoords</a>( int r = -1, int c = -1 )<br> *************** *** 18722,18725 **** --- 18788,18816 ---- <i>%operator</i> <a href="#wxGridCellCoords">wxGridCellCoords</a>& operator=( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& other )<br> <i>%operator</i> bool operator==( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& other ) const<br> + <i>%operator</i> bool operator!() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a></font><br> + <br> + <i>%include</i> "wx/dynarray.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxGridCellCoordsArray">wxGridCellCoordsArray</a></font></b> + <blockquote> + <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a>()<br> + <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a>(const <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a>& array)<br> + <br> + void Add( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& c )<br> + void Alloc(size_t count)<br> + void Clear()<br> + int GetCount() const<br> + bool IsEmpty() const<br> + void Insert( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& c, int n, int copies = 1 )<br> + <a href="#wxGridCellCoords">wxGridCellCoords</a> Item( int n )<br> + void RemoveAt(size_t index)<br> + void Shrink()<br> + <br> + <i>%operator</i> <a href="#wxGridCellCoords">wxGridCellCoords</a> operator[](size_t nIndex)<br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 18748,18752 **** <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> CalcRowLabelsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> CalcColLabelsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> ! <font color=#009900>//wxGridCellCoordsArray CalcCellsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> <font color=#009900>//void ProcessRowLabelMouseEvent( <a href="#wxMouseEvent">wxMouseEvent</a>& event );</font><br> <font color=#009900>//void ProcessColLabelMouseEvent( <a href="#wxMouseEvent">wxMouseEvent</a>& event );</font><br> --- 18839,18843 ---- <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> CalcRowLabelsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> CalcColLabelsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> ! <font color=#009900>//<a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a> CalcCellsExposed( const <a href="#wxRegion">wxRegion</a>& reg )</font><br> <font color=#009900>//void ProcessRowLabelMouseEvent( <a href="#wxMouseEvent">wxMouseEvent</a>& event );</font><br> <font color=#009900>//void ProcessColLabelMouseEvent( <a href="#wxMouseEvent">wxMouseEvent</a>& event );</font><br> *************** *** 18770,18779 **** bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=true )<br> <br> ! <font color=#009900>//void DrawGridCellArea( <a href="#wxDC">wxDC</a>& dc , const wxGridCellCoordsArray& cells );</font><br> <font color=#009900>//void DrawGridSpace( <a href="#wxDC">wxDC</a>& dc );</font><br> <font color=#009900>//void DrawCellBorder( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& );</font><br> <font color=#009900>//void DrawAllGridLines( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRegion">wxRegion</a>& reg );</font><br> <font color=#009900>//void DrawCell( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& );</font><br> ! <font color=#009900>//void DrawHighlight(<a href="#wxDC">wxDC</a>& dc, const wxGridCellCoordsArray& cells);</font><br> <font color=#009900>//virtual void DrawCellHighlight( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellAttr">wxGridCellAttr</a> *attr );</font><br> <font color=#009900>//virtual void DrawRowLabels( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxArrayInt">wxArrayInt</a>& rows );</font><br> --- 18861,18870 ---- bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=true )<br> <br> ! <font color=#009900>//void DrawGridCellArea( <a href="#wxDC">wxDC</a>& dc , const <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a>& cells );</font><br> <font color=#009900>//void DrawGridSpace( <a href="#wxDC">wxDC</a>& dc );</font><br> <font color=#009900>//void DrawCellBorder( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& );</font><br> <font color=#009900>//void DrawAllGridLines( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRegion">wxRegion</a>& reg );</font><br> <font color=#009900>//void DrawCell( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& );</font><br> ! <font color=#009900>//void DrawHighlight(<a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a>& cells);</font><br> <font color=#009900>//virtual void DrawCellHighlight( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxGridCellAttr">wxGridCellAttr</a> *attr );</font><br> <font color=#009900>//virtual void DrawRowLabels( <a href="#wxDC">wxDC</a>& dc, const <a href="#wxArrayInt">wxArrayInt</a>& rows );</font><br> *************** *** 18979,18987 **** <font color=#009900>// bool IsInSelection( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& coords )</font><br> <br> ! <font color=#009900>//wxGridCellCoordsArray GetSelectedCells() const</font><br> ! <font color=#009900>//wxGridCellCoordsArray GetSelectionBlockTopLeft() const</font><br> ! <font color=#009900>//wxGridCellCoordsArray GetSelectionBlockBottomRight() const</font><br> ! <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> GetSelectedRows() const</font><br> ! <font color=#009900>//<a href="#wxArrayInt">wxArrayInt</a> GetSelectedCols() const</font><br> <br> <a href="#wxRect">wxRect</a> BlockToDeviceRect( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& topLeft, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& bottomRight )<br> --- 19070,19078 ---- <font color=#009900>// bool IsInSelection( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& coords )</font><br> <br> ! <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a> GetSelectedCells() const<br> ! <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a> GetSelectionBlockTopLeft() const<br> ! <a href="#wxGridCellCoordsArray">wxGridCellCoordsArray</a> GetSelectionBlockBottomRight() const<br> ! <a href="#wxArrayInt">wxArrayInt</a> GetSelectedRows() const<br> ! <a href="#wxArrayInt">wxArrayInt</a> GetSelectedCols() const<br> <br> <a href="#wxRect">wxRect</a> BlockToDeviceRect( const <a href="#wxGridCellCoords">wxGridCellCoords</a>& topLeft, const <a href="#wxGridCellCoords">wxGridCellCoords</a>& bottomRight )<br> *************** *** 23343,23347 **** <font color=#009900>// Set the current styling position to pos and the styling mask to mask.</font><br> <font color=#009900>// The styling mask can be used to protect some bits in each styling byte from modification.</font><br> ! void StartStyling(int pos, int mask);<br> <br> <font color=#009900>// Change style from current styling position for length characters to a style</font><br> --- 23434,23438 ---- <font color=#009900>// Set the current styling position to pos and the styling mask to mask.</font><br> <font color=#009900>// The styling mask can be used to protect some bits in each styling byte from modification.</font><br> ! void StartStyling(int pos, unsigned int mask);<br> <br> <font color=#009900>// Change style from current styling position for length characters to a style</font><br> *************** *** 23385,23395 **** <br> <font color=#009900>// Get a bit mask of all the markers set on a line.</font><br> ! int MarkerGet(int line);<br> <br> <font color=#009900>// Find the next line after lineStart that includes a marker in mask.</font><br> ! int MarkerNext(int lineStart, int markerMask);<br> <br> <font color=#009900>// Find the previous line before lineStart that includes a marker in mask.</font><br> ! int MarkerPrevious(int lineStart, int markerMask);<br> <br> <font color=#009900>// Define a marker from a bitmap</font><br> --- 23476,23486 ---- <br> <font color=#009900>// Get a bit mask of all the markers set on a line.</font><br> ! unsigned int MarkerGet(int line);<br> <br> <font color=#009900>// Find the next line after lineStart that includes a marker in mask.</font><br> ! int MarkerNext(int lineStart, unsigned int markerMask);<br> <br> <font color=#009900>// Find the previous line before lineStart that includes a marker in mask.</font><br> ! int MarkerPrevious(int lineStart, unsigned int markerMask);<br> <br> <font color=#009900>// Define a marker from a bitmap</font><br> *************** *** 23412,23419 **** <br> <font color=#009900>// Set a mask that determines which markers are displayed in a margin.</font><br> ! void SetMarginMask(int margin, int mask);<br> <br> <font color=#009900>// Retrieve the marker mask of a margin.</font><br> ! int GetMarginMask(int margin);<br> <br> <font color=#009900>// Make a margin sensitive or insensitive to mouse clicks.</font><br> --- 23503,23510 ---- <br> <font color=#009900>// Set a mask that determines which markers are displayed in a margin.</font><br> ! void SetMarginMask(int margin, unsigned int mask); <font color=#009900>// NOTE: wxSTC has "int mask", but we need all the bits so we force uint</font><br> <br> <font color=#009900>// Retrieve the marker mask of a margin.</font><br> ! unsigned int GetMarginMask(int margin);<br> <br> <font color=#009900>// Make a margin sensitive or insensitive to mouse clicks.</font><br> *************** *** 24878,24886 **** <br> <font color=#009900>// Add the userdata object to the list of objects that will be deleted when</font><br> ! <font color=#009900>// it does out of scope and the Lua garbage collector runs.</font><br> <font color=#009900>// <i>%function</i> bool gcobject(void* object)</font><br> <br> <font color=#009900>// Remove the userdata object from the list of objects that will be deleted when</font><br> ! <font color=#009900>// it does out of scope and the Lua garbage collector runs.</font><br> <font color=#AA0000><i>%function</i> bool ungcobject(void* object)</font><br> <br> --- 24969,24977 ---- <br> <font color=#009900>// Add the userdata object to the list of objects that will be deleted when</font><br> ! <font color=#009900>// it goes out of scope and the Lua garbage collector runs.</font><br> <font color=#009900>// <i>%function</i> bool gcobject(void* object)</font><br> <br> <font color=#009900>// Remove the userdata object from the list of objects that will be deleted when</font><br> ! <font color=#009900>// it goes out of scope and the Lua garbage collector runs.</font><br> <font color=#AA0000><i>%function</i> bool ungcobject(void* object)</font><br> <br> *************** *** 24946,24952 **** <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> type(void* object)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> wString typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// Returns the wxLua tag name for both the predefined (negative) as well as the</font><br> ! <font color=#009900>// binding class tag numbers.</font><br> <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> typename(int wxluaarg_tag)</font><br> <br> --- 25037,25042 ---- <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> type(void* object)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> <a href="#wxString">wxString</a> typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// Returns the wxLua name binding wxLua class type numbers.</font><br> <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> typename(int wxluaarg_tag)</font><br> <br> *************** *** 24985,24994 **** int GetFunctionCount<br> <br> ! {wxLuaBindClass*} GetClassArray<br> ! {wxLuaBindMethod*} GetFunctionArray<br> ! {name, value} GetNumberArray<br> ! {name, value} GetStringArray<br> ! {name, eventType, wxluatype} GetEventArray<br> ! {name, object, wxluatype} GetObjectArray<br> <br> </font></blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><font color=#888888><br> --- 25075,25084 ---- int GetFunctionCount<br> <br> ! {wxLuaBindClass*} GetClassArray<br> ! {wxLuaBindMethod*} GetFunctionArray<br> ! {name, value} GetNumberArray<br> ! {name, value} GetStringArray<br> ! {name, eventType, wxluatype, wxLuaBindClass} GetEventArray<br> ! {name, object, wxluatype, wxLuaBindClass} GetObjectArray<br> <br> </font></blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><font color=#888888><br> *************** *** 25003,25008 **** <a href="#wxClassInfo">wxClassInfo</a>* classInfo<br> int wxluatype<br> ! <a href="#wxString">wxString</a> baseclassName<br> ! wxLuaBindClass* baseclass<br> {name, value} enums<br> int enums_n<br> --- 25093,25098 ---- <a href="#wxClassInfo">wxClassInfo</a>* classInfo<br> int wxluatype<br> ! {<a href="#wxString">wxString</a>} baseclassNames<br> ! {wxLuaBindClass*} baseBindClasses<br> {name, value} enums<br> int enums_n<br> *************** *** 25043,25047 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// wxLuaState</font><br> <br> <i>%include</i> "wxlua/include/wxlstate.h"<br> --- 25133,25137 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLuaState">wxLuaState</a></font><br> <br> <i>%include</i> "wxlua/include/wxlstate.h"<br> *************** *** 25050,25055 **** <blockquote> <font color=#888888>/*<br> ! wxLuaState(bool create = false)<br> ! wxLuaState(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br> <br> bool Ok() const<br> --- 25140,25145 ---- <blockquote> <font color=#888888>/*<br> ! <a href="#wxLuaState">wxLuaState</a>(bool create = false)<br> ! <a href="#wxLuaState">wxLuaState</a>(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br> <br> bool Ok() const<br> *************** *** 25086,25090 **** <blockquote> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const wxLuaState& wxlState, int stack_idx = 1)</font><br> <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br> <a href="#wxLuaObject">wxLuaObject</a>()<br> --- 25176,25180 ---- <blockquote> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const <a href="#wxLuaState">wxLuaState</a>& wxlState, int stack_idx = 1)</font><br> <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br> <a href="#wxLuaObject">wxLuaObject</a>()<br> *************** *** 25142,25146 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> ! wxLuaDebuggerServer(int portNumber)<br> <br> bool StartServer()<br> --- 25232,25236 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> ! <a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a>(int portNumber)<br> <br> bool StartServer()<br> *************** *** 25176,25180 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// wxLuaDebuggerEvent</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b> --- 25266,25270 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a></font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b> |
|
From: John L. <jr...@us...> - 2009-05-24 05:34:22
|
Update of /cvsroot/wxlua/wxLua/bindings In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4336/wxLua/bindings Modified Files: genidocs_rules.lua Log Message: Update docs for 2.8.10 Index: genidocs_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs_rules.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** genidocs_rules.lua 29 Jan 2008 00:49:10 -0000 1.7 --- genidocs_rules.lua 24 May 2009 05:34:14 -0000 1.8 *************** *** 238,242 **** <body> ! <h1>wxLua 2.8.7.0 Reference Manual for wxWidgets 2.8.7</h1> ]] --- 238,242 ---- <body> ! <h1>wxLua 2.8.10.0 Reference Manual for wxWidgets 2.8.10</h1> ]] |
|
From: John L. <jr...@us...> - 2009-05-24 05:34:22
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4336/wxLua/docs Modified Files: FAQ.html binding.html changelog.txt install.html wxlua.html Log Message: Update docs for 2.8.10 Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxlua.html 19 May 2009 03:20:53 -0000 1.41 --- wxlua.html 24 May 2009 05:34:14 -0000 1.42 *************** *** 1,10 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head> ! <body> <h2><u>wxLua ! Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">Lua</a> --- 1,10 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head><body> <h2><u>wxLua ! 2.8.10 - Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">Lua</a> *************** *** 123,127 **** </ul> <li>wxWidgets ! 2.8.7 (>= 2.6.3)</li> <ul> <li>The interface --- 123,127 ---- </ul> <li>wxWidgets ! 2.8.10 (>= 2.6.3)</li> <ul> <li>The interface *************** *** 1272,1276 **** </li> <li>"!" = "op_not"</li> ! <li></li> <li>"|" = "op_or"<br> </li> --- 1272,1277 ---- </li> <li>"!" = "op_not"</li> ! <li><br> ! </li> <li>"|" = "op_or"<br> </li> *************** *** 1281,1285 **** <li>"<<" = "op_lshift"</li> <li>">>" = "op_rshift"</li> ! <li></li> <li>"|=" = "op_ior"</li> --- 1282,1287 ---- <li>"<<" = "op_lshift"</li> <li>">>" = "op_rshift"</li> ! <li><br> ! </li> <li>"|=" = "op_ior"</li> *************** *** 1289,1293 **** <li>"<<=" = "op_ilshift"</li> <li>">>=" = "op_irshift"</li> ! <li></li> <li>"++" = --- 1291,1296 ---- <li>"<<=" = "op_ilshift"</li> <li>">>=" = "op_irshift"</li> ! <li><br> ! </li> <li>"++" = *************** *** 1298,1302 **** (unary)" = "op_neg"</li> <li>"~ (unary)" = "op_comp"</li><li>"[]" = "op_index"</li><li>"()" = "op_func"</li> ! <li></li> <li>"=" = op_set</li> <li>"+" = "op_add"<br> --- 1301,1306 ---- (unary)" = "op_neg"</li> <li>"~ (unary)" = "op_comp"</li><li>"[]" = "op_index"</li><li>"()" = "op_func"</li> ! <li><br> ! </li> <li>"=" = op_set</li> <li>"+" = "op_add"<br> *************** *** 1310,1314 **** = "op_div"</li> <li>"%" = "op_mod"</li> ! <li></li> <li>"+=" = "op_iadd" note: ixxx stands for "inplace" as --- 1314,1319 ---- = "op_div"</li> <li>"%" = "op_mod"</li> ! <li><br> ! </li> <li>"+=" = "op_iadd" note: ixxx stands for "inplace" as *************** *** 1323,1327 **** "op_idiv"</li> <li>"%=" = "op_imod"</li> ! <li></li> <li>Example : <i>"pt = wx.wxPoint(1,2); pt = pt + --- 1328,1333 ---- "op_idiv"</li> <li>"%=" = "op_imod"</li> ! <li><br> ! </li> <li>Example : <i>"pt = wx.wxPoint(1,2); pt = pt + *************** *** 2277,2279 **** other functions which are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> </ul> ! </body></html> --- 2283,2285 ---- other functions which are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> </ul> ! </body></html> \ No newline at end of file Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** changelog.txt 14 May 2009 05:06:21 -0000 1.69 --- changelog.txt 24 May 2009 05:34:14 -0000 1.70 *************** *** 2,6 **** =============== ! version 2.8.10.0 -------------------------------------------------------------------- --- 2,6 ---- =============== ! version 2.8.10.0 (released 05/25/2009) -------------------------------------------------------------------- *************** *** 18,24 **** on the stack. The default is to leave none as before. - Added wxTextUrlEvent to the bindings. ! - Fixed double -> unsigned integer using all 32 bits conversion. ! Fixes wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin. ! - Allow multiple inheritance in the bindings. Changed members of wxLuaBindClass to reflect that base class info are stored in arrays. --- 18,24 ---- on the stack. The default is to leave none as before. - Added wxTextUrlEvent to the bindings. ! - Fixed double -> unsigned integer using all 32 bits conversion. ! Fixes wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin. ! - Allow multiple inheritance in the bindings. Changed members of wxLuaBindClass to reflect that base class info are stored in arrays. Index: install.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/install.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** install.html 19 May 2009 03:20:53 -0000 1.14 --- install.html 24 May 2009 05:34:14 -0000 1.15 *************** *** 1,11 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Installation Guide</title> <meta content="Francesco Montorsi, John Labenski" name="author"> ! <meta content="Info about building wxLua" name="description"> ! </head> ! <body> ! <u><b><big><big>wxLua - installation guide</big></big></b></u><br> <br> This document describes how to build wxLua for use as an --- 1,10 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Installation Guide</title> <meta content="Francesco Montorsi, John Labenski" name="author"> ! <meta content="Info about building wxLua" name="description"></head><body> ! <u><b><big><big>wxLua 2.8.10 - Installation Guide</big></big></b></u><br> <br> This document describes how to build wxLua for use as an Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** binding.html 19 May 2009 03:20:53 -0000 1.31 --- binding.html 24 May 2009 05:34:14 -0000 1.32 *************** *** 1,9 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Binding HowTo</title> <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLuaBinding - writing and generating ! the binding ! files</u> ! </h2><div style="text-align: justify;">The binding generator for wxLua provides information for Lua code to --- 1,9 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> ! ! ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Binding HowTo</title> <meta content="John Labenski" name="author"></head><body><h2><u>wxLuaBinding 2.8.10 - Writing and Generating Binding Files</u></h2> ! ! <div style="text-align: justify;">The binding generator for wxLua provides information for Lua code to Index: FAQ.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/FAQ.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FAQ.html 22 Dec 2007 06:07:08 -0000 1.6 --- FAQ.html 24 May 2009 05:34:14 -0000 1.7 *************** *** 1,11 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua FAQ</title> ! <meta content="John Labenski" name="author"> ! </head> ! <body> <h2><u>wxLua ! FAQ</u></h2> <ol> <li><a href="#Why_wxLua">Why wxLua?</a></li> --- 1,10 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua FAQ</title> ! <meta content="John Labenski" name="author"></head><body> <h2><u>wxLua ! 2.8.10 - FAQ</u></h2> <ol> <li><a href="#Why_wxLua">Why wxLua?</a></li> |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12858/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxcore_bind.cpp wxhtml_bind.cpp wxnet_bind.cpp Log Message: Don't use export symbol for non exported enum wxLuaBindNumbers in bindings. Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxbase_bind.cpp 20 May 2009 04:43:41 -0000 1.20 --- wxbase_bind.cpp 24 May 2009 03:19:59 -0000 1.21 *************** *** 2349,2354 **** extern wxLuaBindMethod wxStandardPaths_methods[]; extern int wxStandardPaths_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxStandardPaths_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_enumCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths --- 2349,2354 ---- extern wxLuaBindMethod wxStandardPaths_methods[]; extern int wxStandardPaths_methodCount; ! extern wxLuaBindNumber wxStandardPaths_enums[]; ! extern int wxStandardPaths_enumCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths *************** *** 2375,2380 **** extern wxLuaBindMethod wxConfigBase_methods[]; extern int wxConfigBase_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; extern wxLuaBindMethod wxConfigPathChanger_methods[]; extern int wxConfigPathChanger_methodCount; --- 2375,2380 ---- extern wxLuaBindMethod wxConfigBase_methods[]; extern int wxConfigBase_methodCount; ! extern wxLuaBindNumber wxConfigBase_enums[]; ! extern int wxConfigBase_enumCount; extern wxLuaBindMethod wxConfigPathChanger_methods[]; extern int wxConfigPathChanger_methodCount; *************** *** 2403,2408 **** extern wxLuaBindMethod wxDateTime_methods[]; extern int wxDateTime_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxDateTime_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTime_enumCount; extern wxLuaBindMethod wxDateTimeArray_methods[]; extern int wxDateTimeArray_methodCount; --- 2403,2408 ---- extern wxLuaBindMethod wxDateTime_methods[]; extern int wxDateTime_methodCount; ! extern wxLuaBindNumber wxDateTime_enums[]; ! extern int wxDateTime_enumCount; extern wxLuaBindMethod wxDateTimeArray_methods[]; extern int wxDateTimeArray_methodCount; *************** *** 2424,2429 **** extern wxLuaBindMethod wxFile_methods[]; extern int wxFile_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxFile_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFile_enumCount; extern wxLuaBindMethod wxTempFile_methods[]; extern int wxTempFile_methodCount; --- 2424,2429 ---- extern wxLuaBindMethod wxFile_methods[]; extern int wxFile_methodCount; ! extern wxLuaBindNumber wxFile_enums[]; ! extern int wxFile_enumCount; extern wxLuaBindMethod wxTempFile_methods[]; extern int wxTempFile_methodCount; Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxnet_bind.cpp 19 May 2009 03:20:53 -0000 1.15 --- wxnet_bind.cpp 24 May 2009 03:20:00 -0000 1.16 *************** *** 2943,2948 **** extern wxLuaBindMethod wxFTP_methods[]; extern int wxFTP_methodCount; ! extern WXDLLIMPEXP_BINDWXNET wxLuaBindNumber wxFTP_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_enumCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) --- 2943,2948 ---- extern wxLuaBindMethod wxFTP_methods[]; extern int wxFTP_methodCount; ! extern wxLuaBindNumber wxFTP_enums[]; ! extern int wxFTP_enumCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxcore_bind.cpp 19 May 2009 03:20:53 -0000 1.23 --- wxcore_bind.cpp 24 May 2009 03:19:59 -0000 1.24 *************** *** 5037,5042 **** extern wxLuaBindMethod wxStockGDI_methods[]; extern int wxStockGDI_methodCount; ! extern WXDLLIMPEXP_BINDWXCORE wxLuaBindNumber wxStockGDI_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxStockGDI_enumCount; #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) --- 5037,5042 ---- extern wxLuaBindMethod wxStockGDI_methods[]; extern int wxStockGDI_methodCount; ! extern wxLuaBindNumber wxStockGDI_enums[]; ! extern int wxStockGDI_enumCount; #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) *************** *** 5261,5266 **** extern wxLuaBindMethod wxHelpEvent_methods[]; extern int wxHelpEvent_methodCount; ! extern WXDLLIMPEXP_BINDWXCORE wxLuaBindNumber wxHelpEvent_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxHelpEvent_enumCount; extern wxLuaBindMethod wxIconizeEvent_methods[]; extern int wxIconizeEvent_methodCount; --- 5261,5266 ---- extern wxLuaBindMethod wxHelpEvent_methods[]; extern int wxHelpEvent_methodCount; ! extern wxLuaBindNumber wxHelpEvent_enums[]; ! extern int wxHelpEvent_enumCount; extern wxLuaBindMethod wxIconizeEvent_methods[]; extern int wxIconizeEvent_methodCount; *************** *** 5281,5286 **** extern wxLuaBindMethod wxNavigationKeyEvent_methods[]; extern int wxNavigationKeyEvent_methodCount; ! extern WXDLLIMPEXP_BINDWXCORE wxLuaBindNumber wxNavigationKeyEvent_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxNavigationKeyEvent_enumCount; extern wxLuaBindMethod wxNotifyEvent_methods[]; extern int wxNotifyEvent_methodCount; --- 5281,5286 ---- extern wxLuaBindMethod wxNavigationKeyEvent_methods[]; extern int wxNavigationKeyEvent_methodCount; ! extern wxLuaBindNumber wxNavigationKeyEvent_enums[]; ! extern int wxNavigationKeyEvent_enumCount; extern wxLuaBindMethod wxNotifyEvent_methods[]; extern int wxNotifyEvent_methodCount; *************** *** 5530,5535 **** extern wxLuaBindMethod wxDataObject_methods[]; extern int wxDataObject_methodCount; ! extern WXDLLIMPEXP_BINDWXCORE wxLuaBindNumber wxDataObject_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxDataObject_enumCount; extern wxLuaBindMethod wxDataObjectComposite_methods[]; extern int wxDataObjectComposite_methodCount; --- 5530,5535 ---- extern wxLuaBindMethod wxDataObject_methods[]; extern int wxDataObject_methodCount; ! extern wxLuaBindNumber wxDataObject_enums[]; ! extern int wxDataObject_enumCount; extern wxLuaBindMethod wxDataObjectComposite_methods[]; extern int wxDataObjectComposite_methodCount; *************** *** 5806,5811 **** extern wxLuaBindMethod wxRendererVersion_methods[]; extern int wxRendererVersion_methodCount; ! extern WXDLLIMPEXP_BINDWXCORE wxLuaBindNumber wxRendererVersion_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxRendererVersion_enumCount; extern wxLuaBindMethod wxSplitterRenderParams_methods[]; extern int wxSplitterRenderParams_methodCount; --- 5806,5811 ---- extern wxLuaBindMethod wxRendererVersion_methods[]; extern int wxRendererVersion_methodCount; ! extern wxLuaBindNumber wxRendererVersion_enums[]; ! extern int wxRendererVersion_enumCount; extern wxLuaBindMethod wxSplitterRenderParams_methods[]; extern int wxSplitterRenderParams_methodCount; Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxadv_bind.cpp 20 May 2009 04:43:41 -0000 1.21 --- wxadv_bind.cpp 24 May 2009 03:19:59 -0000 1.22 *************** *** 15749,15758 **** extern wxLuaBindMethod wxGrid_methods[]; extern int wxGrid_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; extern wxLuaBindMethod wxGridCellAttr_methods[]; extern int wxGridCellAttr_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; extern wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern int wxGridCellAttrProvider_methodCount; --- 15749,15758 ---- extern wxLuaBindMethod wxGrid_methods[]; extern int wxGrid_methodCount; ! extern wxLuaBindNumber wxGrid_enums[]; ! extern int wxGrid_enumCount; extern wxLuaBindMethod wxGridCellAttr_methods[]; extern int wxGridCellAttr_methodCount; ! extern wxLuaBindNumber wxGridCellAttr_enums[]; ! extern int wxGridCellAttr_enumCount; extern wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern int wxGridCellAttrProvider_methodCount; Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxhtml_bind.cpp 19 May 2009 03:20:53 -0000 1.14 --- wxhtml_bind.cpp 24 May 2009 03:19:59 -0000 1.15 *************** *** 4925,4930 **** extern wxLuaBindMethod wxHtmlWindowInterface_methods[]; extern int wxHtmlWindowInterface_methodCount; ! extern WXDLLIMPEXP_BINDWXHTML wxLuaBindNumber wxHtmlWindowInterface_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlWindowInterface_enumCount; extern wxLuaBindMethod wxSimpleHtmlListBox_methods[]; extern int wxSimpleHtmlListBox_methodCount; --- 4925,4930 ---- extern wxLuaBindMethod wxHtmlWindowInterface_methods[]; extern int wxHtmlWindowInterface_methodCount; ! extern wxLuaBindNumber wxHtmlWindowInterface_enums[]; ! extern int wxHtmlWindowInterface_enumCount; extern wxLuaBindMethod wxSimpleHtmlListBox_methods[]; extern int wxSimpleHtmlListBox_methodCount; Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxaui_bind.cpp 19 May 2009 03:20:53 -0000 1.17 --- wxaui_bind.cpp 24 May 2009 03:19:59 -0000 1.18 *************** *** 9018,9023 **** extern wxLuaBindMethod wxAuiDockUIPart_methods[]; extern int wxAuiDockUIPart_methodCount; ! extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiDockUIPart_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockUIPart_enumCount; extern wxLuaBindMethod wxAuiFloatingFrame_methods[]; extern int wxAuiFloatingFrame_methodCount; --- 9018,9023 ---- extern wxLuaBindMethod wxAuiDockUIPart_methods[]; extern int wxAuiDockUIPart_methodCount; ! extern wxLuaBindNumber wxAuiDockUIPart_enums[]; ! extern int wxAuiDockUIPart_enumCount; extern wxLuaBindMethod wxAuiFloatingFrame_methods[]; extern int wxAuiFloatingFrame_methodCount; *************** *** 9044,9049 **** extern wxLuaBindMethod wxAuiPaneInfo_methods[]; extern int wxAuiPaneInfo_methodCount; ! extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiPaneInfo_enums[]; ! extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneInfo_enumCount; extern wxLuaBindMethod wxAuiPaneInfoArray_methods[]; extern int wxAuiPaneInfoArray_methodCount; --- 9044,9049 ---- extern wxLuaBindMethod wxAuiPaneInfo_methods[]; extern int wxAuiPaneInfo_methodCount; ! extern wxLuaBindNumber wxAuiPaneInfo_enums[]; ! extern int wxAuiPaneInfo_enumCount; extern wxLuaBindMethod wxAuiPaneInfoArray_methods[]; extern int wxAuiPaneInfoArray_methodCount; |
|
From: John L. <jr...@us...> - 2009-05-24 03:20:07
|
Update of /cvsroot/wxlua/wxLua/bindings In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12858/wxLua/bindings Modified Files: genwxbind.lua Log Message: Don't use export symbol for non exported enum wxLuaBindNumbers in bindings. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.180 retrieving revision 1.181 diff -C2 -d -r1.180 -r1.181 *** genwxbind.lua 19 May 2009 03:20:53 -0000 1.180 --- genwxbind.lua 24 May 2009 03:19:59 -0000 1.181 *************** *** 4033,4038 **** enumArrayName = MakeVar(parseObject.Name).."_enums" enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" end --- 4033,4040 ---- enumArrayName = MakeVar(parseObject.Name).."_enums" enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! --ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! --ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" ! ExternEnumDeclaration = "extern wxLuaBindNumber "..enumArrayName.."[];\n" ! ExternEnumCountDeclaration = "extern int "..enumArrayCountName..";\n" end |
|
From: John L. <jr...@us...> - 2009-05-20 04:43:51
|
Update of /cvsroot/wxlua/wxLua/samples In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5286/wxLua/samples Modified Files: bindings.wx.lua Log Message: Update bindings.wx.lua to handle multiple base classes remove wrong wxBitmapComboBox base class temporarily Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** bindings.wx.lua 14 May 2009 05:06:21 -0000 1.24 --- bindings.wx.lua 20 May 2009 04:43:41 -0000 1.25 *************** *** 1033,1036 **** --- 1033,1074 ---- } + local function BaseClassRecursor(baseBindClasses, c_table, c_table_pos) + if not baseBindClasses then return end + + local bc_list = baseBindClasses + local c_table_lens = {} + + for bc_i = 1, #bc_list do + local bc = bc_list[bc_i] + -- check for mistakes in the bindings + if (not bc.classInfo) and wx.wxClassInfo.FindClass(bc.name) then + print(bc.name.." is missing its wxClassInfo, please report this.") + end + + -- make a new entry and copy the previous ones + if bc_i > 1 then + c_table[c_table_pos+bc_i-1] = {} + for k, v in pairs(c_table[c_table_pos]) do + if (tonumber(k) == nil) then + c_table[c_table_pos+1][k] = v + elseif (k < c_table_lens[c_table_pos]) then + -- use "" to blank out + c_table[c_table_pos+1][k] = v -- "" + end + end + + c_table[c_table_pos+bc_i-1][1] = c_table[c_table_pos][1]..string.char(string.byte("a")+c_table_pos+bc_i-3) + c_table[c_table_pos+bc_i-1][2] = c_table[c_table_pos][2] + end + table.insert(c_table[c_table_pos+bc_i-1], bc.name) + + for i = 1, #c_table do + c_table_lens[i] = #c_table[i] + end + + BaseClassRecursor(bc.baseBindClasses, c_table, c_table_pos+bc_i-1) + end + end + for b = 1, #bindingList do local binding = bindingList[b] *************** *** 1051,1073 **** end -- traverse through the wxLua defined base classes ! local bc = c ! while bc do ! -- check for mistakes in the bindings ! if (not bc.classInfo) and wx.wxClassInfo.FindClass(bc.name) then ! print(bc.name.." is missing its wxClassInfo, please report this.") ! end ! table.insert(c_table, bc.name) ! bc = bc.baseclass end - if max_cols < #c_table then max_cols = #c_table end - table.insert(t, c_table) - -- now do wxWidgets base class info if c.classInfo then local ci = c.classInfo ! local c_table2 = {a.."c"} while ci do --- 1089,1106 ---- end + c_table = {c_table} + -- traverse through the wxLua defined base classes ! BaseClassRecursor({c}, c_table, 1) ! for j = 1, #c_table do ! if max_cols < #c_table[j] then max_cols = #c_table[j] end ! table.insert(t, c_table[j]) end -- now do wxWidgets base class info if c.classInfo then local ci = c.classInfo ! local c_table2 = {a.."wx"} while ci do *************** *** 1090,1094 **** end ! --if ci:GetBaseClass2() then print(ci:GetClassName(), "Has two bases!") end ci = ci:GetBaseClass1() -- FIXME handle two base classes, maybe? end --- 1123,1127 ---- end ! if ci:GetBaseClass2() then print(ci:GetClassName(), "Has two bases!") end ci = ci:GetBaseClass1() -- FIXME handle two base classes, maybe? end |
|
From: John L. <jr...@us...> - 2009-05-20 04:43:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5286/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxbase_bind.cpp Log Message: Update bindings.wx.lua to handle multiple base classes remove wrong wxBitmapComboBox base class temporarily Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxadv_bind.cpp 19 May 2009 03:20:53 -0000 1.20 --- wxadv_bind.cpp 20 May 2009 04:43:41 -0000 1.21 *************** *** 15532,15536 **** static const char* wxluaclassname_wxCommandEvent = "wxCommandEvent"; static const char* wxluaclassname_wxControl = "wxControl"; - static const char* wxluaclassname_wxControlWithItems = "wxControlWithItems"; static const char* wxluaclassname_wxDateEvent = "wxDateEvent"; static const char* wxluaclassname_wxDialog = "wxDialog"; --- 15532,15535 ---- *************** *** 15598,15603 **** static const char* wxluabaseclassnames_wxAnimationCtrl[] = { wxluaclassname_wxControl, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxAnimationCtrl[] = { NULL }; - static const char* wxluabaseclassnames_wxBitmapComboBox[] = { wxluaclassname_wxControlWithItems, NULL }; - static wxLuaBindClass* wxluabaseclassbinds_wxBitmapComboBox[] = { NULL }; static const char* wxluabaseclassnames_wxCalculateLayoutEvent[] = { wxluaclassname_wxEvent, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxCalculateLayoutEvent[] = { NULL }; --- 15597,15600 ---- *************** *** 15880,15884 **** #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, wxluabaseclassnames_wxBitmapComboBox, wxluabaseclassbinds_wxBitmapComboBox, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX --- 15877,15881 ---- #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, NULL, NULL, g_wxluanumberArray_None, 0, }, #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxbase_bind.cpp 19 May 2009 03:20:53 -0000 1.19 --- wxbase_bind.cpp 20 May 2009 04:43:41 -0000 1.20 *************** *** 2612,2616 **** #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, NULL, &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) --- 2612,2616 ---- #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) ! { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, CLASSINFO(wxFileSystem), &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) |
|
From: John L. <jr...@us...> - 2009-05-20 04:43:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5286/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_adv.i wxbase_file.i Log Message: Update bindings.wx.lua to handle multiple base classes remove wrong wxBitmapComboBox base class temporarily Index: wxadv_adv.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxadv_adv.i 17 Jan 2008 22:37:29 -0000 1.4 --- wxadv_adv.i 20 May 2009 04:43:41 -0000 1.5 *************** *** 144,148 **** %include "wx/bmpcbox.h" ! %class wxBitmapComboBox, wxControlWithItems wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") --- 144,148 ---- %include "wx/bmpcbox.h" ! %class wxBitmapComboBox //, wxControlWithItems wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** wx_datatypes.lua 14 May 2009 05:06:21 -0000 1.100 --- wx_datatypes.lua 20 May 2009 04:43:41 -0000 1.101 *************** *** 583,589 **** }, wxBitmapComboBox = { - BaseClasses = { - [1] = "wxControlWithItems", - }, Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", IsNumber = false, --- 583,586 ---- Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxbase_file.i 1 Apr 2008 04:19:42 -0000 1.5 --- wxbase_file.i 20 May 2009 04:43:41 -0000 1.6 *************** *** 954,958 **** %endenum ! %class %noclassinfo %delete wxFileSystem, wxObject wxFileSystem() --- 954,958 ---- %endenum ! %class %delete wxFileSystem, wxObject wxFileSystem() |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:09
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/docs Modified Files: binding.html install.html wxlua.html Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxlua.html 27 Oct 2008 02:27:19 -0000 1.40 --- wxlua.html 19 May 2009 03:20:53 -0000 1.41 *************** *** 1779,1783 **** wxLua program will display a console window to display print statements, run the string "a = 12; b = 3", then ! run myprogram.lua and push into lua a table named 'arg' with the indices </li> <li>[-5] = 'd:\wxLua\bin\wxlua.exe', [-4] --- 1779,1783 ---- wxLua program will display a console window to display print statements, run the string "a = 12; b = 3", then ! run myprogram.lua and push into Lua a table named 'arg' with the indices </li> <li>[-5] = 'd:\wxLua\bin\wxlua.exe', [-4] *************** *** 1942,1946 **** "modulename/include/filename.h"</i>.<br> <ul> ! <li><b>lua</b></li> <ul> <li>The --- 1942,1946 ---- "modulename/include/filename.h"</i>.<br> <ul> ! <li><b>Lua</b></li> <ul> <li>The Index: install.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/install.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** install.html 11 Jan 2008 23:39:05 -0000 1.13 --- install.html 19 May 2009 03:20:53 -0000 1.14 *************** *** 10,14 **** <br> This document describes how to build wxLua for use as an ! interpreter of lua scripts and for embedding wxLua in a C++ project. You can build wxLua on many platforms with a variety of compilers. All the build settings and platforms that are supported by wxWidgets are --- 10,14 ---- <br> This document describes how to build wxLua for use as an ! interpreter of Lua scripts and for embedding wxLua in a C++ project. You can build wxLua on many platforms with a variety of compilers. All the build settings and platforms that are supported by wxWidgets are *************** *** 58,62 **** If you want to use wxLuaApp to write your applications in Lua using wxWidgets library then you are mainly interested in the <span style="font-weight: bold;">applications</span> ! (basically code editors with integrated lua interpreter). If you want to integrate wxLua in your C++ project, then you are mainly interested in the <span style="font-weight: bold;">modules</span>, --- 58,62 ---- If you want to use wxLuaApp to write your applications in Lua using wxWidgets library then you are mainly interested in the <span style="font-weight: bold;">applications</span> ! (basically code editors with integrated Lua interpreter). If you want to integrate wxLua in your C++ project, then you are mainly interested in the <span style="font-weight: bold;">modules</span>, *************** *** 104,108 **** <li> <p><span style="font-style: italic;">wxLua/modules/wxluadebug</span> ! - Helpful classes for debugging lua, wxLuaCheckStack and wxLuaStackDialog.</p> </li> --- 104,108 ---- <li> <p><span style="font-style: italic;">wxLua/modules/wxluadebug</span> ! - Helpful classes for debugging Lua, wxLuaCheckStack and wxLuaStackDialog.</p> </li> *************** *** 506,510 **** in their own project. This means that you can write scripts to make your code simpler, load and run files on the fly, and ! allow users to more easily customize your program with their own lua scripts.<br> <br> --- 506,510 ---- in their own project. This means that you can write scripts to make your code simpler, load and run files on the fly, and ! allow users to more easily customize your program with their own Lua scripts.<br> <br> *************** *** 516,523 **** at a <span style="font-style: italic;">minimum</span>. With these two libraries you have the ability to start an interpreter ! and run straight lua code in it using the wxLuaState class.<br> <br> To get the ability to create wxWidgets objects and use the ! functionality of wxWidgets in lua you will also need to build and link to the libraries in <span style="font-family: monospace;">modules/wxbind</span>. The bindings in <span style="font-family: monospace;">modules/wxbind</span> --- 516,523 ---- at a <span style="font-style: italic;">minimum</span>. With these two libraries you have the ability to start an interpreter ! and run straight Lua code in it using the wxLuaState class.<br> <br> To get the ability to create wxWidgets objects and use the ! functionality of wxWidgets in Lua you will also need to build and link to the libraries in <span style="font-family: monospace;">modules/wxbind</span>. The bindings in <span style="font-family: monospace;">modules/wxbind</span> Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** binding.html 25 Oct 2008 05:18:56 -0000 1.30 --- binding.html 19 May 2009 03:20:53 -0000 1.31 *************** *** 8,17 **** generator for wxLua provides information for Lua code to ! interface to a C/C++ API. The C/C++ objects are created in lua as userdata and manipulated using the same functional semantics as you would in C/C++. The <span style="font-weight: bold;">wxlua.html</span> wxLua documentation describes in detail how the object ! will be named and where it will be placed in lua.<br> <br>Binding files are provided for the <b>wxWidgets</b> cross --- 8,17 ---- generator for wxLua provides information for Lua code to ! interface to a C/C++ API. The C/C++ objects are created in Lua as userdata and manipulated using the same functional semantics as you would in C/C++. The <span style="font-weight: bold;">wxlua.html</span> wxLua documentation describes in detail how the object ! will be named and where it will be placed in Lua.<br> <br>Binding files are provided for the <b>wxWidgets</b> cross *************** *** 29,33 **** <i>bindings/genwxbind.lua</i> parses ! and turns into C functions that are imported into lua by an automatically generated <i>wxLuaBinding</i> derived class. The whole process of generation is --- 29,33 ---- <i>bindings/genwxbind.lua</i> parses ! and turns into C functions that are imported into Lua by an automatically generated <i>wxLuaBinding</i> derived class. The whole process of generation is *************** *** 75,79 **** copy an existing one to use as a starting point for your own.</li> <li style="text-align: justify;">The rules files are ! actual lua programs that <i>genwxbind.lua</i> runs before processing the interface files, but after it has created various structures used for parsing allowing for --- 75,79 ---- copy an existing one to use as a starting point for your own.</li> <li style="text-align: justify;">The rules files are ! actual Lua programs that <i>genwxbind.lua</i> runs before processing the interface files, but after it has created various structures used for parsing allowing for *************** *** 140,144 **** style input parameters)</li> <li>// %override [type1 output_name1, type2 output_name2] ! ClassName::FuncName(reworked C++ style input parameters that the lua function actually takes)</li> </ul> <li>In order for the %overload functionality to work and to get --- 140,144 ---- style input parameters)</li> <li>// %override [type1 output_name1, type2 output_name2] ! ClassName::FuncName(reworked C++ style input parameters that the Lua function actually takes)</li> </ul> <li>In order for the %overload functionality to work and to get *************** *** 151,155 **** expects to get, and the third line is the correct calling semantics for the %overridden function.</li> <ul> <li>// ! %override void wxFrame::SetStatusWidths(lua table with number indexes and values)</li> <li>// C++ Func: virtual void --- 151,155 ---- expects to get, and the third line is the correct calling semantics for the %overridden function.</li> <ul> <li>// ! %override void wxFrame::SetStatusWidths(Lua table with number indexes and values)</li> <li>// C++ Func: virtual void *************** *** 191,195 **** through the wxLuaBindClass struct and when the binding is initialized will ! contain the tag index that lua assigns to the class for the userdata.</li> <li>The C functions, <i>int ClassMethodFunction(lua_State* L)</i>, that are called for the --- 191,195 ---- through the wxLuaBindClass struct and when the binding is initialized will ! contain the tag index that Lua assigns to the class for the userdata.</li> <li>The C functions, <i>int ClassMethodFunction(lua_State* L)</i>, that are called for the *************** *** 201,216 **** struct that contains all the wxEventType ! values and their associated wxEvent classes to push into the lua binding table.</li> <li>A wxLuaBindDefine struct that contains all the numerical ! values to push into the lua binding table.</li> <li>A wxLuaBindString struct that contains all the strings to ! push into the lua binding table.</li> <li>A wxLuaBindObject struct that contains all the objects to ! push as userdata into the lua binding table.</li> <li>A wxLuaBindMethod struct that contains all the global C ! functions to push into the lua binding table.</li> <li>A wxLuaBindClass struct that contains the class names, all --- 201,216 ---- struct that contains all the wxEventType ! values and their associated wxEvent classes to push into the Lua binding table.</li> <li>A wxLuaBindDefine struct that contains all the numerical ! values to push into the Lua binding table.</li> <li>A wxLuaBindString struct that contains all the strings to ! push into the Lua binding table.</li> <li>A wxLuaBindObject struct that contains all the objects to ! push as userdata into the Lua binding table.</li> <li>A wxLuaBindMethod struct that contains all the global C ! functions to push into the Lua binding table.</li> <li>A wxLuaBindClass struct that contains the class names, all *************** *** 219,223 **** tags.</li> <li>A wxLuaBinding derived class that actually pushes the ! bindings into lua.</li> </ul> </ul><h2><a name="Binding_C_Virtual_Functions"></a><u>Binding C++ Virtual Functions</u></h2> --- 219,223 ---- tags.</li> <li>A wxLuaBinding derived class that actually pushes the ! bindings into Lua.</li> </ul> </ul><h2><a name="Binding_C_Virtual_Functions"></a><u>Binding C++ Virtual Functions</u></h2> *************** *** 237,243 **** should review it before reading further. You will also need to look ! at <i>samples/printing.wx.lua</i> to see the lua code that overrides the function and <span style="font-style: italic;">modules/wxlua/src/wxlbind.cpp</span> ! for the metatable functions lua uses to handle a call to a function. <br> Below is a list of the function calls for wxPrintout::OnBeginDocument and notes about how it all --- 237,243 ---- should review it before reading further. You will also need to look ! at <i>samples/printing.wx.lua</i> to see the Lua code that overrides the function and <span style="font-style: italic;">modules/wxlua/src/wxlbind.cpp</span> ! for the metatable functions Lua uses to handle a call to a function. <br> Below is a list of the function calls for wxPrintout::OnBeginDocument and notes about how it all *************** *** 245,249 **** <ol> <li>Create a userdata wxLuaPrintout in Lua, replace the ! function OnBeginDocument with our own one in lua, and begin the printing process, perhaps doing a print preview? The code for this is in the <i>printing.wx.lua</i> sample.</li> --- 245,249 ---- <ol> <li>Create a userdata wxLuaPrintout in Lua, replace the ! function OnBeginDocument with our own one in Lua, and begin the printing process, perhaps doing a print preview? The code for this is in the <i>printing.wx.lua</i> sample.</li> *************** *** 289,296 **** is called. This is the function that handles all function calls for wxLua userdata objects that does a lookup to see if the ! function exists and pushes it onto the stack for lua to call <b>after</b> this function has returned. </li> <li>This is why we set a variable using ! wxLuaState::Set/GetCallBaseClassFunction() to remember if the lua function was called with a preceding "_". </li> <li>The reason why we need to reset the --- 289,296 ---- is called. This is the function that handles all function calls for wxLua userdata objects that does a lookup to see if the ! function exists and pushes it onto the stack for Lua to call <b>after</b> this function has returned. </li> <li>This is why we set a variable using ! wxLuaState::Set/GetCallBaseClassFunction() to remember if the Lua function was called with a preceding "_". </li> <li>The reason why we need to reset the *************** *** 300,307 **** and so calls to functions like wxLuaPrintout::OnPrintPage(...) fail since they are directed to call the base class function and not our ! derived lua functions.</li> </ul> </ol>To summarize, here's the function calls and where in each function wxLuaPrintout::OnBeginDocument is when you override ! the function in lua.<br> <ol> <li>wxWidgets calls wxLuaPrintout::OnBeginDocument(...) in C++</li> <li>wxLuaPrintout::OnBeginDocument(...) --- 300,307 ---- and so calls to functions like wxLuaPrintout::OnPrintPage(...) fail since they are directed to call the base class function and not our ! derived Lua functions.</li> </ul> </ol>To summarize, here's the function calls and where in each function wxLuaPrintout::OnBeginDocument is when you override ! the function in Lua.<br> <ol> <li>wxWidgets calls wxLuaPrintout::OnBeginDocument(...) in C++</li> <li>wxLuaPrintout::OnBeginDocument(...) *************** *** 313,317 **** userdata, the flag wxLuaState::GetCallBaseClassFunction is set to true, and the C function wxLua_wxPrintout_OnBeginDocument (in <i>modules/wxbind/src/wxcore_print.cpp</i>) ! is run by lua which calls back to wxLuaPrintout::OnBeginDocument(...).</li> <li>We enter wxLuaPrintout::OnBeginDocument(...) a second time, the first time through is still stalled at wxLuaState::LuaCall() --- 313,317 ---- userdata, the flag wxLuaState::GetCallBaseClassFunction is set to true, and the C function wxLua_wxPrintout_OnBeginDocument (in <i>modules/wxbind/src/wxcore_print.cpp</i>) ! is run by Lua which calls back to wxLuaPrintout::OnBeginDocument(...).</li> <li>We enter wxLuaPrintout::OnBeginDocument(...) a second time, the first time through is still stalled at wxLuaState::LuaCall() *************** *** 331,335 **** wxArrayString& choices or wxArrayString choices</b></li> <ul> <li>The ! binding generator will read from lua either a wxArrayString or a a numerically indexed table of strings for that parameter and convert them into a --- 331,335 ---- wxArrayString& choices or wxArrayString choices</b></li> <ul> <li>The ! binding generator will read from Lua either a wxArrayString or a a numerically indexed table of strings for that parameter and convert them into a *************** *** 342,346 **** wxArrayInt& choices or wxArrayInt choices</b></li> <ul> <li>The ! binding generator will read from lua a wxArrayInt or a numerically indexed table of integers for that parameter and convert --- 342,346 ---- wxArrayInt& choices or wxArrayInt choices</b></li> <ul> <li>The ! binding generator will read from Lua a wxArrayInt or a numerically indexed table of integers for that parameter and convert *************** *** 354,358 **** modify the wxArrayInt that's passed to it.</li> </ul> <li style="font-weight: bold;">IntArray_FromLuaTable</li> <ul> <li>The ! binding generator will read from lua a numerically indexed table of integers and create two parameters (int count, int* array) to pass --- 354,358 ---- modify the wxArrayInt that's passed to it.</li> </ul> <li style="font-weight: bold;">IntArray_FromLuaTable</li> <ul> <li>The ! binding generator will read from Lua a numerically indexed table of integers and create two parameters (int count, int* array) to pass *************** *** 381,385 **** DO NOT EVER TRY TO CAST IT, ACCESS IT, OR DELETE IT. This tag will allow ! the lua code to put a number (perhaps a table index) as the void* pointer. </li> <li>See Get/SetClientData() functions in --- 381,385 ---- DO NOT EVER TRY TO CAST IT, ACCESS IT, OR DELETE IT. This tag will allow ! the Lua code to put a number (perhaps a table index) as the void* pointer. </li> <li>See Get/SetClientData() functions in *************** *** 433,445 **** use %class ... ns::ClassName and the constructor must also be ns::ClassName. The generator will change the "::" to "_" however for ! useage in lua. </li> <li><i><b>%delete</b></i> is for classes that you ! want the lua garbage collector to delete when the variable goes out of scope. </li> <ul> <li>For example, a wxPoint should be deleted when there are no longer any references to it, but wxWindows are typically attached to a parent and the parent wxWindow should delete its children, ! not lua.</li> <li>Classes, like the simple wxPoint or ref counted wxObject classes like wxPen, can use the '=' operator to make a copy of the --- 433,445 ---- use %class ... ns::ClassName and the constructor must also be ns::ClassName. The generator will change the "::" to "_" however for ! useage in Lua. </li> <li><i><b>%delete</b></i> is for classes that you ! want the Lua garbage collector to delete when the variable goes out of scope. </li> <ul> <li>For example, a wxPoint should be deleted when there are no longer any references to it, but wxWindows are typically attached to a parent and the parent wxWindow should delete its children, ! not Lua.</li> <li>Classes, like the simple wxPoint or ref counted wxObject classes like wxPen, can use the '=' operator to make a copy of the *************** *** 477,481 **** parameter <i>[Value]</i> can be the actual numerical value to use. ! This if useful when you want lua to know about a preprocessor directive such as, <i>"#define A_DEFINE"</i> that doesn't have a value itself. In this case assign it to be 1 using <i>"%define --- 477,481 ---- parameter <i>[Value]</i> can be the actual numerical value to use. ! This if useful when you want Lua to know about a preprocessor directive such as, <i>"#define A_DEFINE"</i> that doesn't have a value itself. In this case assign it to be 1 using <i>"%define *************** *** 490,494 **** be used inside of the %class tag for the wxEvent derived class it corresponds to so the event's methods can be ! known to lua and the generator can assign the correct class type to it. </li> <li>An example of this is in the wxCommandEvent interface in <i>bindings/wxwidgets/event.i</i>, <i>"%define --- 490,494 ---- be used inside of the %class tag for the wxEvent derived class it corresponds to so the event's methods can be ! known to Lua and the generator can assign the correct class type to it. </li> <li>An example of this is in the wxCommandEvent interface in <i>bindings/wxwidgets/event.i</i>, <i>"%define *************** *** 500,504 **** be used inside the corresponding <i>%class</i> tag so ! that the object's class methods can be known to lua and the generator can assign the correct class type to it.</li> <li>An example of this is in the --- 500,504 ---- be used inside the corresponding <i>%class</i> tag so ! that the object's class methods can be known to Lua and the generator can assign the correct class type to it.</li> <li>An example of this is in the *************** *** 515,519 **** be used inside the corresponding <i>%class</i> tag so ! that the pointer's methods can be known to lua and the generator can assign the correct class type to it.</li> <li>An example of this is --- 515,519 ---- be used inside the corresponding <i>%class</i> tag so ! that the pointer's methods can be known to Lua and the generator can assign the correct class type to it.</li> <li>An example of this is *************** *** 567,571 **** passed to the function or return value should be garbage collected or able to be delete()ed by ! the lua program.</li> <li>This is for C++ functions that when passed a userdata object will 'release' it from being deleted --- 567,571 ---- passed to the function or return value should be garbage collected or able to be delete()ed by ! the Lua program.</li> <li>This is for C++ functions that when passed a userdata object will 'release' it from being deleted *************** *** 591,598 **** tag.</li> <li>Declares that after calling this function the object itself ! (not return value) should be garbage collected by lua.</li> <li>This is for functions that when called will release the object from being deleted by something else and therefore it should be ! deleted in wxLua by either the garbage collector or when a lua program calls the delete() function on it.</li> <li>You should verify that the generated code is appropriate as --- 591,598 ---- tag.</li> <li>Declares that after calling this function the object itself ! (not return value) should be garbage collected by Lua.</li> <li>This is for functions that when called will release the object from being deleted by something else and therefore it should be ! deleted in wxLua by either the garbage collector or when a Lua program calls the delete() function on it.</li> <li>You should verify that the generated code is appropriate as *************** *** 657,665 **** declared operators use the semantics given below.</li> <li>The reason that the ! operators are not overridden in lua using the metatable is that ! lua only defines a limited set of operators. Having some operators overridden and some not is probably more confusing that not overriding ! any. Secondly, by leaving the lua operators alone the = and == operators (for example) can be useful as userdata pointer assignment and pointer comparisons respectively. This is --- 657,665 ---- declared operators use the semantics given below.</li> <li>The reason that the ! operators are not overridden in Lua using the metatable is that ! Lua only defines a limited set of operators. Having some operators overridden and some not is probably more confusing that not overriding ! any. Secondly, by leaving the Lua operators alone the = and == operators (for example) can be useful as userdata pointer assignment and pointer comparisons respectively. This is *************** *** 712,716 **** verbatim into the binding code. </li> <li>This is necessary for functions that take ! pointers or references and return values though them. Since lua cannot have values passed by reference the only solution is to return multiple values. </li> <li>See the function --- 712,716 ---- verbatim into the binding code. </li> <li>This is necessary for functions that take ! pointers or references and return values though them. Since Lua cannot have values passed by reference the only solution is to return multiple values. </li> <li>See the function *************** *** 764,777 **** which can be accessed in ! lua as NEW_FUNC_NAME() though it's accessed in C using FUNC_NAME().</li> <li>This can be necessary when there are two overloaded C functions that are hard or impossible to distinguish between ! the two and so it is necessary to rename them for the lua script to access them correctly.</li> <li>An example of when this is necessary is</li> <ul> <li>wxSize wxWindow::GetClientSize()</li> <li>void wxWindow::GetClientSize(int* width, int* height)</li> <li>Since ! lua cannot pass the int *width and *height by reference, we change the function to have this signature.</li> <ul> <li>[int width, int height] = wxWindow::GetClientSize()</li> --- 764,777 ---- which can be accessed in ! Lua as NEW_FUNC_NAME() though it's accessed in C using FUNC_NAME().</li> <li>This can be necessary when there are two overloaded C functions that are hard or impossible to distinguish between ! the two and so it is necessary to rename them for the Lua script to access them correctly.</li> <li>An example of when this is necessary is</li> <ul> <li>wxSize wxWindow::GetClientSize()</li> <li>void wxWindow::GetClientSize(int* width, int* height)</li> <li>Since ! Lua cannot pass the int *width and *height by reference, we change the function to have this signature.</li> <ul> <li>[int width, int height] = wxWindow::GetClientSize()</li> *************** *** 800,804 **** return value only.</li> <li>Declares that the parameter passed to the function or return value should not be ! garbage collected or able to be delete()ed by the lua program.</li> <li>This is for functions that when passed a userdata object will take --- 800,804 ---- return value only.</li> <li>Declares that the parameter passed to the function or return value should not be ! garbage collected or able to be delete()ed by the Lua program.</li> <li>This is for functions that when passed a userdata object will take *************** *** 818,822 **** tag.</li> <li>Declares that after calling this function the object itself ! (not return value) will not be garbage collected by lua.</li> <li>See also <i>%gc_this</i>.</li> </ul><b><i>%wxchkver_X_Y_Z</i></b><br> --- 818,822 ---- tag.</li> <li>Declares that after calling this function the object itself ! (not return value) will not be garbage collected by Lua.</li> <li>See also <i>%gc_this</i>.</li> </ul><b><i>%wxchkver_X_Y_Z</i></b><br> |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlcallb.h 17 Mar 2008 03:05:04 -0000 1.29 --- wxlcallb.h 19 May 2009 03:20:53 -0000 1.30 *************** *** 48,52 **** // If only one event Id is needed set last_id = wxID_ANY // Returns an empty string on success and the wxEvtHandler takes ownership of this, ! // otherwise an error message and you must delete this since nobody else will. virtual wxString Connect( const wxLuaState& wxlState, int lua_func_stack_idx, wxWindowID win_id, wxWindowID last_id, --- 48,52 ---- // If only one event Id is needed set last_id = wxID_ANY // Returns an empty string on success and the wxEvtHandler takes ownership of this, ! // otherwise an error message is returned and you must delete this since nobody else will. virtual wxString Connect( const wxLuaState& wxlState, int lua_func_stack_idx, wxWindowID win_id, wxWindowID last_id, *************** *** 97,101 **** // an error message in Lua. // ! // Do NOT delete this, the wxEvtHandler deletes the callback user data itself. // // The function OnAllDestroyEvents() generically handles the events and forwards them --- 97,102 ---- // an error message in Lua. // ! // Do NOT delete this, the wxEvtHandler deletes the callback user data itself ! // unless it is !Ok() since that means it wasn't attached to the window. // // The function OnAllDestroyEvents() generically handles the events and forwards them *************** *** 115,118 **** --- 116,123 ---- wxWindow* GetWindow() const { return m_window; } + // If Ok then this should be attached to a wxEVT_DESTROY callback + // else you should delete this since nobody else will. + bool Ok() const { return m_wxlState.Ok() && (m_window != NULL); } + // Get a human readable string // "wxWindowClassName(&win, id=%d)|wxLuaDestroyCallback(&callback)" Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxldefs.h 31 Mar 2009 04:23:42 -0000 1.46 --- wxldefs.h 19 May 2009 03:20:53 -0000 1.47 *************** *** 65,69 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 26 // ---------------------------------------------------------------------------- --- 65,69 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 27 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** wxlbind.h 14 May 2009 05:06:21 -0000 1.86 --- wxlbind.h 19 May 2009 03:20:53 -0000 1.87 *************** *** 28,32 **** // are shifted to be positive values. // The Binding wxLua types are positive integers generated automatically when ! // initialized and start at WXLUA_T_MAX+1. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. --- 28,32 ---- // are shifted to be positive values. // The Binding wxLua types are positive integers generated automatically when ! // wxLua is initialized and start at WXLUA_T_MAX+1. // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to // differentiate between the two. *************** *** 154,158 **** int minargs; // Min number of required args int maxargs; // Max number of args allowed ! wxLuaArgType* argtypes; // Array of wxLua types representing each argument, zero terminated. }; --- 154,158 ---- int minargs; // Min number of required args int maxargs; // Max number of args allowed ! wxLuaArgType* argtypes; // Array of wxLua types representing each argument, NULL terminated. }; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** wxlstate.h 24 Mar 2009 04:15:31 -0000 1.123 --- wxlstate.h 19 May 2009 03:20:53 -0000 1.124 *************** *** 94,98 **** // Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua. ! // Note that even though these keys have values, they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed --- 94,99 ---- // Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua. ! // Note that even though these keys have human readable names as values, ! // they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table indexed Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlua_bind.h 31 Mar 2009 04:23:42 -0000 1.17 --- wxlua_bind.h 19 May 2009 03:20:53 -0000 1.18 *************** *** 17,23 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 49,57 **** extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaObject; - extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaObject_methods[]; - extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaObject_methodCount; extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_wxLuaState; - extern WXDLLIMPEXP_WXLUA wxLuaBindMethod wxLuaState_methods[]; - extern WXDLLIMPEXP_DATA_WXLUA(int) wxLuaState_methodCount; --- 49,53 ---- |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:04
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/apps/wxluacan/src Modified Files: wxluacan_bind.cpp wxluacan_bind.h Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxluacan_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluacan_bind.h 31 Mar 2009 04:23:42 -0000 1.5 --- wxluacan_bind.h 19 May 2009 03:20:53 -0000 1.6 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 52,75 **** extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCan; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObj; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjAddScript; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjCircle; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjRect; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlCanObjScript; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxluatype_wxlLuaCanCmd; - extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; --- 52,61 ---- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wxluacan_bind.cpp 14 May 2009 05:06:21 -0000 1.35 --- wxluacan_bind.cpp 19 May 2009 03:20:53 -0000 1.36 *************** *** 666,669 **** --- 666,689 ---- static const char* wxluabaseclassnames_wxlLuaCanCmd[] = { wxluaclassname_wxCommandProcessor, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxlLuaCanCmd[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + extern wxLuaBindMethod wxlCan_methods[]; + extern int wxlCan_methodCount; + extern wxLuaBindMethod wxlCanObj_methods[]; + extern int wxlCanObj_methodCount; + extern wxLuaBindMethod wxlCanObjAddScript_methods[]; + extern int wxlCanObjAddScript_methodCount; + extern wxLuaBindMethod wxlCanObjCircle_methods[]; + extern int wxlCanObjCircle_methodCount; + extern wxLuaBindMethod wxlCanObjRect_methods[]; + extern int wxlCanObjRect_methodCount; + extern wxLuaBindMethod wxlCanObjScript_methods[]; + extern int wxlCanObjScript_methodCount; + extern wxLuaBindMethod wxlLuaCanCmd_methods[]; + extern int wxlLuaCanCmd_methodCount; + + |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxbase_data.cpp wxcore_bind.cpp wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxxml_bind.cpp wxxrc_bind.cpp Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxbase_bind.cpp 14 May 2009 05:06:21 -0000 1.18 --- wxbase_bind.cpp 19 May 2009 03:20:53 -0000 1.19 *************** *** 2291,2294 **** --- 2291,2524 ---- static const char* wxluabaseclassnames_wxSystemOptions[] = { wxluaclassname_wxObject, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxSystemOptions[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + extern wxLuaBindMethod wxArchiveFSHandler_methods[]; + extern int wxArchiveFSHandler_methodCount; + extern wxLuaBindMethod wxFSFile_methods[]; + extern int wxFSFile_methodCount; + extern wxLuaBindMethod wxFileSystem_methods[]; + extern int wxFileSystem_methodCount; + extern wxLuaBindMethod wxFileSystemHandler_methods[]; + extern int wxFileSystemHandler_methodCount; + extern wxLuaBindMethod wxFilterFSHandler_methods[]; + extern int wxFilterFSHandler_methodCount; + extern wxLuaBindMethod wxLocalFSHandler_methods[]; + extern int wxLocalFSHandler_methodCount; + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + extern wxLuaBindMethod wxInternetFSHandler_methods[]; + extern int wxInternetFSHandler_methodCount; + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + + extern wxLuaBindMethod wxClientData_methods[]; + extern int wxClientData_methodCount; + extern wxLuaBindMethod wxClientDataContainer_methods[]; + extern int wxClientDataContainer_methodCount; + extern wxLuaBindMethod wxDynamicLibrary_methods[]; + extern int wxDynamicLibrary_methodCount; + extern wxLuaBindMethod wxDynamicLibraryDetails_methods[]; + extern int wxDynamicLibraryDetails_methodCount; + extern wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; + extern int wxDynamicLibraryDetailsArray_methodCount; + extern wxLuaBindMethod wxFileType_methods[]; + extern int wxFileType_methodCount; + extern wxLuaBindMethod wxFileType_MessageParameters_methods[]; + extern int wxFileType_MessageParameters_methodCount; + extern wxLuaBindMethod wxFileTypeInfo_methods[]; + extern int wxFileTypeInfo_methodCount; + extern wxLuaBindMethod wxIconLocation_methods[]; + extern int wxIconLocation_methodCount; + extern wxLuaBindMethod wxMimeTypesManager_methods[]; + extern int wxMimeTypesManager_methodCount; + extern wxLuaBindMethod wxPathList_methods[]; + extern int wxPathList_methodCount; + extern wxLuaBindMethod wxPlatformInfo_methods[]; + extern int wxPlatformInfo_methodCount; + extern wxLuaBindMethod wxString_methods[]; + extern int wxString_methodCount; + extern wxLuaBindMethod wxStringClientData_methods[]; + extern int wxStringClientData_methodCount; + extern wxLuaBindMethod wxStringTokenizer_methods[]; + extern int wxStringTokenizer_methodCount; + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + extern wxLuaBindMethod wxStandardPaths_methods[]; + extern int wxStandardPaths_methodCount; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxStandardPaths_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_enumCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + + #if wxLUA_USE_wxArrayInt + extern wxLuaBindMethod wxArrayInt_methods[]; + extern int wxArrayInt_methodCount; + #endif // wxLUA_USE_wxArrayInt + + #if wxLUA_USE_wxArrayString + extern wxLuaBindMethod wxArrayString_methods[]; + extern int wxArrayString_methodCount; + extern wxLuaBindMethod wxSortedArrayString_methods[]; + extern int wxSortedArrayString_methodCount; + #endif // wxLUA_USE_wxArrayString + + #if wxLUA_USE_wxClassInfo + extern wxLuaBindMethod wxClassInfo_methods[]; + extern int wxClassInfo_methodCount; + #endif // wxLUA_USE_wxClassInfo + + #if wxLUA_USE_wxConfig && wxUSE_CONFIG + extern wxLuaBindMethod wxConfig_methods[]; + extern int wxConfig_methodCount; + extern wxLuaBindMethod wxConfigBase_methods[]; + extern int wxConfigBase_methodCount; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; + extern wxLuaBindMethod wxConfigPathChanger_methods[]; + extern int wxConfigPathChanger_methodCount; + extern wxLuaBindMethod wxFileConfig_methods[]; + extern int wxFileConfig_methodCount; + extern wxLuaBindMethod wxMemoryConfig_methods[]; + extern int wxMemoryConfig_methodCount; + #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + + #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS + extern wxLuaBindMethod wxCriticalSection_methods[]; + extern int wxCriticalSection_methodCount; + #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS + + #if wxLUA_USE_wxCriticalSectionLocker + extern wxLuaBindMethod wxCriticalSectionLocker_methods[]; + extern int wxCriticalSectionLocker_methodCount; + #endif // wxLUA_USE_wxCriticalSectionLocker + + #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME + extern wxLuaBindMethod wxDateSpan_methods[]; + extern int wxDateSpan_methodCount; + #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME + + #if wxLUA_USE_wxDateTime && wxUSE_DATETIME + extern wxLuaBindMethod wxDateTime_methods[]; + extern int wxDateTime_methodCount; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxDateTime_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTime_enumCount; + extern wxLuaBindMethod wxDateTimeArray_methods[]; + extern int wxDateTimeArray_methodCount; + #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME + + #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME + extern wxLuaBindMethod wxDateTimeHolidayAuthority_methods[]; + extern int wxDateTimeHolidayAuthority_methodCount; + extern wxLuaBindMethod wxDateTimeWorkDays_methods[]; + extern int wxDateTimeWorkDays_methodCount; + #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME + + #if wxLUA_USE_wxDir + extern wxLuaBindMethod wxDir_methods[]; + extern int wxDir_methodCount; + #endif // wxLUA_USE_wxDir + + #if wxLUA_USE_wxFile && wxUSE_FILE + extern wxLuaBindMethod wxFile_methods[]; + extern int wxFile_methodCount; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxFile_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFile_enumCount; + extern wxLuaBindMethod wxTempFile_methods[]; + extern int wxTempFile_methodCount; + #endif // wxLUA_USE_wxFile && wxUSE_FILE + + #if wxLUA_USE_wxFileName + extern wxLuaBindMethod wxFileName_methods[]; + extern int wxFileName_methodCount; + #endif // wxLUA_USE_wxFileName + + #if wxLUA_USE_wxList && !wxUSE_STL + extern wxLuaBindMethod wxList_methods[]; + extern int wxList_methodCount; + extern wxLuaBindMethod wxNode_methods[]; + extern int wxNode_methodCount; + #endif // wxLUA_USE_wxList && !wxUSE_STL + + #if wxLUA_USE_wxLog && wxUSE_LOG + extern wxLuaBindMethod wxLog_methods[]; + extern int wxLog_methodCount; + extern wxLuaBindMethod wxLogBuffer_methods[]; + extern int wxLogBuffer_methodCount; + extern wxLuaBindMethod wxLogChain_methods[]; + extern int wxLogChain_methodCount; + extern wxLuaBindMethod wxLogNull_methods[]; + extern int wxLogNull_methodCount; + extern wxLuaBindMethod wxLogPassThrough_methods[]; + extern int wxLogPassThrough_methodCount; + #endif // wxLUA_USE_wxLog && wxUSE_LOG + + #if wxLUA_USE_wxObject + extern wxLuaBindMethod wxObject_methods[]; + extern int wxObject_methodCount; + extern wxLuaBindMethod wxObjectRefData_methods[]; + extern int wxObjectRefData_methodCount; + #endif // wxLUA_USE_wxObject + + #if wxLUA_USE_wxRegEx && wxUSE_REGEX + extern wxLuaBindMethod wxRegEx_methods[]; + extern int wxRegEx_methodCount; + #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX + + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + extern wxLuaBindMethod wxStopWatch_methods[]; + extern int wxStopWatch_methodCount; + #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + + #if wxLUA_USE_wxSystemOptions + extern wxLuaBindMethod wxSystemOptions_methods[]; + extern int wxSystemOptions_methodCount; + #endif // wxLUA_USE_wxSystemOptions + + #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME + extern wxLuaBindMethod wxTimeSpan_methods[]; + extern int wxTimeSpan_methodCount; + #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME + + #if wxUSE_INTL + extern wxLuaBindMethod wxLanguageInfo_methods[]; + extern int wxLanguageInfo_methodCount; + extern wxLuaBindMethod wxLocale_methods[]; + extern int wxLocale_methodCount; + #endif // wxUSE_INTL + + #if wxUSE_LONGLONG + extern wxLuaBindMethod wxLongLong_methods[]; + extern int wxLongLong_methodCount; + extern wxLuaBindMethod wxULongLong_methods[]; + extern int wxULongLong_methodCount; + #endif // wxUSE_LONGLONG + + #if wxUSE_SNGLINST_CHECKER + extern wxLuaBindMethod wxSingleInstanceChecker_methods[]; + extern int wxSingleInstanceChecker_methodCount; + #endif // wxUSE_SNGLINST_CHECKER + + #if wxUSE_STREAMS + extern wxLuaBindMethod wxDataInputStream_methods[]; + extern int wxDataInputStream_methodCount; + extern wxLuaBindMethod wxDataOutputStream_methods[]; + extern int wxDataOutputStream_methodCount; + extern wxLuaBindMethod wxFileInputStream_methods[]; + extern int wxFileInputStream_methodCount; + extern wxLuaBindMethod wxFileOutputStream_methods[]; + extern int wxFileOutputStream_methodCount; + extern wxLuaBindMethod wxInputStream_methods[]; + extern int wxInputStream_methodCount; + extern wxLuaBindMethod wxMemoryInputStream_methods[]; + extern int wxMemoryInputStream_methodCount; + extern wxLuaBindMethod wxOutputStream_methods[]; + extern int wxOutputStream_methodCount; + extern wxLuaBindMethod wxStreamBase_methods[]; + extern int wxStreamBase_methodCount; + #endif // wxUSE_STREAMS + + Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxnet_bind.cpp 14 May 2009 05:06:21 -0000 1.14 --- wxnet_bind.cpp 19 May 2009 03:20:53 -0000 1.15 *************** *** 2931,2934 **** --- 2931,2980 ---- static const char* wxluabaseclassnames_wxURL[] = { wxluaclassname_wxURI, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxURL[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) + extern wxLuaBindMethod wxProtocol_methods[]; + extern int wxProtocol_methodCount; + #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) + + #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) + extern wxLuaBindMethod wxFTP_methods[]; + extern int wxFTP_methodCount; + extern WXDLLIMPEXP_BINDWXNET wxLuaBindNumber wxFTP_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_enumCount; + #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) + + #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) + extern wxLuaBindMethod wxHTTP_methods[]; + extern int wxHTTP_methodCount; + #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) + + #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) + extern wxLuaBindMethod wxURL_methods[]; + extern int wxURL_methodCount; + #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) + + #if wxLUA_USE_wxSocket && wxUSE_SOCKETS + extern wxLuaBindMethod wxIPV4address_methods[]; + extern int wxIPV4address_methodCount; + extern wxLuaBindMethod wxIPaddress_methods[]; + extern int wxIPaddress_methodCount; + extern wxLuaBindMethod wxSockAddress_methods[]; + extern int wxSockAddress_methodCount; + extern wxLuaBindMethod wxSocketBase_methods[]; + extern int wxSocketBase_methodCount; + extern wxLuaBindMethod wxSocketClient_methods[]; + extern int wxSocketClient_methodCount; + extern wxLuaBindMethod wxSocketEvent_methods[]; + extern int wxSocketEvent_methodCount; + extern wxLuaBindMethod wxSocketServer_methods[]; + extern int wxSocketServer_methodCount; + extern wxLuaBindMethod wxURI_methods[]; + extern int wxURI_methodCount; + #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS + + Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxstc_bind.cpp 14 May 2009 05:06:21 -0000 1.14 --- wxstc_bind.cpp 19 May 2009 03:20:53 -0000 1.15 *************** *** 10239,10242 **** --- 10239,10252 ---- static const char* wxluabaseclassnames_wxStyledTextEvent[] = { wxluaclassname_wxCommandEvent, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxStyledTextEvent[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + extern wxLuaBindMethod wxStyledTextCtrl_methods[]; + extern int wxStyledTextCtrl_methodCount; + extern wxLuaBindMethod wxStyledTextEvent_methods[]; + extern int wxStyledTextEvent_methodCount; + + Index: wxgl_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxgl_bind.cpp 14 May 2009 05:06:21 -0000 1.11 --- wxgl_bind.cpp 19 May 2009 03:20:53 -0000 1.12 *************** *** 707,710 **** --- 707,722 ---- static const char* wxluabaseclassnames_wxGLContext[] = { wxluaclassname_wxObject, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxGLContext[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS + extern wxLuaBindMethod wxGLCanvas_methods[]; + extern int wxGLCanvas_methodCount; + extern wxLuaBindMethod wxGLContext_methods[]; + extern int wxGLContext_methodCount; + #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS + + Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxxrc_bind.cpp 14 May 2009 05:06:21 -0000 1.11 --- wxxrc_bind.cpp 19 May 2009 03:20:53 -0000 1.12 *************** *** 772,775 **** --- 772,785 ---- static const char* wxluabaseclassnames_wxXmlResource[] = { wxluaclassname_wxObject, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxXmlResource[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if wxLUA_USE_wxXRC && wxUSE_XRC + extern wxLuaBindMethod wxXmlResource_methods[]; + extern int wxXmlResource_methodCount; + #endif // wxLUA_USE_wxXRC && wxUSE_XRC + + Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxmedia_bind.cpp 14 May 2009 05:06:21 -0000 1.12 --- wxmedia_bind.cpp 19 May 2009 03:20:53 -0000 1.13 *************** *** 738,741 **** --- 738,753 ---- static const char* wxluabaseclassnames_wxMediaEvent[] = { wxluaclassname_wxNotifyEvent, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxMediaEvent[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL + extern wxLuaBindMethod wxMediaCtrl_methods[]; + extern int wxMediaCtrl_methodCount; + extern wxLuaBindMethod wxMediaEvent_methods[]; + extern int wxMediaEvent_methodCount; + #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL + + Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxcore_bind.cpp 14 May 2009 05:06:21 -0000 1.22 --- wxcore_bind.cpp 19 May 2009 03:20:53 -0000 1.23 *************** *** 2610,2614 **** #if wxLUA_USE_wxImage && wxUSE_IMAGE ! { "wxIMAGE_OPTION_BMP_FORMAT", wxIMAGE_OPTION_BMP_FORMAT }, #endif // wxLUA_USE_wxImage && wxUSE_IMAGE --- 2610,2614 ---- #if wxLUA_USE_wxImage && wxUSE_IMAGE ! { "wxIMAGE_OPTION_BMP_FORMAT", _T("wxBMP_FORMAT") }, #endif // wxLUA_USE_wxImage && wxUSE_IMAGE [...991 lines suppressed...] + #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + extern wxLuaBindMethod wxProgressDialog_methods[]; + extern int wxProgressDialog_methodCount; + #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + + #if wxUSE_STREAMS && wxUSE_FILESYSTEM + extern wxLuaBindMethod wxMemoryFSHandler_methods[]; + extern int wxMemoryFSHandler_methodCount; + #endif // wxUSE_STREAMS && wxUSE_FILESYSTEM + + #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog + extern wxLuaBindMethod wxPasswordEntryDialog_methods[]; + extern int wxPasswordEntryDialog_methodCount; + extern wxLuaBindMethod wxTextEntryDialog_methods[]; + extern int wxTextEntryDialog_methodCount; + #endif // wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog + + Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxadv_bind.cpp 14 May 2009 05:06:21 -0000 1.19 --- wxadv_bind.cpp 19 May 2009 03:20:53 -0000 1.20 *************** *** 15700,15703 **** --- 15700,15867 ---- static const char* wxluabaseclassnames_wxWizardPageSimple[] = { wxluaclassname_wxWizardPage, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxWizardPageSimple[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) + extern wxLuaBindMethod wxWave_methods[]; + extern int wxWave_methodCount; + #endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) + + #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) + extern wxLuaBindMethod wxSound_methods[]; + extern int wxSound_methodCount; + #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL + extern wxLuaBindMethod wxAnimation_methods[]; + extern int wxAnimation_methodCount; + extern wxLuaBindMethod wxAnimationCtrl_methods[]; + extern int wxAnimationCtrl_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL + + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + extern wxLuaBindMethod wxAboutDialogInfo_methods[]; + extern int wxAboutDialogInfo_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + extern wxLuaBindMethod wxHyperlinkCtrl_methods[]; + extern int wxHyperlinkCtrl_methodCount; + extern wxLuaBindMethod wxHyperlinkEvent_methods[]; + extern int wxHyperlinkEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + + #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + extern wxLuaBindMethod wxBitmapComboBox_methods[]; + extern int wxBitmapComboBox_methodCount; + #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX + + #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL + extern wxLuaBindMethod wxCalendarCtrl_methods[]; + extern int wxCalendarCtrl_methodCount; + extern wxLuaBindMethod wxCalendarDateAttr_methods[]; + extern int wxCalendarDateAttr_methodCount; + extern wxLuaBindMethod wxCalendarEvent_methods[]; + extern int wxCalendarEvent_methodCount; + extern wxLuaBindMethod wxDateEvent_methods[]; + extern int wxDateEvent_methodCount; + #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL + + #if wxLUA_USE_wxGrid && wxUSE_GRID + extern wxLuaBindMethod wxGrid_methods[]; + extern int wxGrid_methodCount; + extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; + extern wxLuaBindMethod wxGridCellAttr_methods[]; + extern int wxGridCellAttr_methodCount; + extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; + extern wxLuaBindMethod wxGridCellAttrProvider_methods[]; + extern int wxGridCellAttrProvider_methodCount; + extern wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; + extern int wxGridCellAutoWrapStringEditor_methodCount; + extern wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; + extern int wxGridCellAutoWrapStringRenderer_methodCount; + extern wxLuaBindMethod wxGridCellBoolEditor_methods[]; + extern int wxGridCellBoolEditor_methodCount; + extern wxLuaBindMethod wxGridCellBoolRenderer_methods[]; + extern int wxGridCellBoolRenderer_methodCount; + extern wxLuaBindMethod wxGridCellChoiceEditor_methods[]; + extern int wxGridCellChoiceEditor_methodCount; + extern wxLuaBindMethod wxGridCellCoords_methods[]; + extern int wxGridCellCoords_methodCount; + extern wxLuaBindMethod wxGridCellCoordsArray_methods[]; + extern int wxGridCellCoordsArray_methodCount; + extern wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; + extern int wxGridCellDateTimeRenderer_methodCount; + extern wxLuaBindMethod wxGridCellEditor_methods[]; + extern int wxGridCellEditor_methodCount; + extern wxLuaBindMethod wxGridCellEnumEditor_methods[]; + extern int wxGridCellEnumEditor_methodCount; + extern wxLuaBindMethod wxGridCellEnumRenderer_methods[]; + extern int wxGridCellEnumRenderer_methodCount; + extern wxLuaBindMethod wxGridCellFloatEditor_methods[]; + extern int wxGridCellFloatEditor_methodCount; + extern wxLuaBindMethod wxGridCellFloatRenderer_methods[]; + extern int wxGridCellFloatRenderer_methodCount; + extern wxLuaBindMethod wxGridCellNumberEditor_methods[]; + extern int wxGridCellNumberEditor_methodCount; + extern wxLuaBindMethod wxGridCellNumberRenderer_methods[]; + extern int wxGridCellNumberRenderer_methodCount; + extern wxLuaBindMethod wxGridCellRenderer_methods[]; + extern int wxGridCellRenderer_methodCount; + extern wxLuaBindMethod wxGridCellStringRenderer_methods[]; + extern int wxGridCellStringRenderer_methodCount; + extern wxLuaBindMethod wxGridCellTextEditor_methods[]; + extern int wxGridCellTextEditor_methodCount; + extern wxLuaBindMethod wxGridCellWorker_methods[]; + extern int wxGridCellWorker_methodCount; + extern wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; + extern int wxGridEditorCreatedEvent_methodCount; + extern wxLuaBindMethod wxGridEvent_methods[]; + extern int wxGridEvent_methodCount; + extern wxLuaBindMethod wxGridRangeSelectEvent_methods[]; + extern int wxGridRangeSelectEvent_methodCount; + extern wxLuaBindMethod wxGridSizeEvent_methods[]; + extern int wxGridSizeEvent_methodCount; + extern wxLuaBindMethod wxGridStringTable_methods[]; + extern int wxGridStringTable_methodCount; + extern wxLuaBindMethod wxGridTableBase_methods[]; + extern int wxGridTableBase_methodCount; + extern wxLuaBindMethod wxGridTableMessage_methods[]; + extern int wxGridTableMessage_methodCount; + extern wxLuaBindMethod wxLuaGridTableBase_methods[]; + extern int wxLuaGridTableBase_methodCount; + #endif // wxLUA_USE_wxGrid && wxUSE_GRID + + #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK + extern wxLuaBindMethod wxJoystick_methods[]; + extern int wxJoystick_methodCount; + extern wxLuaBindMethod wxJoystickEvent_methods[]; + extern int wxJoystickEvent_methodCount; + #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK + + #if wxLUA_USE_wxSashWindow && wxUSE_SASH + extern wxLuaBindMethod wxCalculateLayoutEvent_methods[]; + extern int wxCalculateLayoutEvent_methodCount; + extern wxLuaBindMethod wxLayoutAlgorithm_methods[]; + extern int wxLayoutAlgorithm_methodCount; + extern wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; + extern int wxQueryLayoutInfoEvent_methodCount; + extern wxLuaBindMethod wxSashEvent_methods[]; + extern int wxSashEvent_methodCount; + extern wxLuaBindMethod wxSashLayoutWindow_methods[]; + extern int wxSashLayoutWindow_methodCount; + extern wxLuaBindMethod wxSashWindow_methods[]; + extern int wxSashWindow_methodCount; + #endif // wxLUA_USE_wxSashWindow && wxUSE_SASH + + #if wxLUA_USE_wxSplashScreen + extern wxLuaBindMethod wxSplashScreen_methods[]; + extern int wxSplashScreen_methodCount; + extern wxLuaBindMethod wxSplashScreenWindow_methods[]; + extern int wxSplashScreenWindow_methodCount; + #endif // wxLUA_USE_wxSplashScreen + + #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) + extern wxLuaBindMethod wxTaskBarIcon_methods[]; + extern int wxTaskBarIcon_methodCount; + extern wxLuaBindMethod wxTaskBarIconEvent_methods[]; + extern int wxTaskBarIconEvent_methodCount; + #endif // wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) + + #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + extern wxLuaBindMethod wxWizard_methods[]; + extern int wxWizard_methodCount; + extern wxLuaBindMethod wxWizardEvent_methods[]; + extern int wxWizardEvent_methodCount; + extern wxLuaBindMethod wxWizardPage_methods[]; + extern int wxWizardPage_methodCount; + extern wxLuaBindMethod wxWizardPageSimple_methods[]; + extern int wxWizardPageSimple_methodCount; + #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard + + Index: wxrichtext_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxrichtext_bind.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxrichtext_bind.cpp 14 May 2009 05:06:21 -0000 1.10 --- wxrichtext_bind.cpp 19 May 2009 03:20:53 -0000 1.11 *************** *** 125,128 **** --- 125,133 ---- + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxhtml_bind.cpp 14 May 2009 05:06:21 -0000 1.13 --- wxhtml_bind.cpp 19 May 2009 03:20:53 -0000 1.14 *************** *** 4912,4915 **** --- 4912,4974 ---- static const char* wxluabaseclassnames_wxSimpleHtmlListBox[] = { wxluaclassname_wxHtmlWindowInterface, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxSimpleHtmlListBox[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) + extern wxLuaBindMethod wxHtmlCellEvent_methods[]; + extern int wxHtmlCellEvent_methodCount; + extern wxLuaBindMethod wxHtmlColourCell_methods[]; + extern int wxHtmlColourCell_methodCount; + extern wxLuaBindMethod wxHtmlFontCell_methods[]; + extern int wxHtmlFontCell_methodCount; + extern wxLuaBindMethod wxHtmlWindowInterface_methods[]; + extern int wxHtmlWindowInterface_methodCount; + extern WXDLLIMPEXP_BINDWXHTML wxLuaBindNumber wxHtmlWindowInterface_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlWindowInterface_enumCount; + extern wxLuaBindMethod wxSimpleHtmlListBox_methods[]; + extern int wxSimpleHtmlListBox_methodCount; + #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) + + #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) + extern wxLuaBindMethod wxHtmlHelpController_methods[]; + extern int wxHtmlHelpController_methodCount; + extern wxLuaBindMethod wxHtmlHelpData_methods[]; + extern int wxHtmlHelpData_methodCount; + #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) + + #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) + extern wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[]; + extern int wxLuaHtmlWinTagEvent_methodCount; + extern wxLuaBindMethod wxLuaHtmlWindow_methods[]; + extern int wxLuaHtmlWindow_methodCount; + #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) + + #if wxLUA_USE_wxHTML && wxUSE_HTML + extern wxLuaBindMethod wxHtmlCell_methods[]; + extern int wxHtmlCell_methodCount; + extern wxLuaBindMethod wxHtmlContainerCell_methods[]; + extern int wxHtmlContainerCell_methodCount; + extern wxLuaBindMethod wxHtmlDCRenderer_methods[]; + extern int wxHtmlDCRenderer_methodCount; + extern wxLuaBindMethod wxHtmlEasyPrinting_methods[]; + extern int wxHtmlEasyPrinting_methodCount; + extern wxLuaBindMethod wxHtmlLinkInfo_methods[]; + extern int wxHtmlLinkInfo_methodCount; + extern wxLuaBindMethod wxHtmlParser_methods[]; + extern int wxHtmlParser_methodCount; + extern wxLuaBindMethod wxHtmlPrintout_methods[]; + extern int wxHtmlPrintout_methodCount; + extern wxLuaBindMethod wxHtmlTag_methods[]; + extern int wxHtmlTag_methodCount; + extern wxLuaBindMethod wxHtmlWidgetCell_methods[]; + extern int wxHtmlWidgetCell_methodCount; + extern wxLuaBindMethod wxHtmlWinParser_methods[]; + extern int wxHtmlWinParser_methodCount; + extern wxLuaBindMethod wxHtmlWindow_methods[]; + extern int wxHtmlWindow_methodCount; + #endif // wxLUA_USE_wxHTML && wxUSE_HTML + + Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxaui_bind.cpp 14 May 2009 05:06:21 -0000 1.16 --- wxaui_bind.cpp 19 May 2009 03:20:53 -0000 1.17 *************** *** 9003,9006 **** --- 9003,9062 ---- static const char* wxluabaseclassnames_wxAuiTabCtrl[] = { wxluaclassname_wxControl, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxAuiTabCtrl[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + extern wxLuaBindMethod wxAuiDefaultDockArt_methods[]; + extern int wxAuiDefaultDockArt_methodCount; + extern wxLuaBindMethod wxAuiDefaultTabArt_methods[]; + extern int wxAuiDefaultTabArt_methodCount; + extern wxLuaBindMethod wxAuiDockArt_methods[]; + extern int wxAuiDockArt_methodCount; + extern wxLuaBindMethod wxAuiDockInfo_methods[]; + extern int wxAuiDockInfo_methodCount; + extern wxLuaBindMethod wxAuiDockUIPart_methods[]; + extern int wxAuiDockUIPart_methodCount; + extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiDockUIPart_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockUIPart_enumCount; + extern wxLuaBindMethod wxAuiFloatingFrame_methods[]; + extern int wxAuiFloatingFrame_methodCount; + extern wxLuaBindMethod wxAuiMDIChildFrame_methods[]; + extern int wxAuiMDIChildFrame_methodCount; + extern wxLuaBindMethod wxAuiMDIClientWindow_methods[]; + extern int wxAuiMDIClientWindow_methodCount; + extern wxLuaBindMethod wxAuiMDIParentFrame_methods[]; + extern int wxAuiMDIParentFrame_methodCount; + extern wxLuaBindMethod wxAuiManager_methods[]; + extern int wxAuiManager_methodCount; + extern wxLuaBindMethod wxAuiManagerEvent_methods[]; + extern int wxAuiManagerEvent_methodCount; + extern wxLuaBindMethod wxAuiNotebook_methods[]; + extern int wxAuiNotebook_methodCount; + extern wxLuaBindMethod wxAuiNotebookEvent_methods[]; + extern int wxAuiNotebookEvent_methodCount; + extern wxLuaBindMethod wxAuiNotebookPage_methods[]; + extern int wxAuiNotebookPage_methodCount; + extern wxLuaBindMethod wxAuiNotebookPageArray_methods[]; + extern int wxAuiNotebookPageArray_methodCount; + extern wxLuaBindMethod wxAuiPaneButton_methods[]; + extern int wxAuiPaneButton_methodCount; + extern wxLuaBindMethod wxAuiPaneInfo_methods[]; + extern int wxAuiPaneInfo_methodCount; + extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiPaneInfo_enums[]; + extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneInfo_enumCount; + extern wxLuaBindMethod wxAuiPaneInfoArray_methods[]; + extern int wxAuiPaneInfoArray_methodCount; + extern wxLuaBindMethod wxAuiSimpleTabArt_methods[]; + extern int wxAuiSimpleTabArt_methodCount; + extern wxLuaBindMethod wxAuiTabArt_methods[]; + extern int wxAuiTabArt_methodCount; + extern wxLuaBindMethod wxAuiTabContainerButton_methods[]; + extern int wxAuiTabContainerButton_methodCount; + extern wxLuaBindMethod wxAuiTabCtrl_methods[]; + extern int wxAuiTabCtrl_methodCount; + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + + Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxxml_bind.cpp 14 May 2009 05:06:21 -0000 1.12 --- wxxml_bind.cpp 19 May 2009 03:20:53 -0000 1.13 *************** *** 1117,1120 **** --- 1117,1134 ---- static const char* wxluabaseclassnames_wxXmlDocument[] = { wxluaclassname_wxObject, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxXmlDocument[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + #if wxLUA_USE_wxXML && wxUSE_XML + extern wxLuaBindMethod wxXmlDocument_methods[]; + extern int wxXmlDocument_methodCount; + extern wxLuaBindMethod wxXmlNode_methods[]; + extern int wxXmlNode_methodCount; + extern wxLuaBindMethod wxXmlProperty_methods[]; + extern int wxXmlProperty_methodCount; + #endif // wxLUA_USE_wxXML && wxUSE_XML + + Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxbase_data.cpp 31 Mar 2009 04:23:42 -0000 1.19 --- wxbase_data.cpp 19 May 2009 03:20:53 -0000 1.20 *************** *** 532,535 **** --- 532,536 ---- // function be be called. wxObject *pObject = (wxObject *)wxlua_touserdata(L, 1, false); + //wxObject *pObject = (wxObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxObject); const wxLuaBindClass *wxlClass = wxluaT_getclass(L, className); |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:02
|
Update of /cvsroot/wxlua/wxLua/bindings In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/bindings Modified Files: genwxbind.lua Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.179 retrieving revision 1.180 diff -C2 -d -r1.179 -r1.180 *** genwxbind.lua 14 May 2009 05:06:21 -0000 1.179 --- genwxbind.lua 19 May 2009 03:20:53 -0000 1.180 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 26 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 27 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 4025,4038 **** -- Figure out if we really need to have member enums for the class ! local enumArrayName = MakeVar(parseObject.Name).."_enums" ! local enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! local ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! local ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" ! if enumClassBindingTable[MakeVar(parseObject.Name)] == nil then ! enumArrayName = "g_wxluanumberArray_None" ! enumArrayCountName = 0 ! ExternEnumDeclaration = "" ! ExternEnumCountDeclaration = "" end --- 4025,4038 ---- -- Figure out if we really need to have member enums for the class ! local enumArrayName = "g_wxluanumberArray_None" ! local enumArrayCountName = 0 ! local ExternEnumDeclaration = "" ! local ExternEnumCountDeclaration = "" ! if enumClassBindingTable[MakeVar(parseObject.Name)] ~= nil then ! enumArrayName = MakeVar(parseObject.Name).."_enums" ! enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" end *************** *** 4043,4048 **** { ExternDeclaration = "extern "..MakeImpExpData("int").." wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ExternEnumDeclaration = ExternEnumDeclaration, ExternEnumCountDeclaration = ExternEnumCountDeclaration, --- 4043,4050 ---- { ExternDeclaration = "extern "..MakeImpExpData("int").." wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ! --ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! --ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternMethodDeclaration = "extern wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! ExternMethodCountDeclaration = "extern int "..MakeVar(parseObject.Name).."_methodCount;\n", ExternEnumDeclaration = ExternEnumDeclaration, ExternEnumCountDeclaration = ExternEnumCountDeclaration, *************** *** 4316,4333 **** end - --[[ - table.insert(fileData, "\n") - - table.insert(fileData, "// ---------------------------------------------------------------------------\n") - table.insert(fileData, "// Functions to access wxLuaBindXXX structs\n") - table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") - - table.insert(fileData, "extern wxLuaBindClass *"..hook_cpp_class_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindNumber *"..hook_cpp_define_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindString *"..hook_cpp_string_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindEvent *"..hook_cpp_event_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindObject *"..hook_cpp_object_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindMethod *"..hook_cpp_function_funcname.."(size_t &count);\n\n") - ]] -- ------------------------------------------------------------------------ -- Class Tag Declaration - sorted by condition for the C++ compiler --- 4318,4321 ---- *************** *** 4348,4357 **** for idx, classTypeBinding in pairs_sort(classTypeBindingList) do table.insert(fileData, indent..classTypeBinding.ExternDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) ! if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then ! table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) ! end end --- 4336,4345 ---- for idx, classTypeBinding in pairs_sort(classTypeBindingList) do table.insert(fileData, indent..classTypeBinding.ExternDeclaration) ! --table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) ! --table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) ! --if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then ! -- table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) ! -- table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) ! --end end *************** *** 4489,4492 **** --- 4477,4517 ---- end + + -- ------------------------------------------------------------------------ + -- Class Tag Declaration - sorted by condition for the C++ compiler + -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ---------------------------------------------------------------------------\n") + table.insert(fileData, "// Lua Tag Method Values and Tables for each Class\n") + table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") + + for condition, classTypeBindingList in pairs_sort(classTypeBindingTable) do + local indent = "" + + if HasCondition(condition) then + indent = " " + table.insert(fileData, "#if "..condition.."\n") + end + + for idx, classTypeBinding in pairs_sort(classTypeBindingList) do + --table.insert(fileData, indent..classTypeBinding.ExternDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) + if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then + table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) + end + end + + if HasCondition(condition) then + table.insert(fileData, "#endif // "..condition.."\n\n") + else + table.insert(fileData, "\n") + end + end + + table.insert(fileData, "\n") + + table.insert(fileData, "\n\n") |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua_bind.cpp Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.180 retrieving revision 1.181 diff -C2 -d -r1.180 -r1.181 *** wxlstate.cpp 14 May 2009 05:06:21 -0000 1.180 --- wxlstate.cpp 19 May 2009 03:20:53 -0000 1.181 *************** *** 1150,1153 **** --- 1150,1157 ---- if (pCallback == NULL) wxlua_error(L, "wxLua: Out of memory creating wxLuaWinDestroyCallback."); + // assert should have been given in constructor so delete it + // since it's not attached as a callback user data + if (!pCallback->Ok()) + delete pCallback; } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** wxlbind.cpp 14 May 2009 05:06:21 -0000 1.122 --- wxlbind.cpp 19 May 2009 03:20:53 -0000 1.123 *************** *** 1074,1078 **** // Add us to the LUA_REGISTRYINDEX table of bindings lua_pushlightuserdata(L, &wxlua_lreg_wxluabindings_key); // push key ! lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push value (the bindings table) lua_pushlightuserdata(L, this); // push key --- 1074,1078 ---- // Add us to the LUA_REGISTRYINDEX table of bindings lua_pushlightuserdata(L, &wxlua_lreg_wxluabindings_key); // push key ! lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push value (the bindings table) lua_pushlightuserdata(L, this); // push key *************** *** 1096,1100 **** // install the classes, functions and methods, creating new wxLua types // if this is the first time we're registering them ! wxLuaBindClass *wxlClass = m_classArray; for (n = 0; n < m_classCount; ++n, ++wxlClass) { --- 1096,1100 ---- // install the classes, functions and methods, creating new wxLua types // if this is the first time we're registering them ! const wxLuaBindClass *wxlClass = m_classArray; for (n = 0; n < m_classCount; ++n, ++wxlClass) { *************** *** 1104,1112 **** // register the global C style functions ! wxLuaBindMethod* wxlMethod = m_functionArray; for (n = 0; n < m_functionCount; ++n, ++wxlMethod) { lua_pushstring(L, wxlMethod->name); ! lua_pushlightuserdata(L, wxlMethod); lua_pushcclosure(L, wxlMethod->wxluacfuncs[0].lua_cfunc, 1); lua_rawset(L, -3); --- 1104,1112 ---- // register the global C style functions ! const wxLuaBindMethod* wxlMethod = m_functionArray; for (n = 0; n < m_functionCount; ++n, ++wxlMethod) { lua_pushstring(L, wxlMethod->name); ! lua_pushlightuserdata(L, (void*)wxlMethod); lua_pushcclosure(L, wxlMethod->wxluacfuncs[0].lua_cfunc, 1); lua_rawset(L, -3); Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wxlcallb.cpp 23 Jan 2008 06:43:39 -0000 1.58 --- wxlcallb.cpp 19 May 2009 03:20:53 -0000 1.59 *************** *** 76,80 **** // Note: We use the callback userdata and not the event sink since the event sink // requires a wxEvtHandler object which is a fairly large class. ! // The userdata is also deleted for us which makes m_evtHandler->Connect(win_id, last_id, eventType, (wxObjectEventFunction)&wxLuaEventCallback::OnAllEvents, --- 76,80 ---- // Note: We use the callback userdata and not the event sink since the event sink // requires a wxEvtHandler object which is a fairly large class. ! // The userdata (i.e. this) is also deleted for us which makes our life easier. m_evtHandler->Connect(win_id, last_id, eventType, (wxObjectEventFunction)&wxLuaEventCallback::OnAllEvents, *************** *** 123,127 **** { // Cannot call it if Lua is gone or the interpreter has been destroyed ! // This can happen when the program exists since windows may be destroyed // after Lua has been deleted. if (!m_wxlState.Ok()) --- 123,127 ---- { // Cannot call it if Lua is gone or the interpreter has been destroyed ! // This can happen when the program exits since windows may be destroyed // after Lua has been deleted. if (!m_wxlState.Ok()) *************** *** 148,158 **** event_wxl_type = *wxlClass->wxluatype; else ! event_wxl_type = *p_wxluatype_wxEvent; // get the wxluatype_wxEvent } } else ! event_wxl_type = *p_wxluatype_wxEvent; // get the wxluatype_wxEvent ! // Should never get here, but error out in case we do wxCHECK_RET(event_wxl_type != WXLUA_TUNKNOWN, wxT("Unknown wxEvent wxLua tag for : ") + wxString(event->GetClassInfo()->GetClassName())); --- 148,158 ---- event_wxl_type = *wxlClass->wxluatype; else ! event_wxl_type = *p_wxluatype_wxEvent; // get the generic wxluatype_wxEvent } } else ! event_wxl_type = *p_wxluatype_wxEvent; // get the generic wxluatype_wxEvent ! // Should know our event type, but error out in case we don't wxCHECK_RET(event_wxl_type != WXLUA_TUNKNOWN, wxT("Unknown wxEvent wxLua tag for : ") + wxString(event->GetClassInfo()->GetClassName())); *************** *** 193,197 **** m_wxlState.AddTrackedWinDestroyCallback(this); ! // connect the event handler m_window->Connect(m_window->GetId(), wxEVT_DESTROY, (wxObjectEventFunction)&wxLuaWinDestroyCallback::OnAllDestroyEvents, --- 193,197 ---- m_wxlState.AddTrackedWinDestroyCallback(this); ! // connect the event handler and set this as the callback user data m_window->Connect(m_window->GetId(), wxEVT_DESTROY, (wxObjectEventFunction)&wxLuaWinDestroyCallback::OnAllDestroyEvents, *************** *** 242,251 **** // FIXME - Is it an error to receive an event after you've deleted Lua? // probably not if Lua is getting shutdown // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor if (m_wxlState.Ok()) { // clear the metatable for all userdata we're tracking. ! wxluaO_untrackweakobject(m_wxlState.GetLuaState(), NULL, m_window); ! wxlua_removederivedmethods(m_wxlState.GetLuaState(), m_window); // Clear our own pointer to this window --- 242,254 ---- // FIXME - Is it an error to receive an event after you've deleted Lua? // probably not if Lua is getting shutdown + // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor if (m_wxlState.Ok()) { + lua_State* L = m_wxlState.GetLuaState(); + // clear the metatable for all userdata we're tracking. ! wxluaO_untrackweakobject(L, NULL, m_window); ! wxlua_removederivedmethods(L, m_window); // Clear our own pointer to this window *************** *** 260,265 **** // but we're right in the middle of being destroyed and we crash. - lua_State* L = m_wxlState.GetLuaState(); - lua_pushlightuserdata(L, &wxlua_lreg_evtcallbacks_key); // push key lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push value (table) --- 263,266 ---- Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxlua_bind.cpp 14 May 2009 05:06:21 -0000 1.31 --- wxlua_bind.cpp 19 May 2009 03:20:53 -0000 1.32 *************** *** 1209,1212 **** --- 1209,1222 ---- static const char* wxluabaseclassnames_wxLuaState[] = { wxluaclassname_wxObject, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxLuaState[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + extern wxLuaBindMethod wxLuaObject_methods[]; + extern int wxLuaObject_methodCount; + extern wxLuaBindMethod wxLuaState_methods[]; + extern int wxLuaState_methodCount; + + |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_bind.cpp Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxluasocket_bind.cpp 14 May 2009 05:06:21 -0000 1.33 --- wxluasocket_bind.cpp 19 May 2009 03:20:53 -0000 1.34 *************** *** 615,618 **** --- 615,628 ---- static const char* wxluabaseclassnames_wxLuaDebuggerServer[] = { wxluaclassname_wxEvtHandler, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxLuaDebuggerServer[] = { NULL }; + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- + + extern wxLuaBindMethod wxLuaDebuggerEvent_methods[]; + extern int wxLuaDebuggerEvent_methodCount; + extern wxLuaBindMethod wxLuaDebuggerServer_methods[]; + extern int wxLuaDebuggerServer_methodCount; + + |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxadv_bind.h 31 Mar 2009 04:23:42 -0000 1.18 --- wxadv_bind.h 19 May 2009 03:20:53 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 109,325 **** #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWave; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWave_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWave_methodCount; #endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSound; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSound_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSound_methodCount; #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAnimation; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimation_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimation_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAnimationCtrl; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimationCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimationCtrl_methodCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAboutDialogInfo; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAboutDialogInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAboutDialogInfo_methodCount; #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxHyperlinkCtrl; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkCtrl_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxHyperlinkEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkEvent_methodCount; #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxBitmapComboBox; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxBitmapComboBox_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxBitmapComboBox_methodCount; #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarCtrl; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarCtrl_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarDateAttr; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarDateAttr_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarDateAttr_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalendarEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxDateEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxDateEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxDateEvent_methodCount; #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxGrid && wxUSE_GRID extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGrid; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGrid_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_methodCount; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAttr; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttr_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_methodCount; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAttrProvider; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttrProvider_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttrProvider_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAutoWrapStringEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellAutoWrapStringRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellBoolEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellBoolRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellChoiceEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellChoiceEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellChoiceEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellCoords; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoords_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoords_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellCoordsArray; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoordsArray_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoordsArray_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellDateTimeRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellDateTimeRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEnumEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellEnumRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellFloatEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellFloatRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellNumberEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellNumberRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellStringRenderer; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellStringRenderer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellStringRenderer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellTextEditor; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellTextEditor_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellTextEditor_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridCellWorker; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellWorker_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellWorker_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridEditorCreatedEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEditorCreatedEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridRangeSelectEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridRangeSelectEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridRangeSelectEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridSizeEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridSizeEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridSizeEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridStringTable; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridStringTable_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridStringTable_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridTableBase; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableBase_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableBase_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxGridTableMessage; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableMessage_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableMessage_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxLuaGridTableBase; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLuaGridTableBase_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLuaGridTableBase_methodCount; #endif // wxLUA_USE_wxGrid && wxUSE_GRID #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxJoystick; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystick_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystick_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxJoystickEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystickEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystickEvent_methodCount; #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxSashWindow && wxUSE_SASH extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxCalculateLayoutEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalculateLayoutEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalculateLayoutEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxLayoutAlgorithm; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLayoutAlgorithm_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLayoutAlgorithm_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxQueryLayoutInfoEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxQueryLayoutInfoEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashLayoutWindow; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashLayoutWindow_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashLayoutWindow_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSashWindow; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashWindow_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashWindow_methodCount; #endif // wxLUA_USE_wxSashWindow && wxUSE_SASH #if wxLUA_USE_wxSplashScreen extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSplashScreen; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreen_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreen_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSplashScreenWindow; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreenWindow_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreenWindow_methodCount; #endif // wxLUA_USE_wxSplashScreen #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxTaskBarIcon; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIcon_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIcon_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxTaskBarIconEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIconEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIconEvent_methodCount; #endif // wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizard; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizard_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizard_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardEvent; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardPage; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPage_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPage_methodCount; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWizardPageSimple; - extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPageSimple_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPageSimple_methodCount; #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard --- 109,205 ---- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxcore_bind.h 31 Mar 2009 04:23:42 -0000 1.19 --- wxcore_bind.h 19 May 2009 03:20:53 -0000 1.20 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' [...1283 lines suppressed...] - extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxProgressDialog_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxProgressDialog_methodCount; #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog #if wxUSE_STREAMS && wxUSE_FILESYSTEM extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxMemoryFSHandler; - extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxMemoryFSHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxMemoryFSHandler_methodCount; #endif // wxUSE_STREAMS && wxUSE_FILESYSTEM #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPasswordEntryDialog; - extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxPasswordEntryDialog_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxPasswordEntryDialog_methodCount; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxTextEntryDialog; - extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxTextEntryDialog_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxTextEntryDialog_methodCount; #endif // wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog --- 509,1199 ---- Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxrichtext_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxrichtext_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxxrc_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxxrc_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 54,59 **** #if wxLUA_USE_wxXRC && wxUSE_XRC extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxluatype_wxXmlResource; - extern WXDLLIMPEXP_BINDWXXRC wxLuaBindMethod wxXmlResource_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxXmlResource_methodCount; #endif // wxLUA_USE_wxXRC && wxUSE_XRC --- 54,57 ---- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxnet_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxnet_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 71,123 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxProtocol; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxProtocol_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxProtocol_methodCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxFTP; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxFTP_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_methodCount; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindNumber wxFTP_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_enumCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxHTTP; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxHTTP_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxHTTP_methodCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxURL; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURL_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURL_methodCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) #if wxLUA_USE_wxSocket && wxUSE_SOCKETS extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxIPV4address; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPV4address_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPV4address_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxIPaddress; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPaddress_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPaddress_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSockAddress; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSockAddress_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSockAddress_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketBase; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketBase_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketBase_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketClient; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketClient_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketClient_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketEvent; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxSocketServer; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketServer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketServer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxluatype_wxURI; - extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURI_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURI_methodCount; #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS --- 71,97 ---- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxbase_bind.h 31 Mar 2009 04:23:42 -0000 1.17 --- wxbase_bind.h 19 May 2009 03:20:53 -0000 1.18 *************** *** 19,25 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 19,25 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 165,458 **** #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArchiveFSHandler; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArchiveFSHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArchiveFSHandler_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFSFile; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFSFile_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFSFile_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystem; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileSystem_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileSystem_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystemHandler; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileSystemHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileSystemHandler_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFilterFSHandler; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFilterFSHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFilterFSHandler_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLocalFSHandler; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLocalFSHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLocalFSHandler_methodCount; #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxInternetFSHandler; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxInternetFSHandler_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxInternetFSHandler_methodCount; #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientData; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientData_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientDataContainer; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientDataContainer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientDataContainer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibrary; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibrary_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibrary_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetails; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetails_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetails_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetailsArray; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetailsArray_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType_MessageParameters; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_MessageParameters_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_MessageParameters_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileTypeInfo; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileTypeInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileTypeInfo_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxIconLocation; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxIconLocation_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxIconLocation_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxMimeTypesManager; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMimeTypesManager_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMimeTypesManager_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxPathList; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPathList_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPathList_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxPlatformInfo; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPlatformInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPlatformInfo_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxString; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxString_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxString_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringClientData; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringClientData_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringClientData_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringTokenizer; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringTokenizer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringTokenizer_methodCount; #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStandardPaths; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStandardPaths_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_methodCount; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxStandardPaths_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_enumCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #if wxLUA_USE_wxArrayInt extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArrayInt; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayInt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayInt_methodCount; #endif // wxLUA_USE_wxArrayInt #if wxLUA_USE_wxArrayString extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArrayString; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayString_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayString_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxSortedArrayString; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSortedArrayString_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSortedArrayString_methodCount; #endif // wxLUA_USE_wxArrayString #if wxLUA_USE_wxClassInfo extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClassInfo; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClassInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClassInfo_methodCount; #endif // wxLUA_USE_wxClassInfo #if wxLUA_USE_wxConfig && wxUSE_CONFIG extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfig; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfig_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfig_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfigBase; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigBase_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_methodCount; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxConfigPathChanger; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigPathChanger_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigPathChanger_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileConfig; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileConfig_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileConfig_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxMemoryConfig; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMemoryConfig_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMemoryConfig_methodCount; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxCriticalSection; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxCriticalSection_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxCriticalSection_methodCount; #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS #if wxLUA_USE_wxCriticalSectionLocker extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxCriticalSectionLocker; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxCriticalSectionLocker_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxCriticalSectionLocker_methodCount; #endif // wxLUA_USE_wxCriticalSectionLocker #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDateSpan; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDateSpan_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateSpan_methodCount; #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME #if wxLUA_USE_wxDateTime && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDateTime; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDateTime_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTime_methodCount; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxDateTime_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTime_enumCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDateTimeArray; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDateTimeArray_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTimeArray_methodCount; #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDateTimeHolidayAuthority; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDateTimeHolidayAuthority_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTimeHolidayAuthority_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDateTimeWorkDays; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDateTimeWorkDays_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDateTimeWorkDays_methodCount; #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDir extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDir; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDir_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDir_methodCount; #endif // wxLUA_USE_wxDir #if wxLUA_USE_wxFile && wxUSE_FILE extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFile; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFile_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFile_methodCount; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxFile_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFile_enumCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxTempFile; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxTempFile_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxTempFile_methodCount; #endif // wxLUA_USE_wxFile && wxUSE_FILE #if wxLUA_USE_wxFileName extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileName; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileName_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileName_methodCount; #endif // wxLUA_USE_wxFileName #if wxLUA_USE_wxList && !wxUSE_STL extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxList; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxList_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxList_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxNode; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxNode_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxNode_methodCount; #endif // wxLUA_USE_wxList && !wxUSE_STL #if wxLUA_USE_wxLog && wxUSE_LOG extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLog; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLog_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLog_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLogBuffer; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLogBuffer_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLogBuffer_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLogChain; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLogChain_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLogChain_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLogNull; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLogNull_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLogNull_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLogPassThrough; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLogPassThrough_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLogPassThrough_methodCount; #endif // wxLUA_USE_wxLog && wxUSE_LOG #if wxLUA_USE_wxObject extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxObject; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxObject_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxObject_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxObjectRefData; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxObjectRefData_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxObjectRefData_methodCount; #endif // wxLUA_USE_wxObject #if wxLUA_USE_wxRegEx && wxUSE_REGEX extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxRegEx; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxRegEx_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxRegEx_methodCount; #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStopWatch; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStopWatch_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStopWatch_methodCount; #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH #if wxLUA_USE_wxSystemOptions extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxSystemOptions; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSystemOptions_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSystemOptions_methodCount; #endif // wxLUA_USE_wxSystemOptions #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxTimeSpan; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxTimeSpan_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxTimeSpan_methodCount; #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME #if wxUSE_INTL extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLanguageInfo; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLanguageInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLanguageInfo_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLocale; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLocale_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLocale_methodCount; #endif // wxUSE_INTL #if wxUSE_LONGLONG extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLongLong; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLongLong_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLongLong_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxULongLong; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxULongLong_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxULongLong_methodCount; #endif // wxUSE_LONGLONG #if wxUSE_SNGLINST_CHECKER extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxSingleInstanceChecker; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSingleInstanceChecker_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSingleInstanceChecker_methodCount; #endif // wxUSE_SNGLINST_CHECKER #if wxUSE_STREAMS extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDataInputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDataInputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDataInputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDataOutputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDataOutputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDataOutputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileInputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileInputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileInputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileOutputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileOutputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileOutputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxInputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxInputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxInputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxMemoryInputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMemoryInputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMemoryInputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxOutputStream; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxOutputStream_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxOutputStream_methodCount; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStreamBase; - extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStreamBase_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStreamBase_methodCount; #endif // wxUSE_STREAMS --- 165,312 ---- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxmedia_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxmedia_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 55,63 **** #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL extern WXDLLIMPEXP_DATA_BINDWXMEDIA(int) wxluatype_wxMediaCtrl; - extern WXDLLIMPEXP_BINDWXMEDIA wxLuaBindMethod wxMediaCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXMEDIA(int) wxMediaCtrl_methodCount; extern WXDLLIMPEXP_DATA_BINDWXMEDIA(int) wxluatype_wxMediaEvent; - extern WXDLLIMPEXP_BINDWXMEDIA wxLuaBindMethod wxMediaEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXMEDIA(int) wxMediaEvent_methodCount; #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL --- 55,59 ---- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxgl_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxgl_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 54,62 **** #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS extern WXDLLIMPEXP_DATA_BINDWXGL(int) wxluatype_wxGLCanvas; - extern WXDLLIMPEXP_BINDWXGL wxLuaBindMethod wxGLCanvas_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXGL(int) wxGLCanvas_methodCount; extern WXDLLIMPEXP_DATA_BINDWXGL(int) wxluatype_wxGLContext; - extern WXDLLIMPEXP_BINDWXGL wxLuaBindMethod wxGLContext_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXGL(int) wxGLContext_methodCount; #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS --- 54,58 ---- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxstc_bind.h 31 Mar 2009 04:23:42 -0000 1.16 --- wxstc_bind.h 19 May 2009 03:20:53 -0000 1.17 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 51,59 **** extern WXDLLIMPEXP_DATA_BINDWXSTC(int) wxluatype_wxStyledTextCtrl; - extern WXDLLIMPEXP_BINDWXSTC wxLuaBindMethod wxStyledTextCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXSTC(int) wxStyledTextCtrl_methodCount; extern WXDLLIMPEXP_DATA_BINDWXSTC(int) wxluatype_wxStyledTextEvent; - extern WXDLLIMPEXP_BINDWXSTC wxLuaBindMethod wxStyledTextEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXSTC(int) wxStyledTextEvent_methodCount; --- 51,55 ---- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxaui_bind.h 31 Mar 2009 04:23:42 -0000 1.17 --- wxaui_bind.h 19 May 2009 03:20:53 -0000 1.18 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 54,126 **** #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultDockArt; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiDefaultDockArt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDefaultDockArt_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultTabArt; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiDefaultTabArt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDefaultTabArt_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockArt; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiDockArt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockArt_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockInfo; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiDockInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockInfo_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockUIPart; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiDockUIPart_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockUIPart_methodCount; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiDockUIPart_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiDockUIPart_enumCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiFloatingFrame; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiFloatingFrame_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiFloatingFrame_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIChildFrame; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiMDIChildFrame_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiMDIChildFrame_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIClientWindow; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiMDIClientWindow_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiMDIClientWindow_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIParentFrame; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiMDIParentFrame_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiMDIParentFrame_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManager; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiManager_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiManager_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManagerEvent; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiManagerEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiManagerEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebook; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiNotebook_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiNotebook_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookEvent; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiNotebookEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiNotebookEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPage; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiNotebookPage_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiNotebookPage_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPageArray; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiNotebookPageArray_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiNotebookPageArray_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneButton; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiPaneButton_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneButton_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfo; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiPaneInfo_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneInfo_methodCount; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindNumber wxAuiPaneInfo_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneInfo_enumCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfoArray; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiPaneInfoArray_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiPaneInfoArray_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiSimpleTabArt; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiSimpleTabArt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiSimpleTabArt_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabArt; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiTabArt_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiTabArt_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabContainerButton; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiTabContainerButton_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiTabContainerButton_methodCount; extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabCtrl; - extern WXDLLIMPEXP_BINDWXAUI wxLuaBindMethod wxAuiTabCtrl_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxAuiTabCtrl_methodCount; #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI --- 54,78 ---- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxhtml_bind.h 31 Mar 2009 04:23:42 -0000 1.17 --- wxhtml_bind.h 19 May 2009 03:20:53 -0000 1.18 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 72,145 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlCellEvent; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlCellEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlCellEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlColourCell; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlColourCell_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlColourCell_methodCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlFontCell; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlFontCell_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlFontCell_methodCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlWindowInterface; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlWindowInterface_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlWindowInterface_methodCount; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindNumber wxHtmlWindowInterface_enums[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlWindowInterface_enumCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxSimpleHtmlListBox; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxSimpleHtmlListBox_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxSimpleHtmlListBox_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlHelpController; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlHelpController_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlHelpController_methodCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlHelpData; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxHtmlHelpData_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxHtmlHelpData_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxLuaHtmlWinTagEvent; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxLuaHtmlWinTagEvent_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxLuaHtmlWinTagEvent_methodCount; extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxLuaHtmlWindow; - extern WXDLLIMPEXP_BINDWXHTML wxLuaBindMethod wxLuaHtmlWindow_methods[]; - extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxLuaHtmlWindow_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) #if wxLUA_USE_wxHTML && wxUSE_HTML extern WXDLLIMPEXP_DATA_BINDWXHTML(int) wxluatype_wxHtmlCell; - extern... [truncated message content] |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:01
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/bindings/wxwidgets Modified Files: wxbase_override.hpp wxcore_image.i Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxbase_override.hpp 24 Mar 2009 04:15:07 -0000 1.18 --- wxbase_override.hpp 19 May 2009 03:20:53 -0000 1.19 *************** *** 412,415 **** --- 412,416 ---- // function be be called. wxObject *pObject = (wxObject *)wxlua_touserdata(L, 1, false); + //wxObject *pObject = (wxObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxObject); const wxLuaBindClass *wxlClass = wxluaT_getclass(L, className); Index: wxcore_image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_image.i 22 Oct 2008 05:31:45 -0000 1.4 --- wxcore_image.i 19 May 2009 03:20:53 -0000 1.5 *************** *** 308,312 **** %endenum ! %define_string wxIMAGE_OPTION_BMP_FORMAT // wxString(_T("wxBMP_FORMAT")) %class %delete wxBMPHandler, wxImageHandler --- 308,312 ---- %endenum ! %define_string wxIMAGE_OPTION_BMP_FORMAT _T("wxBMP_FORMAT") // wxString(_T("wxBMP_FORMAT")) %class %delete wxBMPHandler, wxImageHandler |
|
From: John L. <jr...@us...> - 2009-05-19 03:21:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluasocket_bind.h 31 Mar 2009 04:23:42 -0000 1.38 --- wxluasocket_bind.h 19 May 2009 03:20:53 -0000 1.39 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 26 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 26 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 27 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 27 // --------------------------------------------------------------------------- *************** *** 55,63 **** extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxluatype_wxLuaDebuggerEvent; - extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxluatype_wxLuaDebuggerServer; - extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; - extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; --- 55,59 ---- |
|
From: John L. <jr...@us...> - 2009-05-14 05:06:49
|
Update of /cvsroot/wxlua/wxLua/docs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/docs Modified Files: changelog.txt Log Message: Allow multiple inheritance in the bindings. Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** changelog.txt 24 Mar 2009 04:15:07 -0000 1.68 --- changelog.txt 14 May 2009 05:06:21 -0000 1.69 *************** *** 20,23 **** --- 20,25 ---- - Fixed double -> unsigned integer using all 32 bits conversion. Fixes wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin. + - Allow multiple inheritance in the bindings. Changed members of + wxLuaBindClass to reflect that base class info are stored in arrays. version 2.8.7.0 (released 02/02/2008) |
|
From: John L. <jr...@us...> - 2009-05-14 05:06:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua Log Message: Allow multiple inheritance in the bindings. Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** wx_datatypes.lua 13 Dec 2008 22:35:52 -0000 1.99 --- wx_datatypes.lua 14 May 2009 05:06:21 -0000 1.100 *************** *** 164,168 **** }, wxANIHandler = { ! BaseClass = "wxCURHandler", Condition = "(wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_ICO_CUR)", IsNumber = false, --- 164,170 ---- }, wxANIHandler = { ! BaseClasses = { ! [1] = "wxCURHandler", [...5638 lines suppressed...] ! BaseClasses = { ! [1] = "wxObject", ! }, Condition = "wxLUA_USE_wxXML && wxUSE_XML", IsNumber = false, *************** *** 4391,4395 **** }, wxXmlResource = { ! BaseClass = "wxObject", Condition = "wxLUA_USE_wxXRC && wxUSE_XRC", IsNumber = false, --- 5145,5151 ---- }, wxXmlResource = { ! BaseClasses = { ! [1] = "wxObject", ! }, Condition = "wxLUA_USE_wxXRC && wxUSE_XRC", IsNumber = false, |
