From 13bf44b079e943b171bb15b05d904340453ccbae Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 19 May 2006 22:58:12 +0000 Subject: [PATCH] Demo the page setup dialog instead of the print setup dialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/PrintFramework.py | 38 +++++++++++++++------------------ 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py index 6aa0b5700f..7412455086 100644 --- a/wxPython/demo/PrintFramework.py +++ b/wxPython/demo/PrintFramework.py @@ -4,9 +4,6 @@ import ScrolledWindow #---------------------------------------------------------------------- -ID_Setup = wx.NewId() -ID_Preview = wx.NewId() -ID_Print = wx.NewId() class MyPrintout(wx.Printout): def __init__(self, canvas, log): @@ -107,15 +104,15 @@ class TestPrintPanel(wx.Panel): 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, btn) + btn = wx.Button(self, -1, "Page Setup") + self.Bind(wx.EVT_BUTTON, self.OnPageSetup, btn) subbox.Add(btn, 1, wx.GROW | wx.ALL, 2) - btn = wx.Button(self, ID_Preview, "Print Preview") + btn = wx.Button(self, -1, "Print 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") + btn = wx.Button(self, -1, "Print") self.Bind(wx.EVT_BUTTON, self.OnDoPrint, btn) subbox.Add(btn, 1, wx.GROW | wx.ALL, 2) @@ -125,22 +122,21 @@ class TestPrintPanel(wx.Panel): self.SetSizer(self.box) - def OnPrintSetup(self, event): - data = wx.PrintDialogData(self.printData) - printerDialog = wx.PrintDialog(self, data) - #printerDialog.GetPrintDialogData().SetSetupDialog(True) - printerDialog.ShowModal(); + + def OnPageSetup(self, evt): + psdd = wx.PageSetupDialogData(self.printData) + psdd.CalculatePaperSizeFromId() + dlg = wx.PageSetupDialog(self, psdd) + dlg.ShowModal() # this makes a copy of the wx.PrintData instead of just saving # a reference to the one inside the PrintDialogData that will # be destroyed when the dialog is destroyed - self.printData = wx.PrintData( printerDialog.GetPrintDialogData().GetPrintData() ) - - printerDialog.Destroy() + self.printData = wx.PrintData( dlg.GetPageSetupData().GetPrintData() ) + dlg.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) @@ -150,12 +146,12 @@ class TestPrintPanel(wx.Panel): self.log.WriteText("Houston, we have a problem...\n") return - frame = wx.PreviewFrame(self.preview, self.frame, "This is a print preview") + pfrm = wx.PreviewFrame(self.preview, self.frame, "This is a print preview") - frame.Initialize() - frame.SetPosition(self.frame.GetPosition()) - frame.SetSize(self.frame.GetSize()) - frame.Show(True) + pfrm.Initialize() + pfrm.SetPosition(self.frame.GetPosition()) + pfrm.SetSize(self.frame.GetSize()) + pfrm.Show(True) -- 2.45.2