Menu
▾
▴
[Wxlua-commit] wxLua/samples dialog.wx.lua, 1.13, 1.14 scribble.wx.lua, 1.22, 1.23 validator.wx.lua, 1.4, 1.5
|
From: John L. <jr...@us...> - 2007-07-22 04:38:37
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/samples Modified Files: dialog.wx.lua scribble.wx.lua validator.wx.lua Log Message: Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it Fixes removing derived methods for the %ungc binding tag Index: validator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/validator.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** validator.wx.lua 16 Jul 2007 19:35:32 -0000 1.4 --- validator.wx.lua 22 Jul 2007 04:38:31 -0000 1.5 *************** *** 148,158 **** local s = "" ! s = s.."wxCheckBox : '"..tostring(checkObj:GetObject()).."', Initial value : '"..tostring(check_val).."'\n\n" ! s = s.."wxComboBox : '"..tostring(comboObj:GetObject()).."', Initial value : '"..tostring(combo_val).."'\n\n" ! s = s.."wxTextCtrl : '"..tostring(textObj:GetObject()).."', Initial value : '"..tostring(text_val).."'\n\n" ! s = s.."wxScrollBar : '"..tostring(scrollObj:GetObject()).."', Initial value : '"..tostring(scroll_val).."'\n\n" ! s = s.."wxCheckListBox : '"..table.concat(checklObj:GetObject(), ", ").."', Initial value : '"..table.concat(checkl_val, ", ").."'\n\n" ! s = s.."wxTextCtrl alpha chars only: '"..tostring(textAlphaObj:GetObject()).."', Initial value : '"..tostring(text_alpha_val).."'\n\n" frameText:SetValue(s) --- 148,158 ---- local s = "" ! s = s.."wxCheckBox : '"..tostring(checkObj:GetObject()).."'\nInitial value : '"..tostring(check_val).."'\n\n" ! s = s.."wxComboBox : '"..tostring(comboObj:GetObject()).."'\nInitial value : '"..tostring(combo_val).."'\n\n" ! s = s.."wxTextCtrl : '"..tostring(textObj:GetObject()).."'\nInitial value : '"..tostring(text_val).."'\n\n" ! s = s.."wxScrollBar : '"..tostring(scrollObj:GetObject()).."'\nInitial value : '"..tostring(scroll_val).."'\n\n" ! s = s.."wxCheckListBox : '"..table.concat(checklObj:GetObject(), ", ").."'\nInitial value : '"..table.concat(checkl_val, ", ").."'\n\n" ! s = s.."wxTextCtrl alpha chars only: '"..tostring(textAlphaObj:GetObject()).."'\nInitial value : '"..tostring(text_alpha_val).."'\n\n" frameText:SetValue(s) Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** dialog.wx.lua 16 Jul 2007 19:35:31 -0000 1.13 --- dialog.wx.lua 22 Jul 2007 04:38:30 -0000 1.14 *************** *** 21,25 **** ID_CLOSE_BUTTON = 10 ! -- Create the dialog dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) --- 21,28 ---- ID_CLOSE_BUTTON = 10 ! ID__MAX = 11 -- max of our window ids ! ! -- Create the dialog, there's no reason why we couldn't use a wxFrame and ! -- a frame would probably be a better choice. dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) *************** *** 42,46 **** function AddConverterControl(name_string, button_text, textCtrlID, buttonID) local staticText = wx.wxStaticText( panel, wx.wxID_ANY, name_string) ! 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 ) --- 45,49 ---- function AddConverterControl(name_string, button_text, textCtrlID, buttonID) local staticText = wx.wxStaticText( panel, wx.wxID_ANY, name_string) ! local textCtrl = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_PROCESS_ENTER ) local button = wx.wxButton( panel, buttonID, button_text) flexGridSizer:Add( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) *************** *** 117,120 **** --- 120,130 ---- dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) + -- NOTE: A wxID_CANCEL event is sent when the close button on the + -- dialog is pressed. + if event:GetId() >= ID__MAX then + event:Skip() + return + end + -- We know that the textctrl window ids are +1 from the button ids local T = tonumber(dialog:FindWindow(event:GetId()+1):DynamicCast("wxTextCtrl"):GetValue()) Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** scribble.wx.lua 16 Jul 2007 19:35:32 -0000 1.22 --- scribble.wx.lua 22 Jul 2007 04:38:30 -0000 1.23 *************** *** 130,133 **** --- 130,142 ---- end + function GetBitmap() + local w, h = panel:GetClientSizeWH() + local bmp = wx.wxBitmap(w, h) + lastDrawn = 0 -- force redrawing all points + DrawBitmap(bmp) + lastDrawn = 0 -- force redrawing all points + return bmp + end + -- --------------------------------------------------------------------------- -- Mouse functions *************** *** 317,320 **** --- 326,331 ---- --editMenu:Append(ID_PENSTYLE, "Set &Style\tCtrl+Y", "Set style of the pen to draw with") editMenu:AppendSeparator() + editMenu:Append(wx.wxID_COPY, "Copy to clipboard\tCtrl-C", "Copy current image to the clipboard") + editMenu:AppendSeparator() editMenu:Append(wx.wxID_UNDO, "&Undo\tCtrl-Z", "Undo last drawn segment") *************** *** 338,341 **** --- 349,354 ---- toolBar:AddTool(wx.wxID_SAVEAS, "Save as", wx.wxArtProvider.GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize), "Save the current scribble to a new file") toolBar:AddSeparator() + toolBar:AddTool(wx.wxID_COPY, "Copy", wx.wxArtProvider.GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy image to clipboard") + toolBar:AddSeparator() toolBar:AddTool(wx.wxID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last line drawn") toolBar:AddSeparator() *************** *** 510,519 **** wx.wxSAVE + wx.wxOVERWRITE_PROMPT) if fileDialog:ShowModal() == wx.wxID_OK then ! local w, h = panel:GetClientSizeWH() ! local bmp = wx.wxBitmap(w, h) ! lastDrawn = 0 -- force redrawing all points ! DrawBitmap(bmp) ! lastDrawn = 0 -- force redrawing all points ! local img = bmp:ConvertToImage() if not img:SaveFile(fileDialog:GetPath()) then --- 523,527 ---- wx.wxSAVE + wx.wxOVERWRITE_PROMPT) if fileDialog:ShowModal() == wx.wxID_OK then ! local bmp = GetBitmap() local img = bmp:ConvertToImage() if not img:SaveFile(fileDialog:GetPath()) then *************** *** 578,581 **** --- 586,601 ---- end ) + frame:Connect(wx.wxID_COPY, wx.wxEVT_COMMAND_MENU_SELECTED, + function (event) + local clipBoard = wx.wxClipboard.Get() + if clipBoard and clipBoard:Open() then + local bmp = GetBitmap() + clipBoard:SetData(wx.wxBitmapDataObject(bmp)) + bmp:delete() + + clipBoard:Close() + end + end) + frame:Connect(wx.wxID_UNDO, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) |
