X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/299647acac7960652aadb008775429c1f8ea9b8d..42f8298f6f42d5d63bb3caf65682b7d9d9f8b702:/wxPython/demo/PageSetupDialog.py

diff --git a/wxPython/demo/PageSetupDialog.py b/wxPython/demo/PageSetupDialog.py
index a4e7e4e215..d81a314908 100644
--- a/wxPython/demo/PageSetupDialog.py
+++ b/wxPython/demo/PageSetupDialog.py
@@ -1,28 +1,42 @@
-# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
 
 import  wx
 
 #---------------------------------------------------------------------------
 
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Create and Show a PageSetupDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        data = wx.PageSetupDialogData()
+        data.SetMarginTopLeft( (15, 15) )
+        data.SetMarginBottomRight( (15, 15) )
+        #data.SetDefaultMinMargins(True)
+        data.SetPaperId(wx.PAPER_LETTER)
+
+        dlg = wx.PageSetupDialog(self, data)
+
+        if dlg.ShowModal() == wx.ID_OK:
+            data = dlg.GetPageSetupData()
+            tl = data.GetMarginTopLeft()
+            br = data.GetMarginBottomRight()
+            self.log.WriteText('Margins are: %s %s\n' % (str(tl), str(br)))
+
+        dlg.Destroy()
+
+
+#---------------------------------------------------------------------------
+
+
 def runTest(frame, nb, log):
-    data = wx.PageSetupDialogData()
-    data.SetMarginTopLeft( (15, 15) )
-    data.SetMarginBottomRight( (15, 15) )
-    #data.SetDefaultMinMargins(True)
-    data.SetPaperId(wx.PAPER_LETTER)
-                               
-    dlg = wx.PageSetupDialog(frame, data)
-
-    if dlg.ShowModal() == wx.ID_OK:
-        data = dlg.GetPageSetupData()
-        tl = data.GetMarginTopLeft()
-        br = data.GetMarginBottomRight()
-        log.WriteText('Margins are: %s %s\n' % (str(tl), str(br)))
-
-    dlg.Destroy()
+    win = TestPanel(nb, log)
+    return win
+
 
 #---------------------------------------------------------------------------
 
@@ -37,12 +51,12 @@ The page setup dialog contains controls for paper size (A4, A5 etc.), orientatio
 (landscape or portrait), and controls for setting left, top, right and bottom margin 
 sizes in millimetres.
 
-When the dialog has been closed, you need to query the <code>wxPageSetupDialogData</code> object 
+When the dialog has been closed, you need to query the <code>wx.PageSetupDialogData</code> object 
 associated with the dialog.
 
 Note that the OK and Cancel buttons do not destroy the dialog; this must be done by 
 the application. As with other dialogs, do not destroy the dialog until you are done
-with the data, and, conversely, do not use the wxPageSetupDialogData after the
+with the data, and, conversely, do not use the wx.PageSetupDialogData after the
 dialog is destroyed.
 
 
@@ -52,4 +66,4 @@ dialog is destroyed.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])