X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb0054cda81e7a6a6e1f33f4b47e46f529110f14..e395c057a357ea8e8fb54a161897e6c4fb27266d:/utils/wxPython/demo/PrintFramework.py

diff --git a/utils/wxPython/demo/PrintFramework.py b/utils/wxPython/demo/PrintFramework.py
index e4fd624368..6b77eb1f2b 100644
--- a/utils/wxPython/demo/PrintFramework.py
+++ b/utils/wxPython/demo/PrintFramework.py
@@ -1,6 +1,5 @@
 
 from wxPython.wx         import *
-from wxPython.lib.sizers import *
 from wxScrolledWindow    import MyCanvas
 
 #----------------------------------------------------------------------
@@ -17,15 +16,19 @@ class MyPrintout(wxPrintout):
 
     def OnEndDocument(self):
         self.log.WriteText("wxPrintout.OnEndDocument\n")
+        self.base_OnEndDocument()
 
     def OnBeginPrinting(self):
         self.log.WriteText("wxPrintout.OnBeginPrinting\n")
+        self.base_OnBeginPrinting()
 
     def OnEndPrinting(self):
         self.log.WriteText("wxPrintout.OnEndPrinting\n")
+        self.base_OnEndPrinting()
 
     def OnPreparePrinting(self):
         self.log.WriteText("wxPrintout.OnPreparePrinting\n")
+        self.base_OnPreparePrinting()
 
     def HasPage(self, page):
         self.log.WriteText("wxPrintout.HasPage\n")
@@ -93,31 +96,29 @@ class TestPrintPanel(wxPanel):
         self.printData = wxPrintData()
         self.printData.SetPaperId(wxPAPER_LETTER)
 
-        self.box = box.wxBoxSizer(wxVERTICAL)
+        self.box = wxBoxSizer(wxVERTICAL)
         self.canvas = MyCanvas(self)
-        self.box.Add(self.canvas, 1)
+        self.box.Add(self.canvas, 1, wxGROW)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
         btn = wxButton(self, 1201, "Print Setup")
         EVT_BUTTON(self, 1201, self.OnPrintSetup)
-        subbox.Add(btn, 1)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         btn = wxButton(self, 1202, "Print Preview")
         EVT_BUTTON(self, 1202, self.OnPrintPreview)
-        subbox.Add(btn, 1)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
         btn = wxButton(self, 1203, "Print")
         EVT_BUTTON(self, 1203, self.OnDoPrint)
-        subbox.Add(btn, 1)
+        subbox.Add(btn, 1, wxGROW | wxALL, 2)
 
-        self.box.Add(subbox)
+        self.box.Add(subbox, 0, wxGROW)
 
+        self.SetAutoLayout(true)
+        self.SetSizer(self.box)
 
 
-    def OnSize(self, event):
-        size = self.GetClientSize()
-        self.box.Layout(size)
-
     def OnPrintSetup(self, event):
         printerDialog = wxPrintDialog(self)
         printerDialog.GetPrintDialogData().SetPrintData(self.printData)