Added GetResourcesDir and GetLocalizedResourcesDir to

[wxWidgets.git] / wxPython / demo / PrintFramework.py

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index 86dcdd5eca3d0fcdfb01255a34035cc721d1fb5e..6aa0b5700f809c926ca76572b0c8d347fa3d7fae 100644 (file)
--- 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 = 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):
 
     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):
 
     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):
 
     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):
 
     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):
 
     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):
         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):
         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()
 
         #-------------------------------------------
         dc = self.GetDC()
 
         #-------------------------------------------


@@ -128,7 +128,7 @@ class TestPrintPanel(wx.Panel):
     def OnPrintSetup(self, event):
         data = wx.PrintDialogData(self.printData)
         printerDialog = wx.PrintDialog(self, data)
     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
         printerDialog.ShowModal();
 
         # this makes a copy of the wx.PrintData instead of just saving