Added wxRTTI for the new wxVScrolledWindow, wxVListBox, and

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

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index 6b77eb1f2b8ab8b5a88b1a94908f08f99aa8c4be..d7a78e1dd440036bf986329851b44d799137d6f1 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:
-            return true
+        self.log.WriteText("wxPrintout.HasPage: %d\n" % page)
+        if page <= 2:
+            return True

         else:
         else:

-            return false
+            return False

 
     def GetPageInfo(self):
         self.log.WriteText("wxPrintout.GetPageInfo\n")
 
     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()
 
         #-------------------------------------------


@@ -79,8 +79,10 @@ class MyPrintout(wxPrintout):
 
         #-------------------------------------------
 
 
         #-------------------------------------------
 

-        self.canvas.DoDrawing(dc)
-        return true
+        self.canvas.DoDrawing(dc, True)
+        dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
+
+        return True

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -115,14 +117,14 @@ class TestPrintPanel(wxPanel):
 
         self.box.Add(subbox, 0, wxGROW)
 
 
         self.box.Add(subbox, 0, wxGROW)
 

-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)

         self.SetSizer(self.box)
 
 
     def OnPrintSetup(self, event):
         printerDialog = wxPrintDialog(self)
         printerDialog.GetPrintDialogData().SetPrintData(self.printData)
         self.SetSizer(self.box)
 
 
     def OnPrintSetup(self, event):
         printerDialog = wxPrintDialog(self)
         printerDialog.GetPrintDialogData().SetPrintData(self.printData)

-        printerDialog.GetPrintDialogData().SetSetupDialog(true)
+        printerDialog.GetPrintDialogData().SetSetupDialog(True)

         printerDialog.ShowModal();
         self.printData = printerDialog.GetPrintDialogData().GetPrintData()
         printerDialog.Destroy()
         printerDialog.ShowModal();
         self.printData = printerDialog.GetPrintDialogData().GetPrintData()
         printerDialog.Destroy()


@@ -142,7 +144,7 @@ class TestPrintPanel(wxPanel):
         frame.Initialize()
         frame.SetPosition(self.frame.GetPosition())
         frame.SetSize(self.frame.GetSize())
         frame.Initialize()
         frame.SetPosition(self.frame.GetPosition())
         frame.SetSize(self.frame.GetSize())

-        frame.Show(true)
+        frame.Show(True)

 
 
 
 
 
 


@@ -174,3 +176,12 @@ def runTest(frame, nb, log):
 overview = """\
 """
 
 overview = """\
 """
 

+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+