[Wxlua-commit] wxLua/samples printing.wx.lua,1.19,1.20

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

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

Modified Files:
	printing.wx.lua 
Log Message:
wxPrintSetupDialog and wxPrintDialog are derived from wxObject so we can/should delete() them.


Index: printing.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** printing.wx.lua	22 Feb 2008 19:04:32 -0000	1.19
--- printing.wx.lua	16 Nov 2011 04:40:48 -0000	1.20
***************
*** 194,203 ****
  
  function PrintSetup()
!     -- NOTE : this function crashes in wxWidgets GTK wxWidgets 2.8.2
      local printDialogData = wx.wxPrintDialogData(printData)
      local printerDialog   = wx.wxPrintDialog(frame, printDialogData)
!     --printerDialog:GetPrintDialogData():SetSetupDialog(true)
!     printerDialog:ShowModal()
!     printData = printerDialog:GetPrintDialogData():GetPrintData():Copy()
  end
  
--- 194,205 ----
  
  function PrintSetup()
!     -- NOTE : This function crashes in wxWidgets GTK wxWidgets 2.8.12
!     --        The wxWidgets print sample doesn't even demonstate this.
      local printDialogData = wx.wxPrintDialogData(printData)
      local printerDialog   = wx.wxPrintDialog(frame, printDialogData)
!     printerDialog:GetPrintDialogData():SetSetupDialog(true)
!     if (printerDialog:ShowModal() == wx.wxID_OK) then
!         printData = printerDialog:GetPrintDialogData():GetPrintData():Copy()
!     end
  end
  
***************
*** 205,211 ****
      printData = pageSetupDialogData:GetPrintData():Copy()
      local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupDialogData)
!     pageSetupDialog:ShowModal()
!     printData           = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy()
!     pageSetupDialogData = pageSetupDialog:GetPageSetupDialogData():Copy()
      pageSetupDialog:delete()
  end
--- 207,214 ----
      printData = pageSetupDialogData:GetPrintData():Copy()
      local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupDialogData)
!     if (pageSetupDialog:ShowModal() == wx.wxID_OK) then
!         printData           = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy()
!         pageSetupDialogData = pageSetupDialog:GetPageSetupDialogData():Copy()
!     end
      pageSetupDialog:delete()
  end
***************
*** 240,244 ****
      local fileMenu = wx.wxMenu()
      fileMenu:Append(ID_PAGESETUP,    "Page S&etup...", "Set up the page")
!     fileMenu:Append(ID_PRINTSETUP,   "Print &Setup...", "Set up the printer")
      fileMenu:Append(ID_PRINTPREVIEW, "Print Pre&view...", "Preview the test print")
      fileMenu:Append(ID_PRINT,        "&Print...", "Print the test print")
--- 243,247 ----
      local fileMenu = wx.wxMenu()
      fileMenu:Append(ID_PAGESETUP,    "Page S&etup...", "Set up the page")
!     --fileMenu:Append(ID_PRINTSETUP,   "Print &Setup...", "Set up the printer")
      fileMenu:Append(ID_PRINTPREVIEW, "Print Pre&view...", "Preview the test print")
      fileMenu:Append(ID_PRINT,        "&Print...", "Print the test print")