[Wxlua-commit] wxLua/samples catch.lua,1.1,1.2

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/samples
In directory vz-cvs-4.sog:/tmp/cvs-serv5532/samples

Modified Files:
	catch.lua 
Log Message:
Delete wxBrush after use and only need single status bar field.


Index: catch.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/catch.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** catch.lua	9 Nov 2010 05:03:22 -0000	1.1
--- catch.lua	14 Jun 2011 03:33:29 -0000	1.2
***************
*** 231,235 ****
      self.post = {}
      for i= 1, 10 + self.maxHoleMoved  do
!         local post = Occupant:new{bitmap = bitmapPost}
          repeat until self:Place(post, self:RandomRC())
          table.insert(self.post, post)
--- 231,235 ----
      self.post = {}
      for i= 1, 10 + self.maxHoleMoved  do
!         local post = Occupant:new({bitmap = bitmapPost})
          repeat until self:Place(post, self:RandomRC())
          table.insert(self.post, post)
***************
*** 250,255 ****
  function main()
      bitmapPost = wx.wxBitmap(xpm('wall'))
!     Person = Occupant:new{bitmap = wx.wxBitmap(xpm('Person'))}
!     Present = Occupant:new{bitmap = wx.wxBitmap(xpm('Present'))}       
      frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Catch the present", 
                         wx.wxDefaultPosition, wx.wxDefaultSize,
--- 250,255 ----
  function main()
      bitmapPost = wx.wxBitmap(xpm('wall'))
!     Person = Occupant:new({bitmap = wx.wxBitmap(xpm('Person'))})
!     Present = Occupant:new({bitmap = wx.wxBitmap(xpm('Present'))})       
      frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Catch the present", 
                         wx.wxDefaultPosition, wx.wxDefaultSize,
***************
*** 283,287 ****
      if (wx.wxJoystick.GetNumberJoysticks() == 0) then menuBar:EnableTop(2, false) end
      -- Create the statusbar
!     local statusBar = frame:CreateStatusBar(2)
      frame:SetStatusText("Welcome to Catch.")
  
--- 283,287 ----
      if (wx.wxJoystick.GetNumberJoysticks() == 0) then menuBar:EnableTop(2, false) end
      -- Create the statusbar
!     local statusBar = frame:CreateStatusBar(1)
      frame:SetStatusText("Welcome to Catch.")
  
***************
*** 311,315 ****
                  offScreenBitmap = nil
              end
!             soundTata:delete()
              if timer then
                  timer:Stop() -- always stop before exiting or deleting it
--- 311,316 ----
                  offScreenBitmap = nil
              end
!             soundTata:delete()
!             soundRecycle:delete()
              if timer then
                  timer:Stop() -- always stop before exiting or deleting it
***************
*** 410,418 ****
      local dc = wx.wxMemoryDC()       -- create off screen dc to draw on
      dc:SelectObject(bmp)             -- select our bitmap to draw into
!     dc:SetBackground(wx.wxBrush('turquoise', wx.wxSOLID))
      dc:Clear()
      self:Draw(dc)
      dc:SelectObject(wx.wxNullBitmap) -- always release bitmap
!     dc:delete() -- ALWAYS delete() any wxDCs created when done
  end
  
--- 411,421 ----
      local dc = wx.wxMemoryDC()       -- create off screen dc to draw on
      dc:SelectObject(bmp)             -- select our bitmap to draw into
!     local brush = wx.wxBrush('turquoise', wx.wxSOLID)
!     dc:SetBackground(brush)
      dc:Clear()
      self:Draw(dc)
      dc:SelectObject(wx.wxNullBitmap) -- always release bitmap
!     dc:delete()    -- ALWAYS delete() any wxDCs created when done
!     brush:delete() -- ALWAYS delete() all GDI objects
  end