X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95bfd958bda8955ac81277c78e5627c926154f39..d6375c69831f8cdb1beff91c67bb9c1a5f8095cb:/wxPython/demo/PrintFramework.py?ds=sidebyside

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index ea3881e68f..5db34aaa3e 100644
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -84,7 +84,7 @@ class MyPrintout(wx.Printout):
         #-------------------------------------------
 
         self.canvas.DoDrawing(dc, True)
-        dc.DrawText("Page: %d" % page, (marginX/2, maxY-marginY))
+        dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
 
         return True
 
@@ -100,22 +100,23 @@ class TestPrintPanel(wx.Panel):
 
         self.printData = wx.PrintData()
         self.printData.SetPaperId(wx.PAPER_LETTER)
-
+        self.printData.SetPrintMode(wx.PRINT_MODE_PRINTER)
+        
         self.box = wx.BoxSizer(wx.VERTICAL)
         self.canvas = ScrolledWindow.MyCanvas(self)
         self.box.Add(self.canvas, 1, wx.GROW)
 
         subbox = wx.BoxSizer(wx.HORIZONTAL)
         btn = wx.Button(self, ID_Setup, "Print Setup")
-        self.Bind(wx.EVT_BUTTON, self.OnPrintSetup, id=ID_Setup)
+        self.Bind(wx.EVT_BUTTON, self.OnPrintSetup, btn)
         subbox.Add(btn, 1, wx.GROW | wx.ALL, 2)
 
         btn = wx.Button(self, ID_Preview, "Print Preview")
-        self.Bind(wx.EVT_BUTTON, self.OnPrintPreview, id=ID_Preview)
+        self.Bind(wx.EVT_BUTTON, self.OnPrintPreview, btn)
         subbox.Add(btn, 1, wx.GROW | wx.ALL, 2)
 
         btn = wx.Button(self, ID_Print, "Print")
-        self.Bind(wx.EVT_BUTTON, self.OnDoPrint, id=ID_Print)
+        self.Bind(wx.EVT_BUTTON, self.OnDoPrint, btn)
         subbox.Add(btn, 1, wx.GROW | wx.ALL, 2)
 
         self.box.Add(subbox, 0, wx.GROW)
@@ -125,19 +126,25 @@ class TestPrintPanel(wx.Panel):
 
 
     def OnPrintSetup(self, event):
-        printerDialog = wx.PrintDialog(self)
-        printerDialog.GetPrintDialogData().SetPrintData(self.printData)
+        data = wx.PrintDialogData(self.printData)
+        printerDialog = wx.PrintDialog(self, data)
         printerDialog.GetPrintDialogData().SetSetupDialog(True)
         printerDialog.ShowModal();
-        self.printData = printerDialog.GetPrintDialogData().GetPrintData()
+
+        # this makes a copy of the wx.PrintData instead of just saving
+        # a reference to the one inside the printDialogData that will
+        # be destroyed
+        self.printData = wx.PrintData( printerDialog.GetPrintDialogData().GetPrintData() )
+        
         printerDialog.Destroy()
 
 
     def OnPrintPreview(self, event):
         self.log.WriteText("OnPrintPreview\n")
+        data = wx.PrintDialogData(self.printData)
         printout = MyPrintout(self.canvas, self.log)
         printout2 = MyPrintout(self.canvas, self.log)
-        self.preview = wx.PrintPreview(printout, printout2, self.printData)
+        self.preview = wx.PrintPreview(printout, printout2, data)
 
         if not self.preview.Ok():
             self.log.WriteText("Houston, we have a problem...\n")
@@ -153,15 +160,15 @@ class TestPrintPanel(wx.Panel):
 
 
     def OnDoPrint(self, event):
-        pdd = wx.PrintDialogData()
-        pdd.SetPrintData(self.printData)
+        pdd = wx.PrintDialogData(self.printData)
+        pdd.SetToPage(2)
         printer = wx.Printer(pdd)
         printout = MyPrintout(self.canvas, self.log)
 
-        if not printer.Print(self.frame, printout):
+        if not printer.Print(self.frame, printout, True):
             wx.MessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wx.OK)
         else:
-            self.printData = printer.GetPrintDialogData().GetPrintData()
+            self.printData = wx.PrintData( printer.GetPrintDialogData().GetPrintData() )
         printout.Destroy()
 
 
@@ -224,5 +231,5 @@ framework in wxPython.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])