Menu
▾
▴
[Wxlua-commit] wxLua/samples bindings.wx.lua, 1.3, 1.4 debug.wx.lua, 1.11, 1.12 printing.wx.lua, 1.14, 1.15 unittest.wx.lua, 1.9, 1.10 validator.wx.lua, 1.1, 1.2 wxluasudoku.wx.lua, 1.69, 1.70
|
From: John L. <jr...@us...> - 2007-06-12 00:08:47
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4216/wxLua/samples Modified Files: bindings.wx.lua debug.wx.lua printing.wx.lua unittest.wx.lua validator.wx.lua wxluasudoku.wx.lua Log Message: Change wxLuaState::AddTrackedWindow to take a wxObject and figure out inside if it's a window Change the nomenclature "enum" to "integer" as the integer data type Change "base_"XXX to "_"XXX for base class function calls Add a test function to wxLuaPrintout to really check if virtual functions work More fixes to samples for binding changes Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** debug.wx.lua 31 May 2007 21:38:49 -0000 1.11 --- debug.wx.lua 12 Jun 2007 00:08:42 -0000 1.12 *************** *** 41,50 **** userdata.GetClassInfo = function(self) ! results.refData3 = self:base_GetClassInfo() return 1 end results.refData1 = userdata:GetClassInfo() ! results.refData2 = userdata:base_GetClassInfo() wxLuaStackDialog() --- 41,50 ---- userdata.GetClassInfo = function(self) ! results.refData3 = self:_GetClassInfo() return 1 end results.refData1 = userdata:GetClassInfo() ! results.refData2 = userdata:_GetClassInfo() wxLuaStackDialog() Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bindings.wx.lua 11 Jun 2007 03:58:11 -0000 1.3 --- bindings.wx.lua 12 Jun 2007 00:08:42 -0000 1.4 *************** *** 592,596 **** "WXLUAARG_UserData", "WXLUAARG_LuaThread", ! "WXLUAARG_Enum" } --- 592,596 ---- "WXLUAARG_UserData", "WXLUAARG_LuaThread", ! "WXLUAARG_Integer" } Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wxluasudoku.wx.lua 5 Jun 2007 21:07:26 -0000 1.69 --- wxluasudoku.wx.lua 12 Jun 2007 00:08:42 -0000 1.70 *************** *** 2711,2716 **** local pageSetupDialog = wx.wxPageSetupDialog(sudokuGUI.frame, sudokuGUI.pageSetupData) pageSetupDialog:ShowModal() ! sudokuGUI.printData = pageSetupDialog:GetPageSetupData():GetPrintData():Copy() ! sudokuGUI.pageSetupData = pageSetupDialog:GetPageSetupData():Copy() --pageSetupDialog:Destroy() end --- 2711,2716 ---- local pageSetupDialog = wx.wxPageSetupDialog(sudokuGUI.frame, sudokuGUI.pageSetupData) pageSetupDialog:ShowModal() ! sudokuGUI.printData = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy() ! sudokuGUI.pageSetupData = pageSetupDialog:GetPageSetupDialogData():Copy() --pageSetupDialog:Destroy() end *************** *** 3801,3821 **** local fcListBox = wx.wxListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) fcListBox:SetSelection(0) ! fcFlexSizer:AddWindow( fcListBox, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) local fcBoxSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local sampleWin = wx.wxWindow(panel, ID_SAMPLE_TEXT, wx.wxDefaultPosition, wx.wxSize(140,140)) ! fcBoxSizer:AddWindow( sampleWin, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ); local fontButton = wx.wxButton( panel, ID_FONT_BUTTON, "Choose Font", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:AddWindow( fontButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) local colourButton = wx.wxButton( panel, ID_COLOUR_BUTTON, "Choose Color", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:AddWindow( colourButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) local resetButton = wx.wxButton( panel, ID_RESET_BUTTON, "Reset Value...", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:AddWindow( resetButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! fcFlexSizer:AddSizer( fcBoxSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( fcFlexSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL, 5 ) panel:SetSizer( mainSizer ) --- 3801,3821 ---- local fcListBox = wx.wxListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) fcListBox:SetSelection(0) ! fcFlexSizer:Add( fcListBox, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) local fcBoxSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local sampleWin = wx.wxWindow(panel, ID_SAMPLE_TEXT, wx.wxDefaultPosition, wx.wxSize(140,140)) ! fcBoxSizer:Add( sampleWin, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ); local fontButton = wx.wxButton( panel, ID_FONT_BUTTON, "Choose Font", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:Add( fontButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) local colourButton = wx.wxButton( panel, ID_COLOUR_BUTTON, "Choose Color", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:Add( colourButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) local resetButton = wx.wxButton( panel, ID_RESET_BUTTON, "Reset Value...", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! fcBoxSizer:Add( resetButton, 0, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! fcFlexSizer:Add( fcBoxSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( fcFlexSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER_VERTICAL, 5 ) panel:SetSizer( mainSizer ) *************** *** 4073,4077 **** local mainSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local showListBox = wx.wxCheckListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) ! mainSizer:AddWindow( showListBox, 1, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) --- 4073,4077 ---- local mainSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local showListBox = wx.wxCheckListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) ! mainSizer:Add( showListBox, 1, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) *************** *** 4143,4147 **** local mainSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local showListBox = wx.wxCheckListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) ! mainSizer:AddWindow( showListBox, 1, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) --- 4143,4147 ---- local mainSizer = wx.wxBoxSizer( wx.wxVERTICAL ) local showListBox = wx.wxCheckListBox( panel, ID_LISTBOX, wx.wxDefaultPosition, wx.wxSize(80,100), listStrings, wx.wxLB_SINGLE ) ! mainSizer:Add( showListBox, 1, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) *************** *** 4205,4216 **** local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local okButton = wx.wxButton( panel, wx.wxID_OK, "&OK", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:AddWindow( okButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) local cancelButton = wx.wxButton( panel, wx.wxID_CANCEL, "&Cancel", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:AddWindow( cancelButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) local applyButton = wx.wxButton( panel, wx.wxID_APPLY, "&Apply", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:AddWindow( applyButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddWindow( notebook, 1, wx.wxGROW+wx.wxALIGN_CENTER, 0 ) ! mainSizer:AddSizer( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) mainSizer:SetSizeHints( dialog ) --- 4205,4216 ---- local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local okButton = wx.wxButton( panel, wx.wxID_OK, "&OK", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:Add( okButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) local cancelButton = wx.wxButton( panel, wx.wxID_CANCEL, "&Cancel", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:Add( cancelButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) local applyButton = wx.wxButton( panel, wx.wxID_APPLY, "&Apply", wx.wxDefaultPosition, wx.wxDefaultSize, 0 ) ! buttonSizer:Add( applyButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( notebook, 1, wx.wxGROW+wx.wxALIGN_CENTER, 0 ) ! mainSizer:Add( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) mainSizer:SetSizeHints( dialog ) *************** *** 4536,4542 **** function (event) local str = sudoku.ToString(sudokuGUI.GetCurrentTable()) ! if wx.wxClipboard_Get():Open() then ! wx.wxClipboard_Get():SetData(wx.wxTextDataObject(str)) ! wx.wxClipboard_Get():Close() end end --- 4536,4542 ---- function (event) local str = sudoku.ToString(sudokuGUI.GetCurrentTable()) ! if wx.wxClipboard.Get():Open() then ! wx.wxClipboard.Get():SetData(wx.wxTextDataObject(str)) ! wx.wxClipboard.Get():Close() end end *************** *** 4932,4946 **** local toolBar = sudokuGUI.frame:CreateToolBar(wx.wxNO_BORDER) -- + wx.wxTB_FLAT + wx.wxTB_DOCKABLE) ! toolBar:AddTool(sudokuGUI.ID_NEW, "New", wx.wxArtProvider.GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Clear the current puzzle", "Clear the current puzzle") ! toolBar:AddCheckTool(sudokuGUI.ID_CREATE, "Create", wx.wxArtProvider.GetBitmap(wx.wxART_ADD_BOOKMARK, wx.wxART_TOOLBAR), wx.wxNullBitmap, "Enter initial values for the puzzle", "Enter initial values for the puzzle") ! toolBar:AddTool(sudokuGUI.ID_GENERATE, "Generate", wx.wxArtProvider.GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Generate a new puzzle", "Generate a new puzzle") ! toolBar:AddTool(sudokuGUI.ID_OPEN, "Open", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Open a puzzle file", "Open a puzzle file") ! toolBar:AddTool(sudokuGUI.ID_SAVEAS, "Save", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Save the current puzzle", "Save the current puzzle") ! toolBar:AddTool(sudokuGUI.ID_PRINT, "Print", wx.wxArtProvider.GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Print the puzzle", "Print the puzzle") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Undo the last entry", "Undo the last entry") ! toolBar:AddTool(sudokuGUI.ID_REDO, "Redo", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Redo the last entry", "Redo the last entry") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_HELP, "Help", wx.wxArtProvider.GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Help on wxLuaSudoku", "Help on wxLuaSudoku") toolBar:Realize() --- 4932,4947 ---- local toolBar = sudokuGUI.frame:CreateToolBar(wx.wxNO_BORDER) -- + wx.wxTB_FLAT + wx.wxTB_DOCKABLE) ! local tbSize = toolBar:GetToolBitmapSize() -- required to force help icon to right size in MSW ! toolBar:AddTool(sudokuGUI.ID_NEW, "New", wx.wxArtProvider.GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Clear the current puzzle", "Clear the current puzzle") ! toolBar:AddCheckTool(sudokuGUI.ID_CREATE, "Create", wx.wxArtProvider.GetBitmap(wx.wxART_ADD_BOOKMARK, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, "Enter initial values for the puzzle", "Enter initial values for the puzzle") ! toolBar:AddTool(sudokuGUI.ID_GENERATE, "Generate", wx.wxArtProvider.GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Generate a new puzzle", "Generate a new puzzle") ! toolBar:AddTool(sudokuGUI.ID_OPEN, "Open", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Open a puzzle file", "Open a puzzle file") ! toolBar:AddTool(sudokuGUI.ID_SAVEAS, "Save", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Save the current puzzle", "Save the current puzzle") ! toolBar:AddTool(sudokuGUI.ID_PRINT, "Print", wx.wxArtProvider.GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Print the puzzle", "Print the puzzle") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Undo the last entry", "Undo the last entry") ! toolBar:AddTool(sudokuGUI.ID_REDO, "Redo", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Redo the last entry", "Redo the last entry") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_HELP, "Help", wx.wxArtProvider.GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR, tbSize), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Help on wxLuaSudoku", "Help on wxLuaSudoku") toolBar:Realize() *************** *** 5033,5037 **** --sudokuGUI.UpdateTable() ! sudokuGUI.frame:SetClientSize(wx.wxSize(300,300)) sudokuGUI.block_refresh = false sudokuGUI.ConfigLoad() --- 5034,5038 ---- --sudokuGUI.UpdateTable() ! sudokuGUI.frame:SetClientSize(300,300) sudokuGUI.block_refresh = false sudokuGUI.ConfigLoad() Index: validator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/validator.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** validator.wx.lua 11 Jun 2007 03:58:11 -0000 1.1 --- validator.wx.lua 12 Jun 2007 00:08:42 -0000 1.2 *************** *** 46,50 **** scroll_val = 10 checkl_val = { 0, 2 } ! text_alpha_val = "OnlyAlphabetCharsAllowed" checkObj = wx.wxLuaObject(check_val) --- 46,50 ---- scroll_val = 10 checkl_val = { 0, 2 } ! text_alpha_val = "DeleteSpace OnlyAlphabetCharsAllowed" checkObj = wx.wxLuaObject(check_val) *************** *** 83,87 **** textAlphaCtrl = wx.wxTextCtrl(dialog, ID_TEXTCTRL, "THIS WILL BE OVERWRITTEN", ! wx.wxDefaultPosition, wx.wxDefaultSize, 0, wx.wxTextValidator(wx.wxFILTER_ALPHA, textAlphaObj)) --- 83,87 ---- textAlphaCtrl = wx.wxTextCtrl(dialog, ID_TEXTCTRL, "THIS WILL BE OVERWRITTEN", ! wx.wxDefaultPosition, wx.wxSize(400, -1), 0, wx.wxTextValidator(wx.wxFILTER_ALPHA, textAlphaObj)) *************** *** 113,117 **** "wxLua Validator Demo", -- caption on the frame wx.wxDefaultPosition, -- let system place the frame ! wx.wxSize(450, 450), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles --- 113,117 ---- "wxLua Validator Demo", -- caption on the frame wx.wxDefaultPosition, -- let system place the frame ! wx.wxSize(450, 420), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unittest.wx.lua 11 Jun 2007 03:58:11 -0000 1.9 --- unittest.wx.lua 12 Jun 2007 00:08:42 -0000 1.10 *************** *** 88,91 **** --- 88,102 ---- b = wx.wxArrayString(a) PrintOk((b:Item(1) == "b") and (b:GetCount() == 3), "Test automatic overload of wxArrayString(wxArrayString)") + b = a:ToLuaTable() + PrintOk((b[2] == "b") and (#b == 3), "Test wxArrayString::ToLuaTable()") + + a = wx.wxSortedArrayString(wx.wxArrayString({"c", "b", "a"})) + PrintOk((a:Item(0) == "a") and (a:GetCount() == 3), "Test automatic overload of wxSortedArrayString(wxArrayString(lua table))") + a = wx.wxSortedArrayString({"c", "b", "a"}) + PrintOk((a:Item(0) == "a") and (a:GetCount() == 3), "Test automatic overload of wxSortedArrayString(lua table)") + b = wx.wxSortedArrayString(a) + PrintOk((b:Item(1) == "b") and (b:GetCount() == 3), "Test automatic overload of wxSortedArrayString(wxSortedArrayString)") + b = a:ToLuaTable() + PrintOk((b[2] == "b") and (#b == 3), "Test wxSortedArrayString::ToLuaTable()") a = wx.wxArrayInt({1, 2, 3}) *************** *** 93,96 **** --- 104,109 ---- b = wx.wxArrayInt(a) PrintOk((b:Item(1) == 2) and (b:GetCount() == 3), "Test automatic overload of wxArrayInt(wxArrayInt)") + b = a:ToLuaTable() + PrintOk((b[2] == 2) and (#b == 3), "Test wxArrayInt::ToLuaTable()") -- --------------------------------------------------------------------------- *************** *** 149,154 **** -- --------------------------------------------------------------------------- ! ! print("\nTest adding a functions to a class object userdata.\n") -- --------------------------------------------------------------------------- --- 162,166 ---- -- --------------------------------------------------------------------------- ! print("\nTest adding a methods to a class object userdata.\n") -- --------------------------------------------------------------------------- *************** *** 157,166 **** 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") --- 169,200 ---- PrintOk(a:Print() == "1,2,3,4", "Add a new lua function to an already created wx.wxRect") + a.value = 5 + PrintOk(a.value == 5, "Add a number value 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:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function") PrintOk(a:GetX() == "x", "Replace wxRect:GetX with a lua function (test recursion)") ! PrintOk(a:_GetX() == 1, "Replace wxRect:GetX with a lua function, call wxRect:_GetX for original function (test recursion)") ! ! -- --------------------------------------------------------------------------- ! print("\nTest virtual class functions and calling base class functions.\n") ! -- --------------------------------------------------------------------------- ! ! a = wx.wxLuaPrintout() ! PrintOk(a:TestVirtualFunctionBinding("Hello") == "Hello-Base", "Test wxLuaPrintout::TestVirtualFunctionBinding without overriding it.") ! PrintOk(a:_TestVirtualFunctionBinding("Hello") == "Hello-Base", "Test wxLuaPrintout::_TestVirtualFunctionBinding without overriding it.") ! ! a.TestVirtualFunctionBinding = function(self, val) return val.."-Lua" end ! PrintOk(a:TestVirtualFunctionBinding("Hello") == "Hello-Lua", "Test wxLuaPrintout::TestVirtualFunctionBinding overriding it, but not calling base.") ! PrintOk(a:_TestVirtualFunctionBinding("Hello") == "Hello-Base", "Test wxLuaPrintout::_TestVirtualFunctionBinding overriding it, but directly calling the base.") ! ! a.TestVirtualFunctionBinding = function(self, val) ! return self:_TestVirtualFunctionBinding(val).."-Lua" ! end ! PrintOk(a:TestVirtualFunctionBinding("Hello") == "Hello-Base-Lua", "Test wxLuaPrintout::TestVirtualFunctionBinding overriding it and calling base.") ! ! print("\n") Index: printing.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** printing.wx.lua 11 Jun 2007 03:58:11 -0000 1.14 --- printing.wx.lua 12 Jun 2007 00:08:42 -0000 1.15 *************** *** 64,72 **** printOut.OnBeginDocument = function(self, startPage, endPage) ! return self:base_OnBeginDocument(startPage, endPage) end printOut.OnEndDocument = function(self) ! return self:base_OnEndDocument() end --- 64,72 ---- printOut.OnBeginDocument = function(self, startPage, endPage) ! return self:_OnBeginDocument(startPage, endPage) end printOut.OnEndDocument = function(self) ! return self:_OnEndDocument() end |
