X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/356f3c650c69999793635e296f1332cefdcc60ab..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/demo/PrintFramework.py

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index 5db34aaa3e..6aa0b5700f 100644
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -15,38 +15,38 @@ class MyPrintout(wx.Printout):
         self.log = log
 
     def OnBeginDocument(self, start, end):
-        self.log.WriteText("wx.Printout.OnBeginDocument\n")
-        return self.base_OnBeginDocument(start, end)
+        self.log.WriteText("MyPrintout.OnBeginDocument\n")
+        return super(MyPrintout, self).OnBeginDocument(start, end)
 
     def OnEndDocument(self):
-        self.log.WriteText("wx.Printout.OnEndDocument\n")
-        self.base_OnEndDocument()
+        self.log.WriteText("MyPrintout.OnEndDocument\n")
+        super(MyPrintout, self).OnEndDocument()
 
     def OnBeginPrinting(self):
-        self.log.WriteText("wx.Printout.OnBeginPrinting\n")
-        self.base_OnBeginPrinting()
+        self.log.WriteText("MyPrintout.OnBeginPrinting\n")
+        super(MyPrintout, self).OnBeginPrinting()
 
     def OnEndPrinting(self):
-        self.log.WriteText("wx.Printout.OnEndPrinting\n")
-        self.base_OnEndPrinting()
+        self.log.WriteText("MyPrintout.OnEndPrinting\n")
+        super(MyPrintout, self).OnEndPrinting()
 
     def OnPreparePrinting(self):
-        self.log.WriteText("wx.Printout.OnPreparePrinting\n")
-        self.base_OnPreparePrinting()
+        self.log.WriteText("MyPrintout.OnPreparePrinting\n")
+        super(MyPrintout, self).OnPreparePrinting()
 
     def HasPage(self, page):
-        self.log.WriteText("wx.Printout.HasPage: %d\n" % page)
+        self.log.WriteText("MyPrintout.HasPage: %d\n" % page)
         if page <= 2:
             return True
         else:
             return False
 
     def GetPageInfo(self):
-        self.log.WriteText("wx.Printout.GetPageInfo\n")
+        self.log.WriteText("MyPrintout.GetPageInfo\n")
         return (1, 2, 1, 2)
 
     def OnPrintPage(self, page):
-        self.log.WriteText("wx.Printout.OnPrintPage: %d\n" % page)
+        self.log.WriteText("MyPrintout.OnPrintPage: %d\n" % page)
         dc = self.GetDC()
 
         #-------------------------------------------
@@ -128,12 +128,12 @@ class TestPrintPanel(wx.Panel):
     def OnPrintSetup(self, event):
         data = wx.PrintDialogData(self.printData)
         printerDialog = wx.PrintDialog(self, data)
-        printerDialog.GetPrintDialogData().SetSetupDialog(True)
+        #printerDialog.GetPrintDialogData().SetSetupDialog(True)
         printerDialog.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
+        # 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()