Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-02-09 05:17:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14412/wxLua/modules/wxbind/src Modified Files: windows.cpp wx_bind.cpp Log Message: derive wxWindowList from wxList and add comment to show how to use it Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** windows.cpp 7 Feb 2007 18:39:11 -0000 1.35 --- windows.cpp 9 Feb 2007 05:17:09 -0000 1.36 *************** *** 3838,3901 **** int s_wxluatag_wxWindowList = -1; - // void Clear() - static int LUACALL wxLua_wxWindowList_Clear(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxWindowList * self = (wxWindowList *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowList); - // call Clear - self->Clear(); - - return 0; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowList_DeleteContents[] = { &s_wxluaarg_Boolean, 0 }; - // void DeleteContents(bool destroy) - static int LUACALL wxLua_wxWindowList_DeleteContents(lua_State *L) - { - wxLuaState wxlState(L); - // bool destroy - bool destroy = wxlState.GetBooleanType(2); - // get this - wxWindowList * self = (wxWindowList *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowList); - // call DeleteContents - self->DeleteContents(destroy); - - return 0; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowList_DeleteObject[] = { &s_wxluatag_wxWindow, 0 }; - // bool DeleteObject(wxWindow *pMenuItem) - static int LUACALL wxLua_wxWindowList_DeleteObject(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // wxWindow pMenuItem - wxWindow * pMenuItem = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); - // get this - wxWindowList * self = (wxWindowList *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowList); - // call DeleteObject - returns = self->DeleteObject(pMenuItem); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - // int GetCount() const - static int LUACALL wxLua_wxWindowList_GetCount(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxWindowList * self = (wxWindowList *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowList); - // call GetCount - returns = self->GetCount(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - static int LUACALL wxLua_wxWindowList_destructor(lua_State *) { --- 3838,3841 ---- *************** *** 3907,3915 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWindowList_methods[] = { - { LuaMethod, "Clear", wxLua_wxWindowList_Clear, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "DeleteContents", wxLua_wxWindowList_DeleteContents, 1, 1, s_wxluatagArray_wxLua_wxWindowList_DeleteContents }, - { LuaMethod, "DeleteObject", wxLua_wxWindowList_DeleteObject, 1, 1, s_wxluatagArray_wxLua_wxWindowList_DeleteObject }, - { LuaMethod, "GetCount", wxLua_wxWindowList_GetCount, 0, 0, s_wxluaargArray_None }, - { LuaGetProp, "Count", wxLua_wxWindowList_GetCount, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxWindowList", wxLua_wxWindowList_destructor, 0, 0, s_wxluaargArray_None }, }; --- 3847,3850 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** wx_bind.cpp 7 Feb 2007 18:39:11 -0000 1.73 --- wx_bind.cpp 9 Feb 2007 05:17:10 -0000 1.74 *************** *** 6222,6226 **** #if wxLUA_USE_wxWindowList ! { "wxWindowList", wxWindowList_methods, wxWindowList_methodCount, -1, NULL, &s_wxluatag_wxWindowList, NULL }, #endif // wxLUA_USE_wxWindowList --- 6222,6226 ---- #if wxLUA_USE_wxWindowList ! { "wxWindowList", wxWindowList_methods, wxWindowList_methodCount, -1, NULL, &s_wxluatag_wxWindowList, "wxList" }, #endif // wxLUA_USE_wxWindowList |
|
From: John L. <jr...@us...> - 2007-02-09 05:17:13
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14412/wxLua/docs Modified Files: wxluaref.html Log Message: derive wxWindowList from wxList and add comment to show how to use it Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluaref.html 6 Feb 2007 04:17:41 -0000 1.13 --- wxluaref.html 9 Feb 2007 05:17:09 -0000 1.14 *************** *** 3150,3155 **** <a href="#wxNode">wxNode</a> *GetNext()<br> <a href="#wxNode">wxNode</a> *GetPrevious()<br> ! void SetData(<a href="#wxObject">wxObject</a> *Data)<br> ! //int IndexOf()<br> <br> <font color=#000077> <i>%property</i>=Data, read, write</font><br> --- 3150,3155 ---- <a href="#wxNode">wxNode</a> *GetNext()<br> <a href="#wxNode">wxNode</a> *GetPrevious()<br> ! void SetData(<a href="#wxObject">wxObject</a> *data)<br> ! int IndexOf()<br> <br> <font color=#000077> <i>%property</i>=Data, read, write</font><br> *************** *** 12309,12320 **** <i>%if</i> wxLUA_USE_wxWindowList<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxWindowList">wxWindowList</a></b></font></font><blockquote> <br> ! void Clear()<br> ! void DeleteContents(bool destroy)<br> ! bool DeleteObject(<a href="#wxWindow">wxWindow</a> *pMenuItem)<br> ! int GetCount() const<br> <br> ! <font color=#000077> <i>%property</i>=Count, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 12309,12323 ---- <i>%if</i> wxLUA_USE_wxWindowList<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxWindowList">wxWindowList</a></b>, <a href="#wxList">wxList</a></font></font><blockquote> ! <a href="#wxWindowList">wxWindowList</a>()<br> <br> ! // This is returned from wxWindow::GetChildren(), use <a href="#wxList">wxList</a> methods and<br> ! // wxNode::GetData():DynamicCast("wxWindow") to retrieve the <a href="#wxWindow">wxWindow</a><br> <br> ! // frame = wx.<a href="#wxFrame">wxFrame</a>(wx.NULL, wx.wxID_ANY, "Test");<br> ! // win = wx.<a href="#wxWindow">wxWindow</a>(frame, wx.wxID_ANY)<br> ! // frame:Show(true)<br> ! // wlist = frame:GetChildren()<br> ! // wlist:Item(0):GetData():DynamicCast("wxWindow"):SetBackgroundColour(wx.wxRED)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 12483,12486 **** --- 12486,12490 ---- <a href="#wxNotebookEvent">wxNotebookEvent</a>(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1)<br> <br> + // functions in <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a><br> //int GetOldSelection() const<br> //int GetSelection() const<br> *************** *** 12526,12529 **** --- 12530,12534 ---- <a href="#wxListbookEvent">wxListbookEvent</a>(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1)<br> <br> + // functions in <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a><br> //int GetOldSelection() const<br> //int GetSelection() const<br> *************** *** 12569,12572 **** --- 12574,12578 ---- <a href="#wxChoicebookEvent">wxChoicebookEvent</a>(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1)<br> <br> + // functions in <a href="#wxBookCtrlBaseEvent">wxBookCtrlBaseEvent</a><br> //int GetOldSelection() const<br> //int GetSelection() const<br> |
|
From: John L. <jr...@us...> - 2007-02-09 05:17:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14412/wxLua/bindings/wxwidgets Modified Files: data.i windows.i wx_datatypes.lua Log Message: derive wxWindowList from wxList and add comment to show how to use it Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** windows.i 7 Dec 2006 06:32:42 -0000 1.24 --- windows.i 9 Feb 2007 05:17:08 -0000 1.25 *************** *** 299,310 **** %if wxLUA_USE_wxWindowList ! %class %noclassinfo wxWindowList ! void Clear() ! void DeleteContents(bool destroy) ! bool DeleteObject(wxWindow *pMenuItem) ! int GetCount() const ! %property=Count, read %endclass --- 299,313 ---- %if wxLUA_USE_wxWindowList ! %class %noclassinfo wxWindowList, wxList ! wxWindowList() ! // This is returned from wxWindow::GetChildren(), use wxList methods and ! // wxNode::GetData():DynamicCast("wxWindow") to retrieve the wxWindow ! // frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "Test"); ! // win = wx.wxWindow(frame, wx.wxID_ANY) ! // frame:Show(true) ! // wlist = frame:GetChildren() ! // wlist:Item(0):GetData():DynamicCast("wxWindow"):SetBackgroundColour(wx.wxRED) %endclass *************** *** 473,476 **** --- 476,480 ---- wxNotebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) + // functions in wxBookCtrlBaseEvent //int GetOldSelection() const //int GetSelection() const *************** *** 516,519 **** --- 520,524 ---- wxListbookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) + // functions in wxBookCtrlBaseEvent //int GetOldSelection() const //int GetSelection() const *************** *** 559,562 **** --- 564,568 ---- wxChoicebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) + // functions in wxBookCtrlBaseEvent //int GetOldSelection() const //int GetSelection() const Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wx_datatypes.lua 6 Feb 2007 04:17:41 -0000 1.46 --- wx_datatypes.lua 9 Feb 2007 05:17:08 -0000 1.47 *************** *** 3155,3158 **** --- 3155,3159 ---- }, wxWindowList = { + BaseClass = "wxList", Condition = "wxLUA_USE_wxWindowList", DefType = "class", Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** data.i 7 Dec 2006 06:32:42 -0000 1.19 --- data.i 9 Feb 2007 05:17:08 -0000 1.20 *************** *** 233,238 **** wxNode *GetNext() wxNode *GetPrevious() ! void SetData(wxObject *Data) ! //int IndexOf() %property=Data, read, write --- 233,238 ---- wxNode *GetNext() wxNode *GetPrevious() ! void SetData(wxObject *data) ! int IndexOf() %property=Data, read, write |
|
From: John L. <jr...@us...> - 2007-02-09 05:17:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14412/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: derive wxWindowList from wxList and add comment to show how to use it Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxstc_datatypes.lua 6 Feb 2007 04:17:41 -0000 1.41 --- wxstc_datatypes.lua 9 Feb 2007 05:17:08 -0000 1.42 *************** *** 3167,3170 **** --- 3167,3171 ---- }, wxWindowList = { + BaseClass = "wxList", Condition = "wxLUA_USE_wxWindowList", DefType = "class", |
|
From: John L. <jr...@us...> - 2007-02-08 04:10:46
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9062/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: a little cleanup, comments, clear font cache when font changes Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** wxluasudoku.wx.lua 9 Jan 2007 06:08:34 -0000 1.63 --- wxluasudoku.wx.lua 8 Feb 2007 04:10:41 -0000 1.64 *************** *** 2061,2065 **** focused_cell_id = 0, -- window id of the currently focused cell, 0 for none ! block_refresh = false, filePath = "", -- last opened filePath --- 2061,2065 ---- focused_cell_id = 0, -- window id of the currently focused cell, 0 for none ! block_refresh = false, -- temporarily block refreshing when true filePath = "", -- last opened filePath *************** *** 2172,2176 **** sudokuSolnTable = nil, -- solution to the current puzzle ! nonunique_init_puzzle = nil, -- nil for don't know, for true/false once checked possNakedTable = nil, --- 2172,2176 ---- sudokuSolnTable = nil, -- solution to the current puzzle ! nonunique_init_puzzle = nil, -- nil for don't know, is true/false once verified possNakedTable = nil, *************** *** 2251,2256 **** -- else try to fit a font size to given height/width function sudokuGUI.GetCellBestSize(cell_width, cell_height) - cell_width = cell_width or 40 - cell_height = cell_height or 40 local dc = wx.wxClientDC(sudokuGUI.frame) --- 2251,2254 ---- *************** *** 2328,2331 **** --- 2326,2330 ---- end + -- ---------------------------------------------------------------------------- -- Create one of the 81 cell windows and connect the events to it function sudokuGUI.CreateCellWindow(parent, winID, size) *************** *** 2349,2352 **** --- 2348,2353 ---- return win end + + -- ---------------------------------------------------------------------------- -- wxPaintEvent handler for all of the cell windows function sudokuGUI.OnPaintCellWindow(event) *************** *** 2364,2368 **** function sudokuGUI.PaintCell(dc, cell, width, height, valueFont, possibleFont) - -- clear the window before drawing dc:SetPen(wx.wxTRANSPARENT_PEN) --- 2365,2368 ---- *************** *** 2518,2521 **** --- 2518,2523 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.CalcPossiblePositions(width, height, possibleFont) local pos = {} *************** *** 2739,2742 **** --- 2741,2745 ---- end + -- ---------------------------------------------------------------------------- -- Set the currently focused window, refresh new and old function sudokuGUI.SetFocusWindow(cell) *************** *** 2752,2755 **** --- 2755,2760 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.OnKeyUpCellWindow(event) event:Skip() *************** *** 2871,2874 **** --- 2876,2880 ---- end + -- ---------------------------------------------------------------------------- -- Test to see if one of the possible values has been clicked on function sudokuGUI.HitTestPossibleValue(mx, my) *************** *** 2891,2894 **** --- 2897,2901 ---- end + -- ---------------------------------------------------------------------------- -- Left down click handler for the cell windows, hide the cell editor function sudokuGUI.OnLeftClickCellWindow(event) *************** *** 2978,2981 **** --- 2985,2989 ---- end + -- ---------------------------------------------------------------------------- -- Set the value of the cell from the value string function sudokuGUI.SetCellValue(cell, value) *************** *** 3020,3023 **** --- 3028,3032 ---- end + -- ---------------------------------------------------------------------------- -- Get the initial sudoku table function sudokuGUI.GetInitTable() *************** *** 3033,3036 **** --- 3042,3046 ---- end + -- ---------------------------------------------------------------------------- -- Get the current sudoku table to use function sudokuGUI.GetCurrentTable() *************** *** 3041,3044 **** --- 3051,3056 ---- sudokuGUI.sudokuTables[sudokuGUI.sudokuTables_pos] = sudokuTable end + + -- ---------------------------------------------------------------------------- -- Add a sudoku table to the list of tables, removing any past the current position, -- find possible, and refresh *************** *** 3063,3066 **** --- 3075,3079 ---- end + -- ---------------------------------------------------------------------------- -- Get the value of the cell as a printable string function sudokuGUI.GetCellValueString(cell) *************** *** 3075,3078 **** --- 3088,3093 ---- return value, false end + + -- ---------------------------------------------------------------------------- -- refresh all the grid cells function sudokuGUI.Refresh() *************** *** 3086,3089 **** --- 3101,3105 ---- end + -- ---------------------------------------------------------------------------- -- Create a new empty puzzle function sudokuGUI.NewPuzzle() *************** *** 3099,3102 **** --- 3115,3120 ---- end + -- ---------------------------------------------------------------------------- + -- Create a puzzle by hand function sudokuGUI.CreatePuzzle(init) local enableIds = *************** *** 3168,3172 **** end ! -- Generate a new puzzle function sudokuGUI.GeneratePuzzle() local keep = wx.wxGetNumberFromUser("Set the difficulty of the new puzzle by clearing cells.\n".. --- 3186,3191 ---- end ! -- ---------------------------------------------------------------------------- ! -- Generate a new puzzle automatically function sudokuGUI.GeneratePuzzle() local keep = wx.wxGetNumberFromUser("Set the difficulty of the new puzzle by clearing cells.\n".. *************** *** 3295,3298 **** --- 3314,3319 ---- end + -- ---------------------------------------------------------------------------- + -- Open a puzzle from a file function sudokuGUI.OpenPuzzle() local fileDialog = wx.wxFileDialog(sudokuGUI.frame, "Open file", *************** *** 3338,3341 **** --- 3359,3364 ---- end + -- ---------------------------------------------------------------------------- + -- Save the puzzle to a file function sudokuGUI.SaveAsPuzzle() local fileDialog = wx.wxFileDialog(sudokuGUI.frame, "Save puzzle", *************** *** 3365,3368 **** --- 3388,3393 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.Undo() if sudokuGUI.sudokuTables_pos > 1 then *************** *** 3378,3381 **** --- 3403,3408 ---- end + -- ---------------------------------------------------------------------------- + -- Try to fix the invalid cells if possible function sudokuGUI.FixInvalid(sudokuTable, show_dialog) local s = TableCopy(sudokuTable) *************** *** 3434,3439 **** end ! function sudokuGUI.VerifyUniquePuzzle(sudokuTable) sudokuTable = sudoku.CalcInvalidCells(sudokuTable) local invalid_count = TableCount(sudokuTable.invalid) --- 3461,3467 ---- end ! -- ---------------------------------------------------------------------------- + function sudokuGUI.VerifyUniquePuzzle(sudokuTable) sudokuTable = sudoku.CalcInvalidCells(sudokuTable) local invalid_count = TableCount(sudokuTable.invalid) *************** *** 3518,3521 **** --- 3546,3550 ---- end + -- ---------------------------------------------------------------------------- -- Use the scanning method to solve it function sudokuGUI.SolveScanning() *************** *** 3570,3573 **** --- 3599,3603 ---- end + -- ---------------------------------------------------------------------------- -- Use the brute force method to solve it function sudokuGUI.SolveBruteForce(sudokuTable) *************** *** 3663,3666 **** --- 3693,3697 ---- end + -- ---------------------------------------------------------------------------- -- Reset the grid to the original values function sudokuGUI.ResetPuzzle(dont_query_user) *************** *** 3686,3689 **** --- 3717,3722 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.UpdateTable(refresh) if refresh == nil then refresh = true end *************** *** 3729,3732 **** --- 3762,3767 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.UpdateGUI() local table_count = #sudokuGUI.sudokuTables *************** *** 3988,3991 **** --- 4023,4028 ---- sudokuGUI.possibleFont.wxfont:Delete() sudokuGUI.possibleFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font) + sudokuGUI.valueFont_cache = {} -- clear cache so GetCellBestSize recreates it + sudokuGUI.possibleFont_cache = {} for winID = 1, 81 do *************** *** 4233,4236 **** --- 4270,4275 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.ConfigSave(save_prefs) local config = wx.wxConfigGet(false) *************** *** 4324,4327 **** --- 4363,4369 ---- end + sudokuGUI.valueFont_cache = {} -- clear cache in case the font has changed + sudokuGUI.possibleFont_cache = {} + -- update font size local width, height = sudokuGUI.cellWindows[1]:GetClientSize() *************** *** 4462,4465 **** --- 4504,4509 ---- end + -- ---------------------------------------------------------------------------- + function sudokuGUI.InitFontsAndColours() sudokuGUI.Colours = |
|
From: John L. <jr...@us...> - 2007-02-07 20:57:53
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31770/wxLua/bindings Modified Files: genwxbind.lua Log Message: allow %member variables to be enums and call GetEnumerationType and not GetNumberType on them Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** genwxbind.lua 7 Feb 2007 18:39:07 -0000 1.96 --- genwxbind.lua 7 Feb 2007 20:57:49 -0000 1.97 *************** *** 2818,2821 **** --- 2818,2824 ---- CommentBindingTable(codeList, " // get the boolean value\n") table.insert(codeList, " bool val = wxlState.GetBooleanType(2);\n") + elseif IsDataTypeEnum(memberType) then + CommentBindingTable(codeList, " // get the number value\n") + table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlState.GetEnumerationType(2);\n") else CommentBindingTable(codeList, " // get the number value\n") |
|
From: John L. <jr...@us...> - 2007-02-07 18:39:47
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4861/wxLua/bindings Modified Files: genwxbind.lua Log Message: Use s_wxluaargArray_None for arg array in bindings if there are no args instead of creating a new empty array for each function, { 0 }. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** genwxbind.lua 7 Feb 2007 01:45:02 -0000 1.95 --- genwxbind.lua 7 Feb 2007 18:39:07 -0000 1.96 *************** *** 3448,3451 **** --- 3448,3454 ---- local overload_argListName = "s_wxluatagArray_".. funcName overload_argList = overload_argList.."0 }" + if overload_argList == "{ 0 }" then + overload_argListName = "s_wxluaargArray_None" + end -- add function map only once for the base function name overload *************** *** 4347,4351 **** for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then ! if functionBinding.ArgArrayName then table.insert(fileData, "static wxLuaArgTag "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end --- 4350,4354 ---- for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then ! if functionBinding.ArgArrayName and (functionBinding.ArgArrayName ~= "s_wxluaargArray_None") then table.insert(fileData, "static wxLuaArgTag "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end *************** *** 4442,4448 **** for i = 1, #BindTableList do - if BindTableList[i].Method then ! if BindTableList[i].ArgArrayName then table.insert(fileData, "static wxLuaArgTag "..BindTableList[i].ArgArrayName.."[] = "..BindTableList[i].ArgArray..";\n") end --- 4445,4450 ---- for i = 1, #BindTableList do if BindTableList[i].Method then ! if BindTableList[i].ArgArrayName and (BindTableList[i].ArgArrayName ~= "s_wxluaargArray_None") then table.insert(fileData, "static wxLuaArgTag "..BindTableList[i].ArgArrayName.."[] = "..BindTableList[i].ArgArray..";\n") end |
|
From: John L. <jr...@us...> - 2007-02-07 18:39:42
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4861/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan_bind.cpp Log Message: Use s_wxluaargArray_None for arg array in bindings if there are no args instead of creating a new empty array for each function, { 0 }. Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluacan.cpp 7 Feb 2007 01:45:01 -0000 1.18 --- wxluacan.cpp 7 Feb 2007 18:39:06 -0000 1.19 *************** *** 64,68 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { 0 }; // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) --- 64,67 ---- *************** *** 80,84 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { 0 }; // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) --- 79,82 ---- *************** *** 173,178 **** { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluatagArray_wxLua_wxlCanObj_GetX }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluatagArray_wxLua_wxlCanObj_GetY }, { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, --- 171,176 ---- { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, *************** *** 396,400 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { 0 }; // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) --- 394,397 ---- *************** *** 412,416 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { 0 }; // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) --- 409,412 ---- *************** *** 466,471 **** WXLUAMETHOD wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluatagArray_wxLua_wxlCan_GetYaxis }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluatagArray_wxLua_wxlCan_GetCmdh }, { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, s_wxluaargArray_None }, --- 462,467 ---- WXLUAMETHOD wxlCan_methods[] = { { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, s_wxluaargArray_None }, Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluacan_bind.cpp 17 Dec 2006 07:47:14 -0000 1.12 --- wxluacan_bind.cpp 7 Feb 2007 18:39:06 -0000 1.13 *************** *** 94,98 **** - static wxLuaArgTag s_wxluatagArray_wxLua_function_GetCan[] = { 0 }; // %function wxlCan* GetCan() static int LUACALL wxLua_function_GetCan(lua_State *L) --- 94,97 ---- *************** *** 108,112 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_function_GetCmdhMain[] = { 0 }; // %function wxlLuaCanCmd* GetCmdhMain() static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) --- 107,110 ---- *************** *** 132,137 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluatagArray_wxLua_function_GetCan }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluatagArray_wxLua_function_GetCmdhMain }, { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; --- 130,135 ---- static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }, { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4861/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: Use s_wxluaargArray_None for arg array in bindings if there are no args instead of creating a new empty array for each function, { 0 }. Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** xml.cpp 6 Feb 2007 04:17:46 -0000 1.18 --- xml.cpp 7 Feb 2007 18:39:12 -0000 1.19 *************** *** 35,39 **** int s_wxluatag_wxXmlNode = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNodeDefault_constructor[] = { 0 }; // %constructor wxXmlNodeDefault() static int LUACALL wxLua_wxXmlNodeDefault_constructor(lua_State *L) --- 35,38 ---- *************** *** 188,192 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetType[] = { 0 }; // wxXmlNodeType GetType() const; static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) --- 187,190 ---- *************** *** 204,208 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetName[] = { 0 }; // wxString GetName() const; static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) --- 202,205 ---- *************** *** 220,224 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetContent[] = { 0 }; // wxString GetContent() const; static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) --- 217,220 ---- *************** *** 236,240 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetParent[] = { 0 }; // wxXmlNode *GetParent() const; static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) --- 232,235 ---- *************** *** 252,256 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetNext[] = { 0 }; // wxXmlNode *GetNext() const; static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) --- 247,250 ---- *************** *** 268,272 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetChildren[] = { 0 }; // wxXmlNode *GetChildren() const; static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) --- 262,265 ---- *************** *** 284,288 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { 0 }; // wxXmlProperty *GetProperties() const; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) --- 277,280 ---- *************** *** 510,514 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlNode_methods[] = { ! { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlNodeDefault_constructor }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, s_wxluatagArray_wxLua_wxXmlNode_constructor }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor }, --- 502,506 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlNode_methods[] = { ! { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, s_wxluatagArray_wxLua_wxXmlNode_constructor }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor }, *************** *** 518,528 **** { LuaMethod, "AddProperty", wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }, { LuaMethod, "DeleteProperty", wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }, ! { LuaMethod, "GetType", wxLua_wxXmlNode_GetType, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetType }, ! { LuaMethod, "GetName", wxLua_wxXmlNode_GetName, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetName }, ! { LuaMethod, "GetContent", wxLua_wxXmlNode_GetContent, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetContent }, ! { LuaMethod, "GetParent", wxLua_wxXmlNode_GetParent, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetParent }, ! { LuaMethod, "GetNext", wxLua_wxXmlNode_GetNext, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetNext }, ! { LuaMethod, "GetChildren", wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetChildren }, ! { LuaMethod, "GetProperties", wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }, { LuaMethod, "GetPropValPtr", wxLua_wxXmlNode_GetPropValPtr, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr }, { LuaMethod, "GetPropVal", wxLua_wxXmlNode_GetPropVal, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }, --- 510,520 ---- { LuaMethod, "AddProperty", wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }, { LuaMethod, "DeleteProperty", wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }, ! { LuaMethod, "GetType", wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetName", wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetContent", wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetParent", wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNext", wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetChildren", wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProperties", wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetPropValPtr", wxLua_wxXmlNode_GetPropValPtr, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr }, { LuaMethod, "GetPropVal", wxLua_wxXmlNode_GetPropVal, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }, *************** *** 588,592 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlPropertyDefault_constructor[] = { 0 }; // %constructor wxXmlPropertyDefault() static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) --- 580,583 ---- *************** *** 604,608 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetName[] = { 0 }; // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) --- 595,598 ---- *************** *** 620,624 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetValue[] = { 0 }; // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) --- 610,613 ---- *************** *** 636,640 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetNext[] = { 0 }; // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) --- 625,628 ---- *************** *** 727,734 **** WXLUAMETHOD wxXmlProperty_methods[] = { { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, s_wxluatagArray_wxLua_wxXmlProperty_constructor }, ! { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlPropertyDefault_constructor }, ! { LuaMethod, "GetName", wxLua_wxXmlProperty_GetName, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetName }, ! { LuaMethod, "GetValue", wxLua_wxXmlProperty_GetValue, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetValue }, ! { LuaMethod, "GetNext", wxLua_wxXmlProperty_GetNext, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetNext }, { LuaMethod, "SetName", wxLua_wxXmlProperty_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetName }, { LuaMethod, "SetValue", wxLua_wxXmlProperty_SetValue, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetValue }, --- 715,722 ---- WXLUAMETHOD wxXmlProperty_methods[] = { { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, s_wxluatagArray_wxLua_wxXmlProperty_constructor }, ! { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetName", wxLua_wxXmlProperty_GetName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetValue", wxLua_wxXmlProperty_GetValue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNext", wxLua_wxXmlProperty_GetNext, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetName", wxLua_wxXmlProperty_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetName }, { LuaMethod, "SetValue", wxLua_wxXmlProperty_SetValue, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetValue }, *************** *** 756,760 **** int s_wxluatag_wxXmlDocument = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocumentDefault_constructor[] = { 0 }; // %constructor wxXmlDocumentDefault(); static int LUACALL wxLua_wxXmlDocumentDefault_constructor(lua_State *L) --- 744,747 ---- *************** *** 834,838 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_IsOk[] = { 0 }; // bool IsOk() const; static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L) --- 821,824 ---- *************** *** 850,854 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetRoot[] = { 0 }; // wxXmlNode *GetRoot() const; static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L) --- 836,839 ---- *************** *** 866,870 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetVersion[] = { 0 }; // wxString GetVersion() const; static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L) --- 851,854 ---- *************** *** 882,886 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding[] = { 0 }; // wxString GetFileEncoding() const; static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L) --- 866,869 ---- *************** *** 972,983 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlDocument_methods[] = { ! { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlDocumentDefault_constructor }, { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_constructor }, { LuaMethod, "Load", wxLua_wxXmlDocument_Load, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_Load }, { LuaMethod, "Save", wxLua_wxXmlDocument_Save, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_Save }, ! { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_IsOk }, ! { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetRoot }, ! { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetVersion }, ! { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding }, { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetRoot }, { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetVersion }, --- 955,966 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlDocument_methods[] = { ! { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_constructor }, { LuaMethod, "Load", wxLua_wxXmlDocument_Load, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_Load }, { LuaMethod, "Save", wxLua_wxXmlDocument_Save, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_Save }, ! { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetRoot }, { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetVersion }, *************** *** 1309,1313 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResourceGetDefault_constructor[] = { 0 }; // %override wxLua_wxXmlResourceGetDefault_constructor // %constructor wxXmlResourceGetDefault() --- 1292,1295 ---- *************** *** 1368,1372 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers[] = { 0 }; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) --- 1350,1353 ---- *************** *** 1405,1409 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Get[] = { 0 }; // %override wxLua_wxXmlResource_Get // wxXmlResource* Get() --- 1386,1389 ---- *************** *** 1420,1424 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { 0 }; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) --- 1400,1403 ---- *************** *** 1436,1440 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetVersion[] = { 0 }; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) --- 1415,1418 ---- *************** *** 1469,1473 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { 0 }; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) --- 1447,1450 ---- *************** *** 1657,1670 **** { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, ! { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlResourceGetDefault_constructor }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, s_wxluatagArray_wxLua_wxXmlResourceDefault_constructor }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }, ! { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }, ! { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_Get }, ! { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }, ! { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_GetVersion }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }, ! { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }, { LuaMethod, "Load", wxLua_wxXmlResource_Load, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Load }, { LuaMethod, "LoadPanel", wxLua_wxXmlResource_LoadPanel, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, --- 1634,1647 ---- { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, ! { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, s_wxluatagArray_wxLua_wxXmlResourceDefault_constructor }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }, ! { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, s_wxluaargArray_None }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }, ! { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }, ! { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Load", wxLua_wxXmlResource_Load, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Load }, { LuaMethod, "LoadPanel", wxLua_wxXmlResource_LoadPanel, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** defsutil.cpp 6 Feb 2007 04:17:42 -0000 1.22 --- defsutil.cpp 7 Feb 2007 18:39:08 -0000 1.23 *************** *** 37,41 **** #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetErrorStream[] = { 0 }; // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) --- 37,40 ---- *************** *** 53,57 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetInputStream[] = { 0 }; // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) --- 52,55 ---- *************** *** 69,73 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetOutputStream[] = { 0 }; // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) --- 67,70 ---- *************** *** 108,112 **** #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_CloseOutput[] = { 0 }; // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) --- 105,108 ---- *************** *** 121,125 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable[] = { 0 }; // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) --- 117,120 ---- *************** *** 137,141 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputAvailable[] = { 0 }; // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) --- 132,135 ---- *************** *** 153,157 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputOpened[] = { 0 }; // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) --- 147,150 ---- *************** *** 193,197 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Detach[] = { 0 }; // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) --- 186,189 ---- *************** *** 264,268 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Redirect[] = { 0 }; // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) --- 256,259 ---- *************** *** 277,281 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsRedirected[] = { 0 }; // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) --- 268,271 ---- *************** *** 324,330 **** #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetInputStream }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) --- 314,320 ---- #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 332,348 **** #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, s_wxluatagArray_wxLua_wxProcess_CloseOutput }, ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, s_wxluatagArray_wxLua_wxProcess_Detach }, { LuaMethod, "Kill", wxLua_wxProcess_Kill, 3, 1, s_wxluatagArray_wxLua_wxProcess_Kill }, { LuaMethod, "Exists", wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }, { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, s_wxluatagArray_wxLua_wxProcess_Open }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, s_wxluatagArray_wxLua_wxProcess_Redirect }, ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsRedirected }, { LuaDelete, "wxProcess", wxLua_wxProcess_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }, --- 322,338 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Kill", wxLua_wxProcess_Kill, 3, 1, s_wxluatagArray_wxLua_wxProcess_Kill }, { LuaMethod, "Exists", wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }, { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, s_wxluatagArray_wxLua_wxProcess_Open }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxProcess", wxLua_wxProcess_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }, *************** *** 361,365 **** int s_wxluatag_wxMouseState = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_constructor[] = { 0 }; // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) --- 351,354 ---- *************** *** 377,381 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetX[] = { 0 }; // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) --- 366,369 ---- *************** *** 393,397 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetY[] = { 0 }; // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) --- 381,384 ---- *************** *** 409,413 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_LeftDown[] = { 0 }; // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) --- 396,399 ---- *************** *** 425,429 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MiddleDown[] = { 0 }; // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) --- 411,414 ---- *************** *** 441,445 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_RightDown[] = { 0 }; // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) --- 426,429 ---- *************** *** 457,461 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ControlDown[] = { 0 }; // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) --- 441,444 ---- *************** *** 473,477 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ShiftDown[] = { 0 }; // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) --- 456,459 ---- *************** *** 489,493 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_AltDown[] = { 0 }; // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) --- 471,474 ---- *************** *** 505,509 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MetaDown[] = { 0 }; // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) --- 486,489 ---- *************** *** 521,525 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_CmdDown[] = { 0 }; // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) --- 501,504 ---- *************** *** 701,715 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluatagArray_wxLua_wxMouseState_constructor }, ! { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, s_wxluatagArray_wxLua_wxMouseState_GetX }, ! { LuaMethod, "GetY", wxLua_wxMouseState_GetY, 0, 0, s_wxluatagArray_wxLua_wxMouseState_GetY }, ! { LuaMethod, "LeftDown", wxLua_wxMouseState_LeftDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_LeftDown }, ! { LuaMethod, "MiddleDown", wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_MiddleDown }, ! { LuaMethod, "RightDown", wxLua_wxMouseState_RightDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_RightDown }, ! { LuaMethod, "ControlDown", wxLua_wxMouseState_ControlDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_ControlDown }, ! { LuaMethod, "ShiftDown", wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_ShiftDown }, ! { LuaMethod, "AltDown", wxLua_wxMouseState_AltDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_AltDown }, ! { LuaMethod, "MetaDown", wxLua_wxMouseState_MetaDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_MetaDown }, ! { LuaMethod, "CmdDown", wxLua_wxMouseState_CmdDown, 0, 0, s_wxluatagArray_wxLua_wxMouseState_CmdDown }, { LuaMethod, "SetX", wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }, { LuaMethod, "SetY", wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }, --- 680,694 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "LeftDown", wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MiddleDown", wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RightDown", wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ControlDown", wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ShiftDown", wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "AltDown", wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "MetaDown", wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "CmdDown", wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetX", wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }, { LuaMethod, "SetY", wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }, Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxlua.cpp 6 Feb 2007 04:17:46 -0000 1.25 --- wxlua.cpp 7 Feb 2007 18:39:12 -0000 1.26 *************** *** 75,79 **** int s_wxluatag_wxLuaObject = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_constructor[] = { 0 }; // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) --- 75,78 ---- *************** *** 106,110 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { 0 }; // %override wxLua_wxLuaObject_GetObject // void *GetObject() const --- 105,108 ---- *************** *** 120,124 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags[] = { 0 }; // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) --- 118,121 ---- *************** *** 203,210 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluatagArray_wxLua_wxLuaObject_constructor }, { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluatagArray_wxLua_wxLuaObject_GetObject }, ! { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }, { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, --- 200,207 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { ! { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, s_wxluatagArray_wxLua_wxLuaObject_SetObject }, ! { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }, { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }, { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }, *************** *** 250,254 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_GetID[] = { 0 }; // wxLuaObject *GetID() static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L) --- 247,250 ---- *************** *** 319,323 **** WXLUAMETHOD wxLuaPrintout_methods[] = { { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, ! { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }, { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, { LuaDelete, "wxLuaPrintout", wxLua_wxLuaPrintout_destructor, 0, 0, s_wxluaargArray_None }, --- 315,319 ---- WXLUAMETHOD wxLuaPrintout_methods[] = { { LuaConstructor, "wxLuaPrintout", wxLua_wxLuaPrintout_constructor, 2, 0, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }, ! { LuaMethod, "GetID", wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPageInfo", wxLua_wxLuaPrintout_SetPageInfo, 4, 2, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }, { LuaDelete, "wxLuaPrintout", wxLua_wxLuaPrintout_destructor, 0, 0, s_wxluaargArray_None }, *************** *** 404,408 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag[] = { 0 }; // const wxHtmlTag *GetHtmlTag() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag(lua_State *L) --- 400,403 ---- *************** *** 420,424 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser[] = { 0 }; // wxHtmlWinParser *GetHtmlParser() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser(lua_State *L) --- 415,418 ---- *************** *** 455,459 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled[] = { 0 }; // bool GetParseInnerCalled() const static int LUACALL wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled(lua_State *L) --- 449,452 ---- *************** *** 502,507 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) ! { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag }, ! { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser }, { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, --- 495,500 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) ! { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, s_wxluaargArray_None }, *************** *** 509,513 **** { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, ! { LuaMethod, "GetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled }, { LuaGetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, s_wxluaargArray_None }, --- 502,506 ---- { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled }, ! { LuaMethod, "GetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_GetParseInnerCalled, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, s_wxluaargArray_None }, *************** *** 546,550 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue[] = { 0 }; // double GetValue() const; static int LUACALL wxLua_wxLuaTreeItemData_GetValue(lua_State *L) --- 539,542 ---- *************** *** 587,591 **** WXLUAMETHOD wxLuaTreeItemData_methods[] = { { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, ! { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_GetValue }, { LuaMethod, "SetValue", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }, { LuaGetProp, "Value", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, --- 579,583 ---- WXLUAMETHOD wxLuaTreeItemData_methods[] = { { LuaConstructor, "wxLuaTreeItemData", wxLua_wxLuaTreeItemData_constructor, 1, 0, s_wxluatagArray_wxLua_wxLuaTreeItemData_constructor }, ! { LuaMethod, "GetValue", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetValue", wxLua_wxLuaTreeItemData_SetValue, 1, 1, s_wxluatagArray_wxLua_wxLuaTreeItemData_SetValue }, { LuaGetProp, "Value", wxLua_wxLuaTreeItemData_GetValue, 0, 0, s_wxluaargArray_None }, Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** image.cpp 6 Feb 2007 04:17:44 -0000 1.22 --- image.cpp 7 Feb 2007 18:39:10 -0000 1.23 *************** *** 60,64 **** #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetHandlers[] = { 0 }; // static wxList& GetHandlers() static int LUACALL wxLua_wxImage_GetHandlers(lua_State *L) --- 60,63 ---- *************** *** 78,82 **** #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetPalette[] = { 0 }; // wxPalette GetPalette() const static int LUACALL wxLua_wxImage_GetPalette(lua_State *L) --- 77,80 ---- *************** *** 314,318 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDefaultImage_constructor[] = { 0 }; // %constructor wxDefaultImage() static int LUACALL wxLua_wxDefaultImage_constructor(lua_State *L) --- 312,315 ---- *************** *** 416,420 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_CleanUpHandlers[] = { 0 }; // static void CleanUpHandlers() static int LUACALL wxLua_wxImage_CleanUpHandlers(lua_State *L) --- 413,416 ---- *************** *** 452,456 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_Copy[] = { 0 }; // wxImage Copy() const static int LUACALL wxLua_wxImage_Copy(lua_State *L) --- 448,451 ---- *************** *** 492,496 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_Destroy[] = { 0 }; // void Destroy() static int LUACALL wxLua_wxImage_Destroy(lua_State *L) --- 487,490 ---- *************** *** 600,604 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetImageExtWildcard[] = { 0 }; // static wxString GetImageExtWildcard() static int LUACALL wxLua_wxImage_GetImageExtWildcard(lua_State *L) --- 594,597 ---- *************** *** 694,698 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetHeight[] = { 0 }; // int GetHeight() const static int LUACALL wxLua_wxImage_GetHeight(lua_State *L) --- 687,690 ---- *************** *** 710,714 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetMaskBlue[] = { 0 }; // unsigned char GetMaskBlue() const static int LUACALL wxLua_wxImage_GetMaskBlue(lua_State *L) --- 702,705 ---- *************** *** 726,730 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetMaskGreen[] = { 0 }; // unsigned char GetMaskGreen() const static int LUACALL wxLua_wxImage_GetMaskGreen(lua_State *L) --- 717,720 ---- *************** *** 742,746 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetMaskRed[] = { 0 }; // unsigned char GetMaskRed() const static int LUACALL wxLua_wxImage_GetMaskRed(lua_State *L) --- 732,735 ---- *************** *** 799,803 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetWidth[] = { 0 }; // int GetWidth() const static int LUACALL wxLua_wxImage_GetWidth(lua_State *L) --- 788,791 ---- *************** *** 863,867 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_HasAlpha[] = { 0 }; // bool HasAlpha() const static int LUACALL wxLua_wxImage_HasAlpha(lua_State *L) --- 851,854 ---- *************** *** 879,883 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_HasMask[] = { 0 }; // bool HasMask() const static int LUACALL wxLua_wxImage_HasMask(lua_State *L) --- 866,869 ---- *************** *** 949,953 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_InitAlpha[] = { 0 }; // void InitAlpha() static int LUACALL wxLua_wxImage_InitAlpha(lua_State *L) --- 935,938 ---- *************** *** 962,966 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_InitStandardHandlers[] = { 0 }; // static void InitStandardHandlers() static int LUACALL wxLua_wxImage_InitStandardHandlers(lua_State *L) --- 947,950 ---- *************** *** 1052,1056 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_Ok[] = { 0 }; // bool Ok() const static int LUACALL wxLua_wxImage_Ok(lua_State *L) --- 1036,1039 ---- *************** *** 1503,1512 **** #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluatagArray_wxLua_wxImage_GetHandlers }, #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluatagArray_wxLua_wxImage_GetPalette }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette }, #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) --- 1486,1495 ---- #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, s_wxluaargArray_None }, #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) #if (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, s_wxluatagArray_wxLua_wxImage_SetPalette }, #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) *************** *** 1528,1541 **** { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor }, ! { LuaConstructor, "wxDefaultImage", wxLua_wxDefaultImage_constructor, 0, 0, s_wxluatagArray_wxLua_wxDefaultImage_constructor }, { LuaConstructor, "wxEmptyImage", wxLua_wxEmptyImage_constructor, 3, 2, s_wxluatagArray_wxLua_wxEmptyImage_constructor }, { LuaConstructor, "wxImageFromData", wxLua_wxImageFromData_constructor, 4, 3, s_wxluatagArray_wxLua_wxImageFromData_constructor }, { LuaConstructor, "wxImageFromFile", wxLua_wxImageFromFile_constructor, 2, 1, s_wxluatagArray_wxLua_wxImageFromFile_constructor }, { LuaMethod, "AddHandler", wxLua_wxImage_AddHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_AddHandler }, ! { LuaMethod, "CleanUpHandlers", wxLua_wxImage_CleanUpHandlers, 0, 0, s_wxluatagArray_wxLua_wxImage_CleanUpHandlers }, { LuaMethod, "ConvertToMono", wxLua_wxImage_ConvertToMono, 3, 3, s_wxluatagArray_wxLua_wxImage_ConvertToMono }, ! { LuaMethod, "Copy", wxLua_wxImage_Copy, 0, 0, s_wxluatagArray_wxLua_wxImage_Copy }, { LuaMethod, "Create", wxLua_wxImage_Create, 3, 2, s_wxluatagArray_wxLua_wxImage_Create }, ! { LuaMethod, "Destroy", wxLua_wxImage_Destroy, 0, 0, s_wxluatagArray_wxLua_wxImage_Destroy }, { LuaMethod, "FindFirstUnusedColour", wxLua_wxImage_FindFirstUnusedColour, 6, 3, s_wxluatagArray_wxLua_wxImage_FindFirstUnusedColour }, { LuaMethod, "FindHandler", wxLua_wxImage_FindHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandler }, --- 1511,1524 ---- { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, s_wxluatagArray_wxLua_wxImage_constructor }, ! { LuaConstructor, "wxDefaultImage", wxLua_wxDefaultImage_constructor, 0, 0, s_wxluaargArray_None }, { LuaConstructor, "wxEmptyImage", wxLua_wxEmptyImage_constructor, 3, 2, s_wxluatagArray_wxLua_wxEmptyImage_constructor }, { LuaConstructor, "wxImageFromData", wxLua_wxImageFromData_constructor, 4, 3, s_wxluatagArray_wxLua_wxImageFromData_constructor }, { LuaConstructor, "wxImageFromFile", wxLua_wxImageFromFile_constructor, 2, 1, s_wxluatagArray_wxLua_wxImageFromFile_constructor }, { LuaMethod, "AddHandler", wxLua_wxImage_AddHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_AddHandler }, ! { LuaMethod, "CleanUpHandlers", wxLua_wxImage_CleanUpHandlers, 0, 0, s_wxluaargArray_None }, { LuaMethod, "ConvertToMono", wxLua_wxImage_ConvertToMono, 3, 3, s_wxluatagArray_wxLua_wxImage_ConvertToMono }, ! { LuaMethod, "Copy", wxLua_wxImage_Copy, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Create", wxLua_wxImage_Create, 3, 2, s_wxluatagArray_wxLua_wxImage_Create }, ! { LuaMethod, "Destroy", wxLua_wxImage_Destroy, 0, 0, s_wxluaargArray_None }, { LuaMethod, "FindFirstUnusedColour", wxLua_wxImage_FindFirstUnusedColour, 6, 3, s_wxluatagArray_wxLua_wxImage_FindFirstUnusedColour }, { LuaMethod, "FindHandler", wxLua_wxImage_FindHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandler }, *************** *** 1543,1572 **** { LuaMethod, "FindHandlerType", wxLua_wxImage_FindHandlerType, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandlerType }, { LuaMethod, "FindHandlerMime", wxLua_wxImage_FindHandlerMime, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandlerMime }, ! { LuaMethod, "GetImageExtWildcard", wxLua_wxImage_GetImageExtWildcard, 0, 0, s_wxluatagArray_wxLua_wxImage_GetImageExtWildcard }, { LuaMethod, "GetAlpha", wxLua_wxImage_GetAlpha, 2, 2, s_wxluatagArray_wxLua_wxImage_GetAlpha }, { LuaMethod, "GetBlue", wxLua_wxImage_GetBlue, 2, 2, s_wxluatagArray_wxLua_wxImage_GetBlue }, { LuaMethod, "GetGreen", wxLua_wxImage_GetGreen, 2, 2, s_wxluatagArray_wxLua_wxImage_GetGreen }, { LuaMethod, "GetImageCount", wxLua_wxImage_GetImageCount, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCount }, ! { LuaMethod, "GetHeight", wxLua_wxImage_GetHeight, 0, 0, s_wxluatagArray_wxLua_wxImage_GetHeight }, ! { LuaMethod, "GetMaskBlue", wxLua_wxImage_GetMaskBlue, 0, 0, s_wxluatagArray_wxLua_wxImage_GetMaskBlue }, ! { LuaMethod, "GetMaskGreen", wxLua_wxImage_GetMaskGreen, 0, 0, s_wxluatagArray_wxLua_wxImage_GetMaskGreen }, ! { LuaMethod, "GetMaskRed", wxLua_wxImage_GetMaskRed, 0, 0, s_wxluatagArray_wxLua_wxImage_GetMaskRed }, { LuaMethod, "GetOrFindMaskColour", wxLua_wxImage_GetOrFindMaskColour, 3, 3, s_wxluatagArray_wxLua_wxImage_GetOrFindMaskColour }, { LuaMethod, "GetRed", wxLua_wxImage_GetRed, 2, 2, s_wxluatagArray_wxLua_wxImage_GetRed }, ! { LuaMethod, "GetWidth", wxLua_wxImage_GetWidth, 0, 0, s_wxluatagArray_wxLua_wxImage_GetWidth }, { LuaMethod, "HSVtoRGB", wxLua_wxImage_HSVtoRGB, 3, 3, s_wxluatagArray_wxLua_wxImage_HSVtoRGB }, { LuaMethod, "RGBtoHSV", wxLua_wxImage_RGBtoHSV, 3, 3, s_wxluatagArray_wxLua_wxImage_RGBtoHSV }, ! { LuaMethod, "HasAlpha", wxLua_wxImage_HasAlpha, 0, 0, s_wxluatagArray_wxLua_wxImage_HasAlpha }, ! { LuaMethod, "HasMask", wxLua_wxImage_HasMask, 0, 0, s_wxluatagArray_wxLua_wxImage_HasMask }, { LuaMethod, "GetOption", wxLua_wxImage_GetOption, 1, 1, s_wxluatagArray_wxLua_wxImage_GetOption }, { LuaMethod, "GetOptionInt", wxLua_wxImage_GetOptionInt, 1, 1, s_wxluatagArray_wxLua_wxImage_GetOptionInt }, { LuaMethod, "HasOption", wxLua_wxImage_HasOption, 1, 1, s_wxluatagArray_wxLua_wxImage_HasOption }, ! { LuaMethod, "InitAlpha", wxLua_wxImage_InitAlpha, 0, 0, s_wxluatagArray_wxLua_wxImage_InitAlpha }, ! { LuaMethod, "InitStandardHandlers", wxLua_wxImage_InitStandardHandlers, 0, 0, s_wxluatagArray_wxLua_wxImage_InitStandardHandlers }, { LuaMethod, "InsertHandler", wxLua_wxImage_InsertHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_InsertHandler }, { LuaMethod, "IsTransparent", wxLua_wxImage_IsTransparent, 3, 2, s_wxluatagArray_wxLua_wxImage_IsTransparent }, { LuaMethod, "LoadFile", wxLua_wxImage_LoadFile, 2, 1, s_wxluatagArray_wxLua_wxImage_LoadFile }, { LuaMethod, "LoadMimeFile", wxLua_wxImage_LoadMimeFile, 2, 2, s_wxluatagArray_wxLua_wxImage_LoadMimeFile }, ! { LuaMethod, "Ok", wxLua_wxImage_Ok, 0, 0, s_wxluatagArray_wxLua_wxImage_Ok }, { LuaMethod, "RemoveHandler", wxLua_wxImage_RemoveHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_RemoveHandler }, { LuaMethod, "Mirror", wxLua_wxImage_Mirror, 1, 0, s_wxluatagArray_wxLua_wxImage_Mirror }, --- 1526,1555 ---- { LuaMethod, "FindHandlerType", wxLua_wxImage_FindHandlerType, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandlerType }, { LuaMethod, "FindHandlerMime", wxLua_wxImage_FindHandlerMime, 1, 1, s_wxluatagArray_wxLua_wxImage_FindHandlerMime }, ! { LuaMethod, "GetImageExtWildcard", wxLua_wxImage_GetImageExtWildcard, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetAlpha", wxLua_wxImage_GetAlpha, 2, 2, s_wxluatagArray_wxLua_wxImage_GetAlpha }, { LuaMethod, "GetBlue", wxLua_wxImage_GetBlue, 2, 2, s_wxluatagArray_wxLua_wxImage_GetBlue }, { LuaMethod, "GetGreen", wxLua_wxImage_GetGreen, 2, 2, s_wxluatagArray_wxLua_wxImage_GetGreen }, { LuaMethod, "GetImageCount", wxLua_wxImage_GetImageCount, 2, 1, s_wxluatagArray_wxLua_wxImage_GetImageCount }, ! { LuaMethod, "GetHeight", wxLua_wxImage_GetHeight, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMaskBlue", wxLua_wxImage_GetMaskBlue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMaskGreen", wxLua_wxImage_GetMaskGreen, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMaskRed", wxLua_wxImage_GetMaskRed, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetOrFindMaskColour", wxLua_wxImage_GetOrFindMaskColour, 3, 3, s_wxluatagArray_wxLua_wxImage_GetOrFindMaskColour }, { LuaMethod, "GetRed", wxLua_wxImage_GetRed, 2, 2, s_wxluatagArray_wxLua_wxImage_GetRed }, ! { LuaMethod, "GetWidth", wxLua_wxImage_GetWidth, 0, 0, s_wxluaargArray_None }, { LuaMethod, "HSVtoRGB", wxLua_wxImage_HSVtoRGB, 3, 3, s_wxluatagArray_wxLua_wxImage_HSVtoRGB }, { LuaMethod, "RGBtoHSV", wxLua_wxImage_RGBtoHSV, 3, 3, s_wxluatagArray_wxLua_wxImage_RGBtoHSV }, ! { LuaMethod, "HasAlpha", wxLua_wxImage_HasAlpha, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "HasMask", wxLua_wxImage_HasMask, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetOption", wxLua_wxImage_GetOption, 1, 1, s_wxluatagArray_wxLua_wxImage_GetOption }, { LuaMethod, "GetOptionInt", wxLua_wxImage_GetOptionInt, 1, 1, s_wxluatagArray_wxLua_wxImage_GetOptionInt }, { LuaMethod, "HasOption", wxLua_wxImage_HasOption, 1, 1, s_wxluatagArray_wxLua_wxImage_HasOption }, ! { LuaMethod, "InitAlpha", wxLua_wxImage_InitAlpha, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "InitStandardHandlers", wxLua_wxImage_InitStandardHandlers, 0, 0, s_wxluaargArray_None }, { LuaMethod, "InsertHandler", wxLua_wxImage_InsertHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_InsertHandler }, { LuaMethod, "IsTransparent", wxLua_wxImage_IsTransparent, 3, 2, s_wxluatagArray_wxLua_wxImage_IsTransparent }, { LuaMethod, "LoadFile", wxLua_wxImage_LoadFile, 2, 1, s_wxluatagArray_wxLua_wxImage_LoadFile }, { LuaMethod, "LoadMimeFile", wxLua_wxImage_LoadMimeFile, 2, 2, s_wxluatagArray_wxLua_wxImage_LoadMimeFile }, ! { LuaMethod, "Ok", wxLua_wxImage_Ok, 0, 0, s_wxluaargArray_None }, { LuaMethod, "RemoveHandler", wxLua_wxImage_RemoveHandler, 1, 1, s_wxluatagArray_wxLua_wxImage_RemoveHandler }, { LuaMethod, "Mirror", wxLua_wxImage_Mirror, 1, 0, s_wxluatagArray_wxLua_wxImage_Mirror }, *************** *** 1673,1677 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) - static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetName[] = { 0 }; // wxString GetName() const static int LUACALL wxLua_wxImageHandler_GetName(lua_State *L) --- 1656,1659 ---- *************** *** 1689,1693 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetExtension[] = { 0 }; // wxString GetExtension() const static int LUACALL wxLua_wxImageHandler_GetExtension(lua_State *L) --- 1671,1674 ---- *************** *** 1705,1709 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetType[] = { 0 }; // long GetType() const static int LUACALL wxLua_wxImageHandler_GetType(lua_State *L) --- 1686,1689 ---- *************** *** 1721,1725 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxImageHandler_GetMimeType[] = { 0 }; // wxString GetMimeType() const static int LUACALL wxLua_wxImageHandler_GetMimeType(lua_State *L) --- 1701,1704 ---- *************** *** 1833,1840 **** #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluatagArray_wxLua_wxImageHandler_GetName }, ! { LuaMethod, "GetExtension", wxLua_wxImageHandler_GetExtension, 0, 0, s_wxluatagArray_wxLua_wxImageHandler_GetExtension }, ! { LuaMethod, "GetType", wxLua_wxImageHandler_GetType, 0, 0, s_wxluatagArray_wxLua_wxImageHandler_GetType }, ! { LuaMethod, "GetMimeType", wxLua_wxImageHandler_GetMimeType, 0, 0, s_wxluatagArray_wxLua_wxImageHandler_GetMimeType }, { LuaMethod, "SetName", wxLua_wxImageHandler_SetName, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_SetName }, { LuaMethod, "SetExtension", wxLua_wxImageHandler_SetExtension, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_SetExtension }, --- 1812,1819 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) ! { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetExtension", wxLua_wxImageHandler_GetExtension, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetType", wxLua_wxImageHandler_GetType, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMimeType", wxLua_wxImageHandler_GetMimeType, 0, 0, s_wxluaargArray_None }, { LuaMethod, "SetName", wxLua_wxImageHandler_SetName, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_SetName }, { LuaMethod, "SetExtension", wxLua_wxImageHandler_SetExtension, 1, 1, s_wxluatagArray_wxLua_wxImageHandler_SetExtension }, *************** *** 1865,1869 **** int s_wxluatag_wxBMPHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxBMPHandler_constructor[] = { 0 }; // wxBMPHandler() static int LUACALL wxLua_wxBMPHandler_constructor(lua_State *L) --- 1844,1847 ---- *************** *** 1891,1895 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBMPHandler_methods[] = { ! { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxBMPHandler_constructor }, { LuaDelete, "wxBMPHandler", wxLua_wxBMPHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 1869,1873 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBMPHandler_methods[] = { ! { LuaConstructor, "wxBMPHandler", wxLua_wxBMPHandler_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxBMPHandler", wxLua_wxBMPHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 1907,1911 **** int s_wxluatag_wxICOHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxICOHandler_constructor[] = { 0 }; // wxICOHandler() static int LUACALL wxLua_wxICOHandler_constructor(lua_State *L) --- 1885,1888 ---- *************** *** 1933,1937 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxICOHandler_methods[] = { ! { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxICOHandler_constructor }, { LuaDelete, "wxICOHandler", wxLua_wxICOHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 1910,1914 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxICOHandler_methods[] = { ! { LuaConstructor, "wxICOHandler", wxLua_wxICOHandler_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxICOHandler", wxLua_wxICOHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 1949,1953 **** int s_wxluatag_wxCURHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxCURHandler_constructor[] = { 0 }; // wxCURHandler() static int LUACALL wxLua_wxCURHandler_constructor(lua_State *L) --- 1926,1929 ---- *************** *** 1975,1979 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCURHandler_methods[] = { ! { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxCURHandler_constructor }, { LuaDelete, "wxCURHandler", wxLua_wxCURHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 1951,1955 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCURHandler_methods[] = { ! { LuaConstructor, "wxCURHandler", wxLua_wxCURHandler_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxCURHandler", wxLua_wxCURHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 1991,1995 **** int s_wxluatag_wxANIHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxANIHandler_constructor[] = { 0 }; // wxANIHandler() static int LUACALL wxLua_wxANIHandler_constructor(lua_State *L) --- 1967,1970 ---- *************** *** 2017,2021 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxANIHandler_methods[] = { ! { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxANIHandler_constructor }, { LuaDelete, "wxANIHandler", wxLua_wxANIHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 1992,1996 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxANIHandler_methods[] = { ! { LuaConstructor, "wxANIHandler", wxLua_wxANIHandler_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxANIHandler", wxLua_wxANIHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 2033,2037 **** int s_wxluatag_wxIFFHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxIFFHandler_constructor[] = { 0 }; // wxIFFHandler() static int LUACALL wxLua_wxIFFHandler_constructor(lua_State *L) --- 2008,2011 ---- *************** *** 2059,2063 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIFFHandler_methods[] = { ! { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxIFFHandler_constructor }, { LuaDelete, "wxIFFHandler", wxLua_wxIFFHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 2033,2037 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIFFHandler_methods[] = { ! { LuaConstructor, "wxIFFHandler", wxLua_wxIFFHandler_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxIFFHandler", wxLua_wxIFFHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 2075,2079 **** int s_wxluatag_wxGIFHandler = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxGIFHandler_constructor[] = { 0 }; // wxGIFHandler() static int LUACALL wxLua_wxGIFHandler_constructor(lua_State *L) --- 2049,2052 ---- *************** *** 2101,2105 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGIFHandler_methods[] = { ! { LuaConstructor, "wxGIFHandler", wxLua_wxGIFHandler_constructor, 0, 0, s_wxluatagArray_wxLua_wxGIFHandler_constructor }, { LuaDelete, "wxGIFHandler", wxLua_wxGIFHandler_destructor, 0, 0, s_wxluaargArray_None }, }; --- 2074,2078 ---- // Map Lua Class Methods to C Binding F... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-02-07 18:39:18
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4861/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp Log Message: Use s_wxluaargArray_None for arg array in bindings if there are no args instead of creating a new empty array for each function, { 0 }. Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluasocket.cpp 7 Feb 2007 01:45:02 -0000 1.13 --- wxluasocket.cpp 7 Feb 2007 18:39:12 -0000 1.14 *************** *** 45,49 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { 0 }; // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) --- 45,48 ---- *************** *** 61,65 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { 0 }; // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) --- 60,63 ---- *************** *** 77,81 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { 0 }; // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) --- 75,78 ---- *************** *** 133,137 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { 0 }; // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) --- 130,133 ---- *************** *** 169,173 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { 0 }; // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) --- 165,168 ---- *************** *** 185,189 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { 0 }; // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) --- 180,183 ---- *************** *** 201,205 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { 0 }; // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) --- 195,198 ---- *************** *** 217,221 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { 0 }; // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) --- 210,213 ---- *************** *** 233,237 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { 0 }; // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) --- 225,228 ---- *************** *** 249,253 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { 0 }; // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) --- 240,243 ---- *************** *** 304,308 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { 0 }; // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) --- 294,297 ---- *************** *** 320,324 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { 0 }; // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) --- 309,312 ---- *************** *** 336,340 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName[] = { 0 }; // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) --- 324,327 ---- *************** *** 350,354 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName[] = { 0 }; // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) --- 337,340 ---- *************** *** 394,416 **** WXLUAMETHOD wxLuaDebuggerServer_methods[] = { { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }, { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }, { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }, { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName }, { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, --- 380,402 ---- WXLUAMETHOD wxLuaDebuggerServer_methods[] = { { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, *************** *** 426,430 **** int s_wxluatag_wxLuaDebuggerEvent = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { 0 }; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) --- 412,415 ---- *************** *** 442,446 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { 0 }; // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) --- 427,430 ---- *************** *** 458,462 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { 0 }; // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) --- 442,445 ---- *************** *** 474,478 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { 0 }; // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) --- 457,460 ---- *************** *** 519,526 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }, { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, --- 501,508 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, |
|
From: John L. <jr...@us...> - 2007-02-07 18:39:17
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4861/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: Use s_wxluaargArray_None for arg array in bindings if there are no args instead of creating a new empty array for each function, { 0 }. Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** stc.cpp 7 Feb 2007 01:45:02 -0000 1.21 --- stc.cpp 7 Feb 2007 18:39:12 -0000 1.22 *************** *** 29,33 **** #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) - static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { 0 }; // %wxchkver271 wxColour GetCaretLineBackground(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) --- 29,32 ---- *************** *** 67,71 **** #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) [...2713 lines suppressed...] ! { LuaMethod, "GetDragText", wxLua_wxStyledTextEvent_GetDragText, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetDragAllowMove", wxLua_wxStyledTextEvent_GetDragAllowMove, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetShift", wxLua_wxStyledTextEvent_GetShift, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetControl", wxLua_wxStyledTextEvent_GetControl, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetAlt", wxLua_wxStyledTextEvent_GetAlt, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "Position", wxLua_wxStyledTextEvent_GetPosition, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "Position", wxLua_wxStyledTextEvent_SetPosition, 1, 1, s_wxluaargArray_None }, *************** *** 8441,8445 **** #if wxLUA_USE_wxDragDrop { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult }, ! { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_GetDragResult }, { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluaargArray_None }, --- 8209,8213 ---- #if wxLUA_USE_wxDragDrop { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult }, ! { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None }, { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluaargArray_None }, |
|
From: John L. <jr...@us...> - 2007-02-07 04:56:28
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27235/wxLua/samples Modified Files: unittest.wx.lua Log Message: Add docs for binding.html for wrapping virtual functions in C++ make it possible to replace nonvirtual functions of wxLua userdata with lua functions, test in unittest add more docs in wxlprint.cpp to explain what is really going on for the function calls Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** unittest.wx.lua 7 Dec 2006 22:05:53 -0000 1.5 --- unittest.wx.lua 7 Feb 2007 04:56:25 -0000 1.6 *************** *** 36,40 **** -- --------------------------------------------------------------------------- ! -- Simple bindings tests -- --------------------------------------------------------------------------- --- 36,40 ---- -- --------------------------------------------------------------------------- ! print("\nSimple bindings tests.\n") -- --------------------------------------------------------------------------- *************** *** 56,60 **** -- --------------------------------------------------------------------------- ! -- test some class functions pt = wx.wxPoint(1, 2) --- 56,61 ---- -- --------------------------------------------------------------------------- ! print("\nTest some binding class functions.\n") ! -- --------------------------------------------------------------------------- pt = wx.wxPoint(1, 2) *************** *** 96,97 **** --- 97,116 ---- pen:SetColour(1, 2, 3) PrintOk(pen:GetColour():Red() == 1, "%overload function wxPen:SetColourRGB(1, 2, 3)") + + -- --------------------------------------------------------------------------- + + print("\nTest adding a functions to a class object userdata.\n") + -- --------------------------------------------------------------------------- + + a = wx.wxRect(1,2,3,4); + function a.Print(self) return string.format("%d,%d,%d,%d", self.X, self.Y, self:GetWidth(), self:GetHeight()) end + PrintOk(a:Print() == "1,2,3,4", "Add a new lua function to an already created wx.wxRect") + + a = wx.wxRect(1,2,3,4); + function a.GetX(self) return "x" end + PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function") + PrintOk(a:base_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:base_GetX for original function") + PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function (test recursion)") + PrintOk(a:base_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:base_GetX for original function (rest recursion)") + + print("\n") |
|
From: John L. <jr...@us...> - 2007-02-07 04:56:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27235/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: Add docs for binding.html for wrapping virtual functions in C++ make it possible to replace nonvirtual functions of wxLua userdata with lua functions, test in unittest add more docs in wxlprint.cpp to explain what is really going on for the function calls Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxlbind.cpp 21 Jan 2007 23:13:07 -0000 1.49 --- wxlbind.cpp 7 Feb 2007 04:56:24 -0000 1.50 *************** *** 325,332 **** wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); // See below, if base_XXX is called then we set this flag so that // the called function knows to call the base class instead of recalling // the lua function and recursing. ! wxCHECK_MSG(!wxlState.GetCallBaseClassFunction(), 0, wxT("Base class function call not reset")); bool fCallbase = false; --- 325,334 ---- wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + // See below, if base_XXX is called then we set this flag so that // the called function knows to call the base class instead of recalling // the lua function and recursing. ! //wxCHECK_MSG(!wxlState.GetCallBaseClassFunction(), 0, wxT("Base class function call not reset")); ! wxlState.SetCallBaseClassFunction(false); bool fCallbase = false; *************** *** 392,397 **** } ! //wxPrintf(wxT("wxLua_lua_getTableFunc func '%s' pClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), ! // lua2wx(funcName).c_str(), (long)pClass, pClass ? lua2wx(pClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); if (!fFound) --- 394,400 ---- } ! //if (lua2wx(funcName).Find(wxT("OnBeginDocument")) != -1) ! // wxPrintf(wxT("wxLua_lua_getTableFunc func '%s' pClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), ! // lua2wx(funcName).c_str(), (long)pClass, pClass ? lua2wx(pClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); if (!fFound) |
|
From: John L. <jr...@us...> - 2007-02-07 04:56:28
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27235/wxLua/docs Modified Files: binding.html Log Message: Add docs for binding.html for wrapping virtual functions in C++ make it possible to replace nonvirtual functions of wxLua userdata with lua functions, test in unittest add more docs in wxlprint.cpp to explain what is really going on for the function calls Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** binding.html 6 Feb 2007 04:17:41 -0000 1.13 --- binding.html 7 Feb 2007 04:56:24 -0000 1.14 *************** *** 245,250 **** </ul> ! <li>The only function that absolutely must be called is ! <b>wxLuaBinding_[hook_cpp_binding_classname]_init()</b>. It is probably easiest to put <i>extern bool wxLuaBinding_[hook_cpp_binding_classname]_init();</i> in your --- 245,250 ---- </ul> ! <li>The only function that absolutely must be called is <b>wxLuaBinding_[hook_cpp_binding_classname]_init()</b>. ! It is probably easiest to put <i>extern bool wxLuaBinding_[hook_cpp_binding_classname]_init();</i> in your *************** *** 320,323 **** --- 320,456 ---- </ul> + <h2><u>Binding C++ virtual functions</u></h2> + + The only way to handle C++ virtual functions in wxLua is to subclass + the C++ class you want to be able to write lua functions for and bind + that. The hand coded wxLuaPrintout class is a good example of this, + let's examine how the code in C++ and lua works to allow you to + override the C++ virtual function.<br> + + The wxWidgets class wxPrintout has a number of virtual functions, but + lets focus on "virtual bool wxPrintout::OnBeginDocument(int startPage, + int endPage)" as an example, since if you override + this function you must also call the base class for printing + to operate correctly. The source code for the class + wxLuaPrintout located in <i>modules/wxbind/include/wxlprint.h</i> + and <i>modules/wxbind/src/wxlprint.cpp</i> and you 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. <br> + + Below is a list of function calls and notes about how + to handle this.<br> + + <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> + + <li>The wxWidgets printing framework calls virtual + wxPrintout::OnBeginDocument(...), but we've subclassed wxPrintout and + so the the function wxLuaPrintout::OnBeginDocument(...) gets called.</li> + + <ul> + + <li>The + class wxLuaPrintout keeps a refed copy of the wxLuaState since + otherwise the function OnBeginDocument wouldn't know what + lua_State is active since wxWidgets doesn't know anything about + wxLua. </li> + + <li>In the past wxLua would iterate through a list of + wxLuaStates to try to find the C++ userdata object, the wxLuaPrintout + instance, in order to find the correct lua_State. This can impose a + large performance penalty if there are multiple states and/or a large + number of userdata objects.</li> + + </ul> + + <li>In wxLuaPrintout::OnBeginDocument we first + check to see if wxLuaState::GetCallBaseClassFunction() is true, if not + then check to see if wxLuaState::HasDerivedMethod(this, + "OnBeginDocument") is true, where <i>this</i> is the + particular instance of the wxLuaPrintout class. </li> + + <ul> + + <li>If we're not supposed to call the base class and there is + a lua function that replaces "OnBeginDocument" we'll call it. First we + push the wxLuaPrintout and the parameters to the function that's + already been pushed on the stack by a successful call to + wxLuaState::HasDerivedMethod when it calls wxLuaObject::GetObject. We + then get the result, if any, pop the result, and reset the stack to the + starting point.</li> + + <li>On the other hand if we're supposed to call the base + class function or there isn't a derived lua method we'll just call + wxPrintout::OnBeginDocument(...) explicitly.</li> + + </ul> + + <li>Here's the tricky part for lua derived functions that then + call the base class function. In this case we're not calling the "base" + class function of wxLuaPrintout, but rather wxPrintout since + wxLuaPrintout is a hollow shell that merely forwards calls to lua or to + the base class.</li> + + <ul> + + <li>When in lua we call <i>base_OnBeginDocument(...)</i> + on the wxLuaPrintout userdata object, the function + wxLua_lua_getTableFunc(...) in <i>modules/wxlua/src/wxbind.cpp</i> + 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 "base_". </li> + + <li>The reason why we need to reset the + GetCallBaseClassFunction() from within our derived C++ virtual class + function is that wxWidgets may immediately call another C++ virtual + function, but the wxLuaState is still flagged to call the base class + 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(...) runs the code to call + the derived lua function OnBeginDocument by calling wxLuaState::LuaCall + on it. (GetCallBaseClassFunction() and HasDerivedMethod() are both true)</li> + + <li>wxLua_lua_getTableFunc(...) is called when in lua the + function "base_OnBeginPrinting" is called for the wxLuaPrintout + userdata, the flag wxLuaState::GetCallBaseClassFunction is set + to true, and the C function wxLua_wxPrintout_OnBeginDocument (in <i>modules/wxbind/src/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 + running lua's OnBeginDocument function, but this time we just + call wxPrintout::OnBeginDocument and return.</li> + + <li>The wxLuaState::LuaCall function finishes and the first + call to the function wxLuaPrintout::OnBeginDocument(...) returns.</li> + + <li>Success! </li> + + </ol> + <h2><u>Interface File Constructs</u> </h2> |
|
From: John L. <jr...@us...> - 2007-02-07 04:56:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27235/wxLua/modules/wxbind/src Modified Files: print.cpp wxlprint.cpp Log Message: Add docs for binding.html for wrapping virtual functions in C++ make it possible to replace nonvirtual functions of wxLua userdata with lua functions, test in unittest add more docs in wxlprint.cpp to explain what is really going on for the function calls Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlprint.cpp 21 Jan 2007 23:13:07 -0000 1.13 --- wxlprint.cpp 7 Feb 2007 04:56:24 -0000 1.14 *************** *** 102,105 **** --- 102,128 ---- } + // Notes about virtual functions: + // + // This is the call list using the wxPrintf statements in wxLuaPrintout::OnBeginDocument + // for the wxLua code (see printing.wx.lua sample for complete listing) + // + // previewPrintout = wxLuaPrintout("Test print") + // ... + // previewPrintout.OnBeginDocument = function(self, startPage, endPage) + // return self:base_OnBeginDocument(startPage, endPage) + // end + // ... + // local preview = wx.wxPrintPreview(printerPrintout, previewPrintout, printDialogData) + // + // wxLuaPrintout::OnBeginDocument 1 call base 0 + // wxLua_lua_getTableFunc func 'base_OnBeginDocument' pClass -1220355700 'wxLuaPrintout', userdata 1, lightuserdata 0, ttag 207, class_tag 207 lua_State 139252808 wxLuaStateRefData 139155808 call base 1 + // wxLua_wxPrintout_OnBeginDocument 1 (this is the wxLua binding function for wxPrintout::OnBeginDocument) + // wxLuaPrintout::OnBeginDocument 1 call base 1 + // wxLuaPrintout::OnBeginDocument 3 call base 1 + // wxPrintout::OnBeginDocument (this is the call to the wxWidgets function in it's library) + // wxLuaPrintout::OnBeginDocument 4 call base 1 + // wxLuaPrintout::OnBeginDocument 2 call base 0 + // wxLuaPrintout::OnBeginDocument 4 call base 0 + bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage) { *************** *** 107,110 **** --- 130,135 ---- bool fResult = true; + //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 1 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); + if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginDocument")) *************** *** 119,125 **** --- 144,156 ---- m_wxlState.lua_Pop(1); m_wxlState.lua_SetTop(nOldTop); + //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 2 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); } else + { + //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 3 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); fResult = wxPrintout::OnBeginDocument(startPage, endPage); + } + + //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 4 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); m_wxlState.SetCallBaseClassFunction(false); // clear flag always Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** print.cpp 6 Feb 2007 04:17:45 -0000 1.22 --- print.cpp 7 Feb 2007 04:56:24 -0000 1.23 *************** *** 1,4 **** // ---------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. --- 1,4 ---- // ---------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. |
|
From: John L. <jr...@us...> - 2007-02-07 01:45:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17634/wxLua/modules/wxbind/src Modified Files: windows.cpp Log Message: fix previous commit that skipped overloaded binding functions without #if conditions Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** windows.cpp 6 Feb 2007 04:17:45 -0000 1.33 --- windows.cpp 7 Feb 2007 01:45:02 -0000 1.34 *************** *** 3334,3337 **** --- 3334,3350 ---- #endif // (wxLUA_USE_wxPointSizeRect) + // Overloaded functions for wxLua_wxWindow_FindWindow + static int LUACALL wxLua_wxWindow_FindWindow(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "FindWindow", wxLua_wxWindow_FindWindow1, 1, 1, s_wxluatagArray_wxLua_wxWindow_FindWindow1 }, + { LuaMethod, "FindWindowName", wxLua_wxWindow_FindWindowName, 1, 1, s_wxluatagArray_wxLua_wxWindow_FindWindowName }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } #if (wxLUA_USE_wxPointSizeRect) |
|
From: John L. <jr...@us...> - 2007-02-07 01:45:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17634/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp Log Message: fix previous commit that skipped overloaded binding functions without #if conditions Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluasocket.cpp 17 Dec 2006 07:47:17 -0000 1.12 --- wxluasocket.cpp 7 Feb 2007 01:45:02 -0000 1.13 *************** *** 391,396 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { --- 391,394 ---- *************** *** 519,524 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { --- 517,520 ---- |
|
From: John L. <jr...@us...> - 2007-02-07 01:45:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17634/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: fix previous commit that skipped overloaded binding functions without #if conditions Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** stc.cpp 17 Dec 2006 07:47:17 -0000 1.20 --- stc.cpp 7 Feb 2007 01:45:02 -0000 1.21 *************** *** 7025,7030 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxStyledTextCtrl_methods[] = { --- 7025,7028 ---- *************** *** 8353,8358 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxStyledTextEvent_methods[] = { --- 8351,8354 ---- |
|
From: John L. <jr...@us...> - 2007-02-07 01:45:09
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17634/wxLua/bindings Modified Files: genwxbind.lua Log Message: fix previous commit that skipped overloaded binding functions without #if conditions Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** genwxbind.lua 6 Feb 2007 04:17:41 -0000 1.94 --- genwxbind.lua 7 Feb 2007 01:45:02 -0000 1.95 *************** *** 4474,4480 **** if overload_condition ~= "" then overload_condition = overload_condition.."||" end overload_condition = overload_condition.."("..condition..")" - - overloadCount = overloadCount + 1 + #v end end --- 4474,4480 ---- if overload_condition ~= "" then overload_condition = overload_condition.."||" end overload_condition = overload_condition.."("..condition..")" end + + overloadCount = overloadCount + 1 + #v end |
|
From: John L. <jr...@us...> - 2007-02-07 01:45:08
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17634/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp Log Message: fix previous commit that skipped overloaded binding functions without #if conditions Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluacan.cpp 17 Dec 2006 07:47:14 -0000 1.17 --- wxluacan.cpp 7 Feb 2007 01:45:01 -0000 1.18 *************** *** 169,174 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { --- 169,172 ---- *************** *** 226,231 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { --- 224,227 ---- *************** *** 270,275 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { --- 266,269 ---- *************** *** 314,319 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { --- 308,311 ---- *************** *** 373,378 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { --- 365,368 ---- *************** *** 473,478 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { --- 463,466 ---- *************** *** 543,548 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { --- 531,534 ---- |
|
From: Francesco M. <fr...@us...> - 2007-02-06 22:50:19
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16382 Modified Files: updatesite.sh Log Message: do fix the CD command for updating wxLua Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** updatesite.sh 6 Feb 2007 22:25:59 -0000 1.29 --- updatesite.sh 6 Feb 2007 22:50:13 -0000 1.30 *************** *** 20,24 **** echo "Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs" ! cd wxLua cvs -q update -P -C -d } --- 20,24 ---- echo "Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs" ! cd ../wxLua cvs -q update -P -C -d } |
|
From: Francesco M. <fr...@us...> - 2007-02-06 22:26:06
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6024 Modified Files: updatesite.sh Log Message: do clean updates instead of simple updates Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** updatesite.sh 19 Jan 2007 20:43:44 -0000 1.28 --- updatesite.sh 6 Feb 2007 22:25:59 -0000 1.29 *************** *** 13,25 **** echo "Checking out website to htdocs dir from cvs" ! cvs -q update -P -d echo "Checking out the docs dir to the htdocs/docs dir from cvs" cd docs ! cvs -q update -P -d echo "Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs" cd wxLua ! cvs -q update -P -d } --- 13,25 ---- echo "Checking out website to htdocs dir from cvs" ! cvs -q update -P -C -d echo "Checking out the docs dir to the htdocs/docs dir from cvs" cd docs ! cvs -q update -P -C -d echo "Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs" cd wxLua ! cvs -q update -P -C -d } |
|
From: John L. <jr...@us...> - 2007-02-06 04:18:18
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24793/wxLua/docs Modified Files: binding.html wxluaref.html Log Message: cleanup in genwxbind.lua remove whitespace in generated files Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluaref.html 19 Dec 2006 06:18:02 -0000 1.12 --- wxluaref.html 6 Feb 2007 04:17:41 -0000 1.13 *************** *** 1723,1726 **** --- 1723,1729 ---- //void* GetClientData(int n) const<br> <a href="#wxClientData">wxClientData</a>* GetClientObject(int n) const<br> + // Get the <a href="#wxStringClientData">wxStringClientData</a> if and only if you have called SetClientObject with a <a href="#wxStringClientData">wxStringClientData</a><br> + <font color=#CC3300> // <i>%override</i> <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject(int n) const</font><br> + <font color=#CC0033> <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject(int n) const</font><br> int GetCount() const<br> int GetSelection() const<br> *************** *** 3335,3339 **** // <a href="#wxDateTime">wxDateTime</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateTime<br> <br> <i>%include</i> "wx/datetime.h"<br> --- 3338,3342 ---- // <a href="#wxDateTime">wxDateTime</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateTime & wxUSE_DATETIME<br> <br> <i>%include</i> "wx/datetime.h"<br> *************** *** 3535,3544 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateTime<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxTimeSpan">wxTimeSpan</a><br> <br> ! <i>%if</i> wxLUA_USE_wxTimeSpan<br> <br> <i>%include</i> "wx/datetime.h"<br> --- 3538,3547 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateTime & wxUSE_DATETIME<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxTimeSpan">wxTimeSpan</a><br> <br> ! <i>%if</i> wxLUA_USE_wxTimeSpan & wxUSE_DATETIME<br> <br> <i>%include</i> "wx/datetime.h"<br> *************** *** 3585,3594 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxTimeSpan<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDateSpan">wxDateSpan</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateSpan<br> <br> <i>%include</i> "wx/datetime.h"<br> --- 3588,3597 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxTimeSpan & wxUSE_DATETIME<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDateSpan">wxDateSpan</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateSpan & wxUSE_DATETIME<br> <br> <i>%include</i> "wx/datetime.h"<br> *************** *** 3629,3638 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateSpan<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDateTimeHolidayAuthority">wxDateTimeHolidayAuthority</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateTimeHolidayAuthority<br> <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxDateTimeHolidayAuthority">wxDateTimeHolidayAuthority</a></b></font></font><blockquote> --- 3632,3641 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateSpan & wxUSE_DATETIME<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDateTimeHolidayAuthority">wxDateTimeHolidayAuthority</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME<br> <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxDateTimeHolidayAuthority">wxDateTimeHolidayAuthority</a></b></font></font><blockquote> *************** *** 3653,3662 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateTimeHolidayAuthority<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxTimer">wxTimer</a><br> <br> ! <i>%if</i> wxLUA_USE_wxTimer<br> <br> <i>%include</i> "wx/timer.h"<br> --- 3656,3665 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxTimer">wxTimer</a><br> <br> ! <i>%if</i> wxLUA_USE_wxTimer & wxUSE_TIMER<br> <br> <i>%include</i> "wx/timer.h"<br> *************** *** 3688,3697 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxTimer<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxCalendarCtrl">wxCalendarCtrl</a><br> <br> ! <i>%if</i> wxLUA_USE_wxCalendarCtrl<br> <br> <i>%include</i> "wx/calctrl.h"<br> --- 3691,3700 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxTimer & wxUSE_TIMER<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxCalendarCtrl">wxCalendarCtrl</a><br> <br> ! <i>%if</i> wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL<br> <br> <i>%include</i> "wx/calctrl.h"<br> *************** *** 3825,3834 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxCalendarCtrl<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDatePickerCtrl<br> <br> <i>%include</i> "wx/datectrl.h"<br> --- 3828,3837 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL<br> <br> //-----------------------------------------------------------------------------<br> // <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a><br> <br> ! <i>%if</i> wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL<br> <br> <i>%include</i> "wx/datectrl.h"<br> *************** *** 3853,3857 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDatePickerCtrl<br> <br> <HR> --- 3856,3860 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL<br> <br> <HR> *************** *** 7470,7491 **** <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGLCanvas">wxGLCanvas</a></b>, <a href="#wxWindow">wxWindow</a></font></font><blockquote> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <i>%constructor</i> wxGLCanvasFromContext <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <i>%constructor</i> wxGLCanvasFromCCanvas <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> ! <a href="#wxGLContext">wxGLContext</a>* GetContext()<br> void SetCurrent()<br> void SetColour(const <a href="#wxString">wxString</a>& colour)<br> void SwapBuffers()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGLContext">wxGLContext</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> ! <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <i>%constructor</i> wxGLContextOther <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette, const <a href="#wxGLContext">wxGLContext</a>* other)<br> <br> - const <a href="#wxWindow">wxWindow</a>* GetWindow()<br> - void SetCurrent()<br> - void SetColour(const <a href="#wxString">wxString</a>& colour)<br> - void SwapBuffers()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 7473,7505 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGLCanvas">wxGLCanvas</a></b>, <a href="#wxWindow">wxWindow</a></font></font><blockquote> + <font color=#CC3300> // <i>%override</i> Note: attribList[] parameter is a lua table with integer indexes</font><br> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <i>%constructor</i> wxGLCanvasFromContext <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <i>%constructor</i> wxGLCanvasFromCanvas <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> ! <a href="#wxGLContext">wxGLContext</a>* GetContext() const<br> void SetCurrent()<br> + <font color=#CC0033> <i>%wxchkver28</i> <i>%rename</i> SetCurrentContext void SetCurrent(const <a href="#wxGLContext">wxGLContext</a>& RC) const</font><br> void SetColour(const <a href="#wxString">wxString</a>& colour)<br> void SwapBuffers()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGLContext">wxGLContext</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> ! // for <= 2.6<br> ! !<i>%wxchkver28</i> <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! !<i>%wxchkver28</i> <i>%constructor</i> wxGLContextOther <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette, const <a href="#wxGLContext">wxGLContext</a>* other)<br> ! <br> ! !<i>%wxchkver28</i> const <a href="#wxWindow">wxWindow</a>* GetWindow()<br> ! !<i>%wxchkver28</i> void SetCurrent()<br> ! !<i>%wxchkver28</i> void SetColour(const <a href="#wxString">wxString</a>& colour)<br> ! !<i>%wxchkver28</i> void SwapBuffers()<br> ! <br> ! // for >= 2.8<br> ! <br> ! <i>%wxchkver28</i> <a href="#wxGLContext">wxGLContext</a>(<a href="#wxGLCanvas">wxGLCanvas</a> *win, const <a href="#wxGLContext">wxGLContext</a>* other = NULL )<br> ! <br> ! <i>%wxchkver28</i> void SetCurrent(const <a href="#wxGLCanvas">wxGLCanvas</a>& win) const<br> <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 7547,7554 **** <i>%static</i> int GetFromWindow(<a href="#wxWindow">wxWindow</a>* win)<br> <a href="#wxRect">wxRect</a> GetGeometry() const<br> ! <a href="#wxRect">wxRect</a> GetClientArea() const<br> <a href="#wxArrayVideoModes">wxArrayVideoModes</a> GetModes(const <a href="#wxVideoMode">wxVideoMode</a>& mode = wxDefaultVideoMode) const<br> <a href="#wxString">wxString</a> GetName() const<br> ! bool IsOk() const<br> bool IsPrimary()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> --- 7561,7568 ---- <i>%static</i> int GetFromWindow(<a href="#wxWindow">wxWindow</a>* win)<br> <a href="#wxRect">wxRect</a> GetGeometry() const<br> ! <i>%wxchkver_2_8</i> <a href="#wxRect">wxRect</a> GetClientArea() const<br> <a href="#wxArrayVideoModes">wxArrayVideoModes</a> GetModes(const <a href="#wxVideoMode">wxVideoMode</a>& mode = wxDefaultVideoMode) const<br> <a href="#wxString">wxString</a> GetName() const<br> ! bool IsOk() const<br> bool IsPrimary()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> *************** *** 13042,13046 **** --- 13056,13074 ---- <br> <a href="#wxLuaObject">wxLuaObject</a> *GetID()<br> + <br> + // This is an added function to <a href="#wxPrintout">wxPrintout</a> so you don't have to override GetPageInfo<br> void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0)<br> + <br> + // The functions below are all virtual functions that you can override in lua.<br> + // See the printing sample and <a href="#wxPrintout">wxPrintout</a> for proper parameters and usage.<br> + //void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)<br> + //bool HasPage(int pageNum)<br> + //bool OnBeginDocument(int startPage, int endPage)<br> + //void OnEndDocument()<br> + //void OnBeginPrinting()<br> + //void OnEndPrinting()<br> + //void OnPreparePrinting()<br> + //bool OnPrintPage(int pageNum)<br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 13056,13059 **** --- 13084,13095 ---- <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxLuaHtmlWindow">wxLuaHtmlWindow</a></b>, <a href="#wxHtmlWindow">wxHtmlWindow</a></font></font><blockquote> <a href="#wxLuaHtmlWindow">wxLuaHtmlWindow</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const <a href="#wxString">wxString</a>& name = "wxLuaHtmlWindow")<br> + <br> + // The functions below are all virtual functions that you can override in lua.<br> + // See the html sample and <a href="#wxHtmlWindow">wxHtmlWindow</a> for proper parameters and usage.<br> + //bool OnCellClicked(<a href="#wxHtmlCell">wxHtmlCell</a> *cell, wxCoord x, wxCoord y, const <a href="#wxMouseEvent">wxMouseEvent</a>& event)<br> + //void OnCellMouseHover(<a href="#wxHtmlCell">wxHtmlCell</a> *cell, wxCoord x, wxCoord y)<br> + //void OnLinkClicked(const <a href="#wxHtmlLinkInfo">wxHtmlLinkInfo</a>& link)<br> + //void OnSetTitle(const <a href="#wxString">wxString</a>& title)<br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** binding.html 4 Dec 2006 05:54:40 -0000 1.12 --- binding.html 6 Feb 2007 04:17:41 -0000 1.13 *************** *** 88,92 **** 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 customization. </li> <li style="text-align: justify;">Command line usage of --- 88,93 ---- 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 ! customization.</li> <li style="text-align: justify;">Command line usage of *************** *** 235,239 **** <li>A single header file is generated that typically does not have to be included by any files other than those generated by the ! bindings. </li> <ul> --- 236,240 ---- <li>A single header file is generated that typically does not have to be included by any files other than those generated by the ! bindings.</li> <ul> *************** *** 245,249 **** <li>The only function that absolutely must be called is ! wxLuaBinding_[hook_cpp_binding_classname]_init(). It is probably easiest to put <i>extern bool wxLuaBinding_[hook_cpp_binding_classname]_init();</i> in your --- 246,250 ---- <li>The only function that absolutely must be called is ! <b>wxLuaBinding_[hook_cpp_binding_classname]_init()</b>. It is probably easiest to put <i>extern bool wxLuaBinding_[hook_cpp_binding_classname]_init();</i> in your *************** *** 255,259 **** wxLuaBinding derived class that is put into a static wxList of bindings. There should only be one of the binding classes created as ! they all share the same structures anyway. </li> <li><i>static wxLuaBindingList* --- 256,260 ---- wxLuaBinding derived class that is put into a static wxList of bindings. There should only be one of the binding classes created as ! they all share the same structures anyway.</li> <li><i>static wxLuaBindingList* *************** *** 482,487 **** you must use %class ... ns::ClassName and the constructor must also be ! ns::ClassName. ! </li> <li><i><b>%delete</b></i> is for --- 483,487 ---- you must use %class ... ns::ClassName and the constructor must also be ! ns::ClassName. </li> <li><i><b>%delete</b></i> is for *************** *** 744,749 **** functions will be named Get_m_x() and Set_m_x(int x) therefore it is recommended that ! you use ! <i>%rename</i> in conjunction with <i>%member</i>. </li> <li>For example, in wxPoint <i>"%rename X --- 744,749 ---- functions will be named Get_m_x() and Set_m_x(int x) therefore it is recommended that ! you use <i>%rename</i> in conjunction with <i>%member</i>. ! </li> <li>For example, in wxPoint <i>"%rename X *************** *** 967,971 **** </ul> - <i><b>%static var_type ClassMemberFunction(...)</b></i><br> --- 967,970 ---- *************** *** 1040,1044 **** <ul> ! <li>The next item will be <i>#if wxCHECK_VERSION(X,Y,Z).</i> </li> <li>The Y and Z parameters are optional and default to 0.</li> --- 1039,1044 ---- <ul> ! <li>The next item will be <i>#if wxCHECK_VERSION(X,Y,Z).</i> ! </li> <li>The Y and Z parameters are optional and default to 0.</li> *************** *** 1053,1057 **** <li>The next item will be <i>#if ! (defined(WXWIN_COMPATIBILITY_X_Y</i>) && <i>WXWIN_COMPATIBILITY_X_Y)</i>. </li> <li>The tags are defined for --- 1053,1058 ---- <li>The next item will be <i>#if ! (defined(WXWIN_COMPATIBILITY_X_Y</i>) && <i>WXWIN_COMPATIBILITY_X_Y)</i>. ! </li> <li>The tags are defined for *************** *** 1066,1070 **** <li>The next item will be <i>#if ! (defined(WXWIN_COMPATIBILITY_X_Y</i>) && <i>WXWIN_COMPATIBILITY_X_Y)</i>. </li> <li>The rest of the string beyond "%wxcompat" is appended to --- 1067,1072 ---- <li>The next item will be <i>#if ! (defined(WXWIN_COMPATIBILITY_X_Y</i>) && <i>WXWIN_COMPATIBILITY_X_Y)</i>. ! </li> <li>The rest of the string beyond "%wxcompat" is appended to |
|
From: John L. <jr...@us...> - 2007-02-06 04:18:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24793/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua Log Message: cleanup in genwxbind.lua remove whitespace in generated files Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wx_datatypes.lua 18 Jan 2007 17:19:01 -0000 1.45 --- wx_datatypes.lua 6 Feb 2007 04:17:41 -0000 1.46 *************** *** 3471,3474 **** --- 3471,3475 ---- wxUSE_CONTROLS = "wxUSE_CONTROLS", wxUSE_DATAOBJ = "wxUSE_DATAOBJ", + wxUSE_DATEPICKCTRL = "wxUSE_DATEPICKCTRL", wxUSE_DATETIME = "wxUSE_DATETIME", wxUSE_DEBUG_CONTEXT = "wxUSE_DEBUG_CONTEXT", |
|
From: John L. <jr...@us...> - 2007-02-06 04:18:15
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24793/wxLua/bindings Modified Files: genwxbind.lua Log Message: cleanup in genwxbind.lua remove whitespace in generated files Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** genwxbind.lua 17 Dec 2006 07:47:14 -0000 1.93 --- genwxbind.lua 6 Feb 2007 04:17:41 -0000 1.94 *************** *** 55,59 **** -- ---------------------------------------------------------------------------- ! -- helpers for SplitString to make it faster -- ---------------------------------------------------------------------------- --- 55,59 ---- -- ---------------------------------------------------------------------------- ! -- Helpers for SplitString to make it faster -- ---------------------------------------------------------------------------- *************** *** 68,72 **** end ! local string_sub = string.sub -- make local so no table lookup local string_len = string.len local string_byte = string.byte --- 68,73 ---- end ! -- make these string.XXX functions local so there's table lookup ! local string_sub = string.sub local string_len = string.len local string_byte = string.byte *************** *** 173,177 **** -- --------------------------------------------------------------------------- ! -- allocate a data type description table (int, double, class...) -- --------------------------------------------------------------------------- function AllocDataType(name, deftype, is_number, abstract) --- 174,178 ---- -- --------------------------------------------------------------------------- ! -- Allocate a data type description table (int, double, class...) to dataTypeTable -- --------------------------------------------------------------------------- function AllocDataType(name, deftype, is_number, abstract) *************** *** 384,388 **** -- --------------------------------------------------------------------------- ! -- get base type for a data type that is a typedef -- --------------------------------------------------------------------------- function GetTypeDef(datatype) --- 385,389 ---- -- --------------------------------------------------------------------------- ! -- Get base type for a data type that is a typedef -- --------------------------------------------------------------------------- function GetTypeDef(datatype) *************** *** 592,596 **** -- --------------------------------------------------------------------------- ! -- build condition string using condition stack (number indexed lua table) -- --------------------------------------------------------------------------- function BuildCondition(conditionStack) --- 593,597 ---- -- --------------------------------------------------------------------------- ! -- Build condition string using condition stack (number indexed lua table) -- --------------------------------------------------------------------------- function BuildCondition(conditionStack) *************** *** 614,618 **** -- --------------------------------------------------------------------------- ! -- add conditions with &&, either input condition may be nil -- --------------------------------------------------------------------------- function AddCondition(condition1, condition2) --- 615,619 ---- -- --------------------------------------------------------------------------- ! -- Add conditions with &&, either input condition may be nil -- --------------------------------------------------------------------------- function AddCondition(condition1, condition2) *************** *** 731,734 **** --- 732,736 ---- preprocConditionTable["wxUSE_CONTROLS"] = "wxUSE_CONTROLS" preprocConditionTable["wxUSE_DATAOBJ"] = "wxUSE_DATAOBJ" + preprocConditionTable["wxUSE_DATEPICKCTRL"] = "wxUSE_DATEPICKCTRL" preprocConditionTable["wxUSE_DATETIME"] = "wxUSE_DATETIME" preprocConditionTable["wxUSE_DEBUG_CONTEXT"] = "wxUSE_DEBUG_CONTEXT" *************** *** 1063,1067 **** bindingKeywordTable["%rename"] = true bindingKeywordTable["%class"] = true ! -- keywords come after %class tag bindingKeywordTable["%delete"] = true bindingKeywordTable["%noclassinfo"] = true --- 1065,1069 ---- bindingKeywordTable["%rename"] = true bindingKeywordTable["%class"] = true ! -- keywords that come after %class tag bindingKeywordTable["%delete"] = true bindingKeywordTable["%noclassinfo"] = true *************** *** 1089,1093 **** bindingKeywordTable["%includefile"] = true bindingKeywordTable["%define"] = true ! bindingKeywordTable["%string"] = true -- keywords that go with %define bindingKeywordTable["%event"] = true bindingKeywordTable["%object"] = true --- 1091,1096 ---- bindingKeywordTable["%includefile"] = true bindingKeywordTable["%define"] = true ! -- keywords that go with %define ! bindingKeywordTable["%string"] = true bindingKeywordTable["%event"] = true bindingKeywordTable["%object"] = true *************** *** 1242,1251 **** -- Load Override Functions function ReadOverrideFile(override_file) ! local inOverride = false ! local inComment = false ! local filename = interface_filepath.."/"..override_file ! local LineNumber = 0 local OverrideFunc = nil ! local delimiters = {" ", "\t"} if not FileExists(filename) then --- 1245,1254 ---- -- Load Override Functions function ReadOverrideFile(override_file) ! local inOverride = false ! local inComment = false ! local filename = interface_filepath.."/"..override_file ! local LineNumber = 0 local OverrideFunc = nil ! local delimiters = {" ", "\t"} if not FileExists(filename) then *************** *** 1331,1335 **** -- --------------------------------------------------------------------------- ! -- load an interface file creating a table {filename, line number, tags, line} -- --------------------------------------------------------------------------- function ReadInterfaceFile(filename) --- 1334,1338 ---- -- --------------------------------------------------------------------------- ! -- Load an interface file creating a table {filename, line number, tags, line} -- --------------------------------------------------------------------------- function ReadInterfaceFile(filename) *************** *** 1524,1528 **** -- --------------------------------------------------------------------------- ! -- build DataType Table by adding %classes (and their bases), %structs, and %enums -- --------------------------------------------------------------------------- function BuildDataTypeTable(interfaceData) --- 1527,1531 ---- -- --------------------------------------------------------------------------- ! -- Build DataType Table by adding %classes (and their bases), %structs, and %enums -- --------------------------------------------------------------------------- function BuildDataTypeTable(interfaceData) *************** *** 4395,4399 **** end ! function GenerateBindingFileTable(interface) local fileData = {} --- 4398,4404 ---- end ! -- --------------------------------------------------------------------------- ! -- Write Hook file for an interface file ! -- --------------------------------------------------------------------------- function GenerateBindingFileTable(interface) local fileData = {} *************** *** 4466,4473 **** for k, v in pairs_sort(OverloadTableList.Map) do local condition = k ! if overload_condition ~= "" then overload_condition = overload_condition.."||" end ! overload_condition = overload_condition.."("..condition..")" ! overloadCount = overloadCount + 1 + #v end --- 4471,4480 ---- for k, v in pairs_sort(OverloadTableList.Map) do local condition = k ! if HasCondition(condition) then ! if overload_condition ~= "" then overload_condition = overload_condition.."||" end ! overload_condition = overload_condition.."("..condition..")" ! overloadCount = overloadCount + 1 + #v ! end end *************** *** 4491,4495 **** if HasCondition(condition) and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n\n") end end --- 4498,4502 ---- if HasCondition(condition) and (condition ~= object.Condition) then ! table.insert(fileData, "#endif // "..condition.."\n") end end *************** *** 4506,4514 **** table.insert(fileData, "#endif // "..overload_condition.."\n\n") end - end end - table.insert(fileData, "\n\n") -- Output Method Map Table --- 4513,4521 ---- table.insert(fileData, "#endif // "..overload_condition.."\n\n") end end + + table.insert(fileData, "\n\n") end -- Output Method Map Table |
