wxUniversal fixes:

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

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index 6b77eb1f2b8ab8b5a88b1a94908f08f99aa8c4be..faa33469d08e054f26ef269fb810d9f517b759e2 100644 (file)
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -31,18 +31,18 @@ class MyPrintout(wxPrintout):
         self.base_OnPreparePrinting()
 
     def HasPage(self, page):
         self.base_OnPreparePrinting()
 
     def HasPage(self, page):

-        self.log.WriteText("wxPrintout.HasPage\n")
-        if page == 1:
+        self.log.WriteText("wxPrintout.HasPage: %d\n" % page)
+        if page <= 2:

             return true
         else:
             return false
 
     def GetPageInfo(self):
         self.log.WriteText("wxPrintout.GetPageInfo\n")
             return true
         else:
             return false
 
     def GetPageInfo(self):
         self.log.WriteText("wxPrintout.GetPageInfo\n")

-        return (1, 1, 1, 1)
+        return (1, 2, 1, 2)

 
     def OnPrintPage(self, page):
 
     def OnPrintPage(self, page):

-        self.log.WriteText("wxPrintout.OnPrintPage\n")
+        self.log.WriteText("wxPrintout.OnPrintPage: %d\n" % page)

         dc = self.GetDC()
 
         #-------------------------------------------
         dc = self.GetDC()
 
         #-------------------------------------------


@@ -80,6 +80,8 @@ class MyPrintout(wxPrintout):
         #-------------------------------------------
 
         self.canvas.DoDrawing(dc)
         #-------------------------------------------
 
         self.canvas.DoDrawing(dc)

+        dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
+

         return true
 
 
         return true