Menu
▾
▴
[Wxlua-commit] wxLua/samples calculator.wx.lua, 1.8, 1.9 choices.wx.lua, 1.10, 1.11 coroutine.wx.lua, 1.5, 1.6 debug.wx.lua, 1.9, 1.10 dialog.wx.lua, 1.11, 1.12 editor.wx.lua, 1.49, 1.50 fldemo.wx.lua, 1.7, 1.8 grid.wx.lua, 1.8, 1.9 htmlwin.wx.lua, 1.12, 1.13 luamodule.wx.lua, 1.3, 1.4 mdi.wx.lua, 1.11, 1.12 minimal.wx.lua, 1.7, 1.8 printing.wx.lua, 1.12, 1.13 scribble.wx.lua, 1.17, 1.18 sizer.wx.lua, 1.6, 1.7 tree.wx.lua, 1.9, 1.10 unittest.wx.lua, 1.6, 1.7 veryminimal.wx.lua, 1.5, 1.6 wxluasudoku.wx.lua, 1.66, 1.67
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/samples Modified Files: calculator.wx.lua choices.wx.lua coroutine.wx.lua debug.wx.lua dialog.wx.lua editor.wx.lua fldemo.wx.lua grid.wx.lua htmlwin.wx.lua luamodule.wx.lua mdi.wx.lua minimal.wx.lua printing.wx.lua scribble.wx.lua sizer.wx.lua tree.wx.lua unittest.wx.lua veryminimal.wx.lua wxluasudoku.wx.lua Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: sizer.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/sizer.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sizer.wx.lua 26 Sep 2006 22:22:00 -0000 1.6 --- sizer.wx.lua 31 May 2007 17:18:56 -0000 1.7 *************** *** 9,13 **** ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) --- 9,13 ---- ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) *************** *** 18,23 **** -- and padding of 6 pixels. sizerTop = wx.wxBoxSizer(wx.wxVERTICAL) ! sizerTop:AddWindow(textEntry, 3, wx.wxGROW + wx.wxALL, 6) ! sizerTop:AddWindow(button, 5, wx.wxGROW + wx.wxALL, 6) -- Set up the frame to use that sizer to move/resize its children controls --- 18,23 ---- -- and padding of 6 pixels. sizerTop = wx.wxBoxSizer(wx.wxVERTICAL) ! sizerTop:Add(textEntry, 3, wx.wxGROW + wx.wxALL, 6) ! sizerTop:Add(button, 5, wx.wxGROW + wx.wxALL, 6) -- Set up the frame to use that sizer to move/resize its children controls Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** debug.wx.lua 21 Dec 2006 20:14:20 -0000 1.9 --- debug.wx.lua 31 May 2007 17:18:55 -0000 1.10 *************** *** 62,66 **** app:SetAppName("Debug") ! local config = wx.wxConfigGet() config:SetRecordDefaults() --- 62,66 ---- app:SetAppName("Debug") ! local config = wx.wxConfigBase.Get() config:SetRecordDefaults() *************** *** 71,75 **** bitmapDC:SelectObject( bitmap ) ! frame = wx.wxFrame( wx.wxNull, -1, "Scribble Demo (with debugging support)", --- 71,75 ---- bitmapDC:SelectObject( bitmap ) ! frame = wx.wxFrame( wx.NULL, -1, "Scribble Demo (with debugging support)", Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mdi.wx.lua 26 Sep 2006 22:22:00 -0000 1.11 --- mdi.wx.lua 31 May 2007 17:18:56 -0000 1.12 *************** *** 35,39 **** ! frame = wx.wxMDIParentFrame( wx.wxNull, wx.wxID_ANY, "wxLua MDI Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 35,39 ---- ! frame = wx.wxMDIParentFrame( wx.NULL, wx.wxID_ANY, "wxLua MDI Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 65,69 **** function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 65,69 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: fldemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fldemo.wx.lua 7 Dec 2006 06:32:44 -0000 1.7 --- fldemo.wx.lua 31 May 2007 17:18:55 -0000 1.8 *************** *** 79,83 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, -1, "FL Demo", --- 79,83 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, -1, "FL Demo", *************** *** 132,136 **** function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 132,136 ---- function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** choices.wx.lua 26 Sep 2006 22:22:00 -0000 1.10 --- choices.wx.lua 31 May 2007 17:18:55 -0000 1.11 *************** *** 21,25 **** function main() -- create the hierarchy: frame -> notebook ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua Choices", wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) --- 21,25 ---- function main() -- create the hierarchy: frame -> notebook ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices", wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) *************** *** 43,50 **** local listBoxStaticBox = wx.wxStaticBox( panel1, wx.wxID_ANY, "wxListBox") local listBoxStaticBoxSizer = wx.wxStaticBoxSizer( listBoxStaticBox, wx.wxVERTICAL ); ! listBoxStaticBoxSizer:AddWindow(listBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer1:AddWindow(radioBox, 1, wx.wxALL + wx.wxGROW, 5) ! sizer1:AddSizer(listBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel1:SetSizer(sizer1) sizer1:SetSizeHints(panel1) --- 43,50 ---- local listBoxStaticBox = wx.wxStaticBox( panel1, wx.wxID_ANY, "wxListBox") local listBoxStaticBoxSizer = wx.wxStaticBoxSizer( listBoxStaticBox, wx.wxVERTICAL ); ! listBoxStaticBoxSizer:Add(listBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer1:Add(radioBox, 1, wx.wxALL + wx.wxGROW, 5) ! sizer1:Add(listBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel1:SetSizer(sizer1) sizer1:SetSizeHints(panel1) *************** *** 67,83 **** local comboBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxComboBox") local comboBoxStaticBoxSizer = wx.wxStaticBoxSizer( comboBoxStaticBox, wx.wxVERTICAL ); ! comboBoxStaticBoxSizer:AddWindow(comboBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local choiceBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxChoice") local choiceBoxStaticBoxSizer = wx.wxStaticBoxSizer( choiceBoxStaticBox, wx.wxVERTICAL ); ! choiceBoxStaticBoxSizer:AddWindow(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local checkListBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxCheckListBox") local checkListBoxStaticBoxSizer = wx.wxStaticBoxSizer( checkListBoxStaticBox, wx.wxVERTICAL ); ! checkListBoxStaticBoxSizer:AddWindow(checkListBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(checkListBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) --- 67,83 ---- local comboBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxComboBox") local comboBoxStaticBoxSizer = wx.wxStaticBoxSizer( comboBoxStaticBox, wx.wxVERTICAL ); ! comboBoxStaticBoxSizer:Add(comboBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local choiceBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxChoice") local choiceBoxStaticBoxSizer = wx.wxStaticBoxSizer( choiceBoxStaticBox, wx.wxVERTICAL ); ! choiceBoxStaticBoxSizer:Add(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local checkListBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxCheckListBox") local checkListBoxStaticBoxSizer = wx.wxStaticBoxSizer( checkListBoxStaticBox, wx.wxVERTICAL ); ! checkListBoxStaticBoxSizer:Add(checkListBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(checkListBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) Index: veryminimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/veryminimal.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** veryminimal.wx.lua 27 Apr 2006 22:53:36 -0000 1.5 --- veryminimal.wx.lua 31 May 2007 17:18:56 -0000 1.6 *************** *** 15,19 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua Very Minimal Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 15,19 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Very Minimal Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** wxluasudoku.wx.lua 9 Mar 2007 06:10:21 -0000 1.66 --- wxluasudoku.wx.lua 31 May 2007 17:18:56 -0000 1.67 *************** *** 2331,2335 **** if not sudokuGUI.block_refresh then local cell = win:GetId() ! local width, height = win:GetClientSize() sudokuGUI.PaintCell(dc, cell, width, height, sudokuGUI.valueFont, sudokuGUI.possibleFont) end --- 2331,2335 ---- if not sudokuGUI.block_refresh then local cell = win:GetId() ! local width, height = win:GetClientSizeWH() sudokuGUI.PaintCell(dc, cell, width, height, sudokuGUI.valueFont, sudokuGUI.possibleFont) end *************** *** 2410,2414 **** if (not key_table) or (#key_table < 1) then return end ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[colourID], 1, wx.wxSOLID) dc:SetPen(pen) --- 2410,2414 ---- if (not key_table) or (#key_table < 1) then return end ! local pen = wx.wxPen(sudokuGUI.Colours[colourID], 1, wx.wxSOLID) dc:SetPen(pen) *************** *** 2462,2466 **** if show_errors then ! dc:SetPen(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) dc:DrawLine(width, 0, 0, height) --- 2462,2466 ---- if show_errors then ! dc:SetPen(wx.wxPen(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) dc:DrawLine(width, 0, 0, height) *************** *** 2469,2473 **** (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID) dc:SetPen(pen) pen:Delete() --- 2469,2473 ---- (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! local pen = wx.wxPen(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID) dc:SetPen(pen) pen:Delete() *************** *** 2605,2610 **** -- calculate font sizes for the printout, copy font since we'll recalc the size ! local valueFont = { wxfont = wx.wxFontCopy(sudokuGUI.valueFont.wxfont), size = 8, width = 0, height = 0 } ! local possibleFont = { wxfont = wx.wxFontCopy(sudokuGUI.possibleFont.wxfont), size = 6, width = 0, height = 0 } sudokuGUI.DoGetCellBestSize(dc, cell_width, cell_height, valueFont, possibleFont) --- 2605,2610 ---- -- calculate font sizes for the printout, copy font since we'll recalc the size ! local valueFont = { wxfont = wx.wxFont(sudokuGUI.valueFont.wxfont), size = 8, width = 0, height = 0 } ! local possibleFont = { wxfont = wx.wxFont(sudokuGUI.possibleFont.wxfont), size = 6, width = 0, height = 0 } sudokuGUI.DoGetCellBestSize(dc, cell_width, cell_height, valueFont, possibleFont) *************** *** 2634,2638 **** local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! local pen = wx.wxPenFromColour(wx.wxBLACK, iff(borders[i], 4, 2), wx.wxSOLID) dc:SetPen(pen) pen:Delete() --- 2634,2638 ---- local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! local pen = wx.wxPen(wx.wxBLACK, iff(borders[i], 4, 2), wx.wxSOLID) dc:SetPen(pen) pen:Delete() *************** *** 2670,2674 **** sudokuGUI.ConnectPrintEvents(luaPrintPrintout) ! local printDialogData = wx.wxPrintDialogDataFromPrintData(sudokuGUI.printData):GetPrintData() local preview = wx.wxPrintPreview(luaPrintout, luaPrintPrintout, printDialogData) --- 2670,2674 ---- sudokuGUI.ConnectPrintEvents(luaPrintPrintout) ! local printDialogData = wx.wxPrintDialogData(sudokuGUI.printData):GetPrintData() local preview = wx.wxPrintPreview(luaPrintout, luaPrintPrintout, printDialogData) *************** *** 3782,3789 **** local listBoxValues = {} for n = 1, sudokuGUI.COLOUR_MAX do ! table.insert(listBoxValues, {colour = wx.wxColourCopy(sudokuGUI.Colours[n])}) end ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.valueFont.wxfont) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.possibleFont.wxfont) local reset_fonts = true --- 3782,3789 ---- local listBoxValues = {} for n = 1, sudokuGUI.COLOUR_MAX do ! table.insert(listBoxValues, {colour = wx.wxColour(sudokuGUI.Colours[n])}) end ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFont(sudokuGUI.valueFont.wxfont) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFont(sudokuGUI.possibleFont.wxfont) local reset_fonts = true *************** *** 3822,3826 **** local win = event:GetEventObject():DynamicCast("wxWindow") local sel = fcListBox:GetSelection() + 1 ! local width, height = win:GetClientSize() local dc = wx.wxPaintDC(win) --- 3822,3826 ---- local win = event:GetEventObject():DynamicCast("wxWindow") local sel = fcListBox:GetSelection() + 1 ! local width, height = win:GetClientSizeWH() local dc = wx.wxPaintDC(win) *************** *** 3873,3877 **** local function DrawPossible(idx, n, value, hidden) dc:DrawText(value, pos[n].x, pos[n].y) ! local pen = wx.wxPenFromColour(listBoxValues[idx].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() if hidden ~= true then --- 3873,3877 ---- local function DrawPossible(idx, n, value, hidden) dc:DrawText(value, pos[n].x, pos[n].y) ! local pen = wx.wxPen(listBoxValues[idx].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() if hidden ~= true then *************** *** 3890,3894 **** -- draw invalid marker ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() dc:DrawLine(0, 0, width, height) --- 3890,3894 ---- -- draw invalid marker ! local pen = wx.wxPen(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() dc:DrawLine(0, 0, width, height) *************** *** 3961,3981 **** for n = 1, sudokuGUI.COLOUR_MAX do listBoxValues[n].colour:Delete() ! listBoxValues[n].colour = wx.wxColourCopy(sudokuGUI.Colours_[n]) end listBoxValues[sudokuGUI.VALUE_COLOUR].font:Delete() listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font:Delete() ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) elseif ret == wx.wxNO then listBoxValues[sel].colour:Delete() ! listBoxValues[sel].colour = wx.wxColourCopy(sudokuGUI.Colours_[sel]) if (sel == sudokuGUI.VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) elseif (sel == sudokuGUI.POSS_VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) end end --- 3961,3981 ---- for n = 1, sudokuGUI.COLOUR_MAX do listBoxValues[n].colour:Delete() ! listBoxValues[n].colour = wx.wxColour(sudokuGUI.Colours_[n]) end listBoxValues[sudokuGUI.VALUE_COLOUR].font:Delete() listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font:Delete() ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFont(sudokuGUI.valueFont_wxfont_) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFont(sudokuGUI.possibleFont_wxfont_) elseif ret == wx.wxNO then listBoxValues[sel].colour:Delete() ! listBoxValues[sel].colour = wx.wxColour(sudokuGUI.Colours_[sel]) if (sel == sudokuGUI.VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFont(sudokuGUI.valueFont_wxfont_) elseif (sel == sudokuGUI.POSS_VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFont(sudokuGUI.possibleFont_wxfont_) end end *************** *** 3989,4000 **** for n = 1, sudokuGUI.COLOUR_MAX do sudokuGUI.Colours[n]:Delete() ! sudokuGUI.Colours[n] = wx.wxColourCopy(listBoxValues[n].colour) end -- copy the fonts since when applied their size will change sudokuGUI.valueFont.wxfont:Delete() ! sudokuGUI.valueFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.VALUE_COLOUR].font) 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 = {} --- 3989,4000 ---- for n = 1, sudokuGUI.COLOUR_MAX do sudokuGUI.Colours[n]:Delete() ! sudokuGUI.Colours[n] = wx.wxColour(listBoxValues[n].colour) end -- copy the fonts since when applied their size will change sudokuGUI.valueFont.wxfont:Delete() ! sudokuGUI.valueFont.wxfont = wx.wxFont(listBoxValues[sudokuGUI.VALUE_COLOUR].font) sudokuGUI.possibleFont.wxfont:Delete() ! sudokuGUI.possibleFont.wxfont = wx.wxFont(listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font) sudokuGUI.valueFont_cache = {} -- clear cache so GetCellBestSize recreates it sudokuGUI.possibleFont_cache = {} *************** *** 4008,4012 **** end ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() --- 4008,4012 ---- end ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() *************** *** 4247,4253 **** function sudokuGUI.ConfigSave(save_prefs) ! local config = wx.wxConfigGet(false) if not config then ! config = wx.wxConfigCreateFileConfig("wxLuaSudoku", "wxLua") end --- 4247,4253 ---- function sudokuGUI.ConfigSave(save_prefs) ! local config = wx.wxConfigBase.Get(false) if not config then ! config = wx.wxFileConfig("wxLuaSudoku", "wxLua") end *************** *** 4255,4260 **** -- write the frame position so we can restore it ! local x, y = sudokuGUI.frame:GetPosition() ! local w, h = sudokuGUI.frame:GetClientSize() local max = booltoint(sudokuGUI.frame:IsMaximized()) config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max)) --- 4255,4260 ---- -- write the frame position so we can restore it ! local x, y = sudokuGUI.frame:GetPositionXY() ! local w, h = sudokuGUI.frame:GetClientSizeWH() local max = booltoint(sudokuGUI.frame:IsMaximized()) config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max)) *************** *** 4285,4291 **** function sudokuGUI.ConfigLoad() ! local config = wx.wxConfigGet(false) if not config then ! config = wx.wxConfigCreateFileConfig("wxLuaSudoku", "wxLua") end --- 4285,4291 ---- function sudokuGUI.ConfigLoad() ! local config = wx.wxConfigBase.Get(false) if not config then ! config = wx.wxFileConfig("wxLuaSudoku", "wxLua") end *************** *** 4305,4310 **** if h > dispH then h = dispH end ! sudokuGUI.frame:MoveXY(x, y) ! sudokuGUI.frame:SetClientSizeWH(w, h) end end --- 4305,4310 ---- if h > dispH then h = dispH end ! sudokuGUI.frame:Move(x, y) ! sudokuGUI.frame:SetClientSize(w, h) end end *************** *** 4341,4345 **** -- update font size ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) -- update for preferences --- 4341,4345 ---- -- update font size ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) -- update for preferences *************** *** 4383,4387 **** if not ff:Ok() then return end ! local tempF = wx.wxFontCopy(f) f:SetFaceName(face) f:SetFamily(family) --- 4383,4387 ---- if not ff:Ok() then return end ! local tempF = wx.wxFont(f) f:SetFaceName(face) f:SetFamily(family) *************** *** 4502,4519 **** sudokuGUI.Colours_ = {} for n = 1, sudokuGUI.COLOUR_MAX do ! sudokuGUI.Colours_[n] = wx.wxColourCopy(sudokuGUI.Colours[n]) end -- just use defaults since some XP systems may not even have wxMODERN ! sudokuGUI.possibleFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) ! sudokuGUI.valueFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) sudokuGUI.valueFont_wxfont_:SetWeight(wx.wxFONTWEIGHT_BOLD) if not sudokuGUI.valueFont_wxfont_:Ok() then sudokuGUI.valueFont_wxfont_:Destroy() ! sudokuGUI.valueFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) end ! sudokuGUI.possibleFont.wxfont = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) ! sudokuGUI.valueFont.wxfont = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) end --- 4502,4519 ---- sudokuGUI.Colours_ = {} for n = 1, sudokuGUI.COLOUR_MAX do ! sudokuGUI.Colours_[n] = wx.wxColour(sudokuGUI.Colours[n]) end -- just use defaults since some XP systems may not even have wxMODERN ! sudokuGUI.possibleFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) ! sudokuGUI.valueFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) sudokuGUI.valueFont_wxfont_:SetWeight(wx.wxFONTWEIGHT_BOLD) if not sudokuGUI.valueFont_wxfont_:Ok() then sudokuGUI.valueFont_wxfont_:Destroy() ! sudokuGUI.valueFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) end ! sudokuGUI.possibleFont.wxfont = wx.wxFont(sudokuGUI.possibleFont_wxfont_) ! sudokuGUI.valueFont.wxfont = wx.wxFont(sudokuGUI.valueFont_wxfont_) end *************** *** 4606,4610 **** function (event) sudokuGUI.CheckMenuItem(sudokuGUI.ID_SHOW_POSSIBLE_LINE, event:IsChecked()) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width-1, height-1) sudokuGUI.Refresh() --- 4606,4610 ---- function (event) sudokuGUI.CheckMenuItem(sudokuGUI.ID_SHOW_POSSIBLE_LINE, event:IsChecked()) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width-1, height-1) sudokuGUI.Refresh() *************** *** 4756,4760 **** function (event) wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, --- 4756,4760 ---- function (event) wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.\n".. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 4816,4825 **** -- Create the main frame for the program ! sudokuGUI.frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLuaSudoku", wx.wxDefaultPosition, wx.wxSize(300,320)) sudokuGUI.frame:SetSizeHints(300, 300); ! local bitmap = wx.wxBitmapFromXPMData(sudokuGUIxpmdata) ! local icon = wx.wxDefaultIcon() icon:CopyFromBitmap(bitmap) sudokuGUI.frame:SetIcon(icon) --- 4816,4825 ---- -- Create the main frame for the program ! sudokuGUI.frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLuaSudoku", wx.wxDefaultPosition, wx.wxSize(300,320)) sudokuGUI.frame:SetSizeHints(300, 300); ! local bitmap = wx.wxBitmap(sudokuGUIxpmdata) ! local icon = wx.wxIcon() icon:CopyFromBitmap(bitmap) sudokuGUI.frame:SetIcon(icon) *************** *** 4833,4846 **** local fileMenu = wx.wxMenu("", 0) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_NEW, "&New...\tCtrl-N", "Clear the current puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR))) fileMenu:AppendCheckItem(sudokuGUI.ID_CREATE, "&Create...\tCtrl-T", "Enter the initial values for the puzzle") ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_GENERATE, "&Generate...\tCtrl-G", "Generate a new puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR))) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_OPEN, "&Open...\tCtrl-O", "Open a puzzle file", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR))) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_SAVEAS, "&Save as...\tCtrl-S", "Save the current puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_PAGESETUP, "Page S&etup...", "Setup the printout page") --fileMenu:Append(sudokuGUI.ID_PRINTSETUP, "Print Se&tup...", "Setup the printer") fileMenu:Append(sudokuGUI.ID_PRINTPREVIEW, "Print Pre&view...", "Preview the printout") ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_PRINT, "&Print...", "Print the puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_EXIT, "E&xit\tCtrl-X", "Quit the program") --- 4833,4846 ---- local fileMenu = wx.wxMenu("", 0) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_NEW, "&New...\tCtrl-N", "Clear the current puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR))) fileMenu:AppendCheckItem(sudokuGUI.ID_CREATE, "&Create...\tCtrl-T", "Enter the initial values for the puzzle") ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_GENERATE, "&Generate...\tCtrl-G", "Generate a new puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR))) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_OPEN, "&Open...\tCtrl-O", "Open a puzzle file", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR))) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_SAVEAS, "&Save as...\tCtrl-S", "Save the current puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_PAGESETUP, "Page S&etup...", "Setup the printout page") --fileMenu:Append(sudokuGUI.ID_PRINTSETUP, "Print Se&tup...", "Setup the printer") fileMenu:Append(sudokuGUI.ID_PRINTPREVIEW, "Print Pre&view...", "Preview the printout") ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_PRINT, "&Print...", "Print the puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_EXIT, "E&xit\tCtrl-X", "Quit the program") *************** *** 4851,4856 **** editMenu:Append(sudokuGUI.ID_RESET, "Re&set...\tCtrl-R", "Reset the puzzle to the initial state") editMenu:AppendSeparator() ! editMenu:AppendItem(MItem(editMenu, sudokuGUI.ID_UNDO, "&Undo\tCtrl-Z", "Undo the last entry", wx.wxArtProvider_GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR))) ! editMenu:AppendItem(MItem(editMenu, sudokuGUI.ID_REDO, "&Redo\tCtrl-Y", "Redo the last entry", wx.wxArtProvider_GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR))) editMenu:AppendSeparator() editMenu:Append(sudokuGUI.ID_PREFERENCES, "P&references...", "Show the preferences dialog") --- 4851,4856 ---- editMenu:Append(sudokuGUI.ID_RESET, "Re&set...\tCtrl-R", "Reset the puzzle to the initial state") editMenu:AppendSeparator() ! editMenu:Append(MItem(editMenu, sudokuGUI.ID_UNDO, "&Undo\tCtrl-Z", "Undo the last entry", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR))) ! editMenu:Append(MItem(editMenu, sudokuGUI.ID_REDO, "&Redo\tCtrl-Y", "Redo the last entry", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR))) editMenu:AppendSeparator() editMenu:Append(sudokuGUI.ID_PREFERENCES, "P&references...", "Show the preferences dialog") *************** *** 4877,4881 **** userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...", "Set all pencil marks") userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT, "Calculate...", "Initialize pencil marks to calculated possible") ! possibleMenu:AppendMenu(sudokuGUI.ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values") possibleMenu:AppendSeparator() --- 4877,4881 ---- userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...", "Set all pencil marks") userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT, "Calculate...", "Initialize pencil marks to calculated possible") ! possibleMenu:Append(sudokuGUI.ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values") possibleMenu:AppendSeparator() *************** *** 4890,4894 **** possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS, "Mark naked quads", "Mark naked quads in possible values") possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS, "Mark hidden quads", "Mark hidden quads in possible values") ! possibleMenu:AppendMenu(sudokuGUI.ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups") local solveMenu = wx.wxMenu("", 0) --- 4890,4894 ---- possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS, "Mark naked quads", "Mark naked quads in possible values") possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS, "Mark hidden quads", "Mark hidden quads in possible values") ! possibleMenu:Append(sudokuGUI.ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups") local solveMenu = wx.wxMenu("", 0) *************** *** 4907,4911 **** elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values") elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values") ! solveMenu:AppendMenu(sudokuGUI.ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups") solveMenu:AppendSeparator() solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility") --- 4907,4911 ---- elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values") elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values") ! solveMenu:Append(sudokuGUI.ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups") solveMenu:AppendSeparator() solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility") *************** *** 4919,4923 **** local helpMenu = wx.wxMenu("", 0) helpMenu:Append(sudokuGUI.ID_ABOUT, "&About...", "About the wxLuaSudoku Application") ! helpMenu:AppendItem(MItem(helpMenu, sudokuGUI.ID_HELP, "&Help...", "Help using the wxLuaSudoku application", wx.wxArtProvider_GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR))) local menuBar = wx.wxMenuBar() --- 4919,4923 ---- local helpMenu = wx.wxMenu("", 0) helpMenu:Append(sudokuGUI.ID_ABOUT, "&About...", "About the wxLuaSudoku Application") ! helpMenu:Append(MItem(helpMenu, sudokuGUI.ID_HELP, "&Help...", "Help using the wxLuaSudoku application", wx.wxArtProvider.GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR))) local menuBar = wx.wxMenuBar() *************** *** 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,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() *************** *** 5001,5010 **** for i = 1, 81 do local win = sudokuGUI.CreateCellWindow( sudokuGUI.panel, i, size ) ! gridsizer:AddWindow(win, 1, wx.wxALL+wx.wxGROW+ wx.wxALIGN_CENTER, 0) table.insert(sudokuGUI.cellWindows, win) end local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) ! topsizer:AddSizer(gridsizer, 1, wx.wxALL+wx.wxGROW+wx.wxALIGN_CENTER, 0) sudokuGUI.panel:SetSizer( topsizer ) --topsizer:Fit(sudokuGUI.frame) --- 5001,5010 ---- for i = 1, 81 do local win = sudokuGUI.CreateCellWindow( sudokuGUI.panel, i, size ) ! gridsizer:Add(win, 1, wx.wxALL+wx.wxGROW+ wx.wxALIGN_CENTER, 0) table.insert(sudokuGUI.cellWindows, win) end local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) ! topsizer:Add(gridsizer, 1, wx.wxALL+wx.wxGROW+wx.wxALIGN_CENTER, 0) sudokuGUI.panel:SetSizer( topsizer ) --topsizer:Fit(sudokuGUI.frame) *************** *** 5016,5020 **** sudokuGUI.cellWindows[1]:Connect(wx.wxEVT_SIZE, function (event) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() --- 5016,5020 ---- sudokuGUI.cellWindows[1]:Connect(wx.wxEVT_SIZE, function (event) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() *************** *** 5029,5033 **** end ) ! local cell_width, cell_height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(cell_width, cell_height) --sudokuGUI.UpdateTable() --- 5029,5033 ---- end ) ! local cell_width, cell_height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(cell_width, cell_height) --sudokuGUI.UpdateTable() Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tree.wx.lua 1 May 2007 14:23:35 -0000 1.9 --- tree.wx.lua 31 May 2007 17:18:56 -0000 1.10 *************** *** 19,23 **** function main() ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua wxTreeCtrl Sample", wx.wxDefaultPosition, wx.wxSize(450, 400), wx.wxDEFAULT_FRAME_STYLE ) --- 19,23 ---- function main() ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua wxTreeCtrl Sample", wx.wxDefaultPosition, wx.wxSize(450, 400), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 46,50 **** function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 46,50 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 65,70 **** rootSizer:AddGrowableCol(0) rootSizer:AddGrowableRow(0) ! rootSizer:AddWindow( tree, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) ! rootSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) frame:SetSizer( rootSizer ) frame:Layout() -- help sizing the windows before being shown --- 65,70 ---- rootSizer:AddGrowableCol(0) rootSizer:AddGrowableRow(0) ! rootSizer:Add( tree, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) ! rootSizer:Add( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) frame:SetSizer( rootSizer ) frame:Layout() -- help sizing the windows before being shown Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** luamodule.wx.lua 25 May 2006 03:55:23 -0000 1.3 --- luamodule.wx.lua 31 May 2007 17:18:55 -0000 1.4 *************** *** 23,27 **** print("The point is", p:GetX(), p:GetY()) ! frame = wx.wxFrame(wx.wxNull, -1, "wxLua module sample") -- create a simple file menu so you can exit the program nicely --- 23,27 ---- print("The point is", p:GetX(), p:GetY()) ! frame = wx.wxFrame(wx.NULL, -1, "wxLua module sample") -- create a simple file menu so you can exit the program nicely Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** htmlwin.wx.lua 1 May 2007 14:23:35 -0000 1.12 --- htmlwin.wx.lua 31 May 2007 17:18:55 -0000 1.13 *************** *** 51,55 **** if event:GetHtmlParser() and event:GetHtmlParser():GetWindowInterface() and event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() else --- 51,55 ---- if event:GetHtmlParser() and event:GetHtmlParser():GetWindowInterface() and event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() else *************** *** 82,86 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLuaHtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 82,86 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLuaHtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 132,136 **** function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 132,136 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 141,145 **** html = wx.wxLuaHtmlWindow(frame) ! -- Override the virtual function -- virtual void wxLuaHtmlWindow::OnSetTitle(const wxString& title) html.OnSetTitle = function(self, title) --- 141,145 ---- html = wx.wxLuaHtmlWindow(frame) ! -- Override the virtual function -- virtual void wxLuaHtmlWindow::OnSetTitle(const wxString& title) html.OnSetTitle = function(self, title) Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dialog.wx.lua 1 May 2007 14:23:35 -0000 1.11 --- dialog.wx.lua 31 May 2007 17:18:55 -0000 1.12 *************** *** 22,26 **** -- Create the dialog ! dialog = wx.wxDialog(wx.wxNull, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) --- 22,26 ---- -- Create the dialog ! dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) *************** *** 44,50 **** local textCtrl = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER ) local button = wx.wxButton( panel, buttonID, button_text) ! flexGridSizer:AddWindow( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( button, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl --- 44,50 ---- local textCtrl = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER ) local button = wx.wxButton( panel, buttonID, button_text) ! flexGridSizer:Add( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:Add( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:Add( button, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl *************** *** 68,80 **** ]] ! staticBoxSizer:AddSizer( flexGridSizer, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "&About") local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "E&xit") ! buttonSizer:AddWindow( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! buttonSizer:AddWindow( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) --- 68,80 ---- ]] ! staticBoxSizer:Add( flexGridSizer, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "&About") local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "E&xit") ! buttonSizer:Add( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! buttonSizer:Add( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) *************** *** 113,117 **** -- called first and unless we call event:Skip() in their handlers the -- events will never reach this function. Therefore we don't need to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, --- 113,117 ---- -- called first and unless we call event:Skip() in their handlers the -- events will never reach this function. Therefore we don't need to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, *************** *** 180,184 **** function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua Temperature Converter", wx.wxOK + wx.wxICON_INFORMATION, --- 180,184 ---- function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni.\n".. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua Temperature Converter", wx.wxOK + wx.wxICON_INFORMATION, Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** editor.wx.lua 21 May 2007 01:08:00 -0000 1.49 --- editor.wx.lua 31 May 2007 17:18:55 -0000 1.50 *************** *** 101,106 **** -- ASCII values for common chars ! local char_CR = string.byte("\n") ! local char_LF = string.byte("\r") local char_Tab = string.byte("\t") local char_Sp = string.byte(" ") --- 101,106 ---- -- ASCII values for common chars ! local char_CR = string.byte("\r") ! local char_LF = string.byte("\n") local char_Tab = string.byte("\t") local char_Sp = string.byte(" ") *************** *** 177,187 **** editorApp:SetAppName("wxLua IDE") ! config = wx.wxConfigGet() ! config:SetRecordDefaults() -- ---------------------------------------------------------------------------- -- Create the wxFrame -- ---------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua") statusBar = frame:CreateStatusBar( 4 ) --- 177,189 ---- editorApp:SetAppName("wxLua IDE") ! config = wx.wxConfigBase.Get() ! if config then ! config:SetRecordDefaults() ! end -- ---------------------------------------------------------------------------- -- Create the wxFrame -- ---------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua") statusBar = frame:CreateStatusBar( 4 ) *************** *** 193,210 **** -- note: Ususally the bmp size isn't necessary, but the HELP icon is not the right size in MSW local toolBmpSize = toolBar:GetToolBitmapSize() ! toolBar:AddToolSimple(ID_NEW, "New", wx.wxArtProvider_GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_MENU, toolBmpSize), "Create an empty document") ! toolBar:AddToolSimple(ID_OPEN, "Open", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_MENU, toolBmpSize), "Open an existing document") ! toolBar:AddToolSimple(ID_SAVE, "Save", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_SAVE, wx.wxART_MENU, toolBmpSize), "Save the current document") ! toolBar:AddToolSimple(ID_SAVEALL, "Save All", wx.wxArtProvider_GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize), "Save all documents") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_CUT, "Cut", wx.wxArtProvider_GetBitmap(wx.wxART_CUT, wx.wxART_MENU, toolBmpSize), "Cut the selection") ! toolBar:AddToolSimple(ID_COPY, "Copy", wx.wxArtProvider_GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy the selection") ! toolBar:AddToolSimple(ID_PASTE, "Paste", wx.wxArtProvider_GetBitmap(wx.wxART_PASTE, wx.wxART_MENU, toolBmpSize), "Paste text from the clipboard") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_UNDO, "Undo", wx.wxArtProvider_GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last edit") ! toolBar:AddToolSimple(ID_REDO, "Redo", wx.wxArtProvider_GetBitmap(wx.wxART_REDO, wx.wxART_MENU, toolBmpSize), "Redo last undo") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_FIND, "Find", wx.wxArtProvider_GetBitmap(wx.wxART_FIND, wx.wxART_MENU, toolBmpSize), "Find text") ! toolBar:AddToolSimple(ID_REPLACE, "Replace", wx.wxArtProvider_GetBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_MENU, toolBmpSize), "Find and replace text") toolBar:Realize() --- 195,212 ---- -- note: Ususally the bmp size isn't necessary, but the HELP icon is not the right size in MSW local toolBmpSize = toolBar:GetToolBitmapSize() ! toolBar:AddTool(ID_NEW, "New", wx.wxArtProvider.GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_MENU, toolBmpSize), "Create an empty document") ! toolBar:AddTool(ID_OPEN, "Open", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_MENU, toolBmpSize), "Open an existing document") ! toolBar:AddTool(ID_SAVE, "Save", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE, wx.wxART_MENU, toolBmpSize), "Save the current document") ! toolBar:AddTool(ID_SAVEALL, "Save All", wx.wxArtProvider.GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize), "Save all documents") toolBar:AddSeparator() ! toolBar:AddTool(ID_CUT, "Cut", wx.wxArtProvider.GetBitmap(wx.wxART_CUT, wx.wxART_MENU, toolBmpSize), "Cut the selection") ! toolBar:AddTool(ID_COPY, "Copy", wx.wxArtProvider.GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy the selection") ! toolBar:AddTool(ID_PASTE, "Paste", wx.wxArtProvider.GetBitmap(wx.wxART_PASTE, wx.wxART_MENU, toolBmpSize), "Paste text from the clipboard") toolBar:AddSeparator() ! toolBar:AddTool(ID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last edit") ! toolBar:AddTool(ID_REDO, "Redo", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_MENU, toolBmpSize), "Redo last undo") toolBar:AddSeparator() ! toolBar:AddTool(ID_FIND, "Find", wx.wxArtProvider.GetBitmap(wx.wxART_FIND, wx.wxART_MENU, toolBmpSize), "Find text") ! toolBar:AddTool(ID_REPLACE, "Replace", wx.wxArtProvider.GetBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_MENU, toolBmpSize), "Find and replace text") toolBar:Realize() *************** *** 261,265 **** if h > clientHeight then h = clientHeight end ! window:SetSizeXYWH(x, y, w, h) elseif s == 1 then window:Maximize(true) --- 263,267 ---- if h > clientHeight then h = clientHeight end ! window:SetSize(x, y, w, h) elseif s == 1 then window:Maximize(true) *************** *** 274,279 **** local s = 0 ! local w, h = window:GetSize() ! local x, y = window:GetPosition() if window:IsMaximized() then --- 276,281 ---- local s = 0 ! local w, h = window:GetSizeWH() ! local x, y = window:GetPositionXY() if window:IsMaximized() then *************** *** 710,714 **** wx.wxDefaultPosition, wx.wxSize(width, 160)) ! local watchMenu = wx.wxCreateMenu{ { ID_ADDWATCH, "&Add Watch" }, { ID_EDITWATCH, "&Edit Watch\tF2" }, --- 712,716 ---- wx.wxDefaultPosition, wx.wxSize(width, 160)) ! local watchMenu = wx.wxMenu{ { ID_ADDWATCH, "&Add Watch" }, { ID_EDITWATCH, "&Edit Watch\tF2" }, *************** *** 821,825 **** menuBar = wx.wxMenuBar() ! fileMenu = wx.wxCreateMenu{ { ID_NEW, "&New\tCtrl-N", "Create an empty document" }, { ID_OPEN, "&Open...\tCtrl-O", "Open an existing document" }, --- 823,827 ---- menuBar = wx.wxMenuBar() ! fileMenu = wx.wxMenu({ { ID_NEW, "&New\tCtrl-N", "Create an empty document" }, { ID_OPEN, "&Open...\tCtrl-O", "Open an existing document" }, *************** *** 830,834 **** { ID_SAVEALL, "Save A&ll...\tCtrl-Shift-S", "Save all open documents" }, { }, ! { ID_EXIT, "E&xit\tAlt-X", "Exit Program" }} menuBar:Append(fileMenu, "&File") --- 832,836 ---- { ID_SAVEALL, "Save A&ll...\tCtrl-Shift-S", "Save all open documents" }, { }, ! { ID_EXIT, "E&xit\tAlt-X", "Exit Program" }}) menuBar:Append(fileMenu, "&File") *************** *** 1117,1121 **** -- Create the Edit menu and attach the callback functions ! editMenu = wx.wxCreateMenu{ { ID_CUT, "Cu&t\tCtrl-X", "Cut selected text to clipboard" }, { ID_COPY, "&Copy\tCtrl-C", "Copy selected text to the clipboard" }, --- 1119,1123 ---- -- Create the Edit menu and attach the callback functions ! editMenu = wx.wxMenu{ { ID_CUT, "Cu&t\tCtrl-X", "Cut selected text to... [truncated message content] |
