merge from 2.8 branch

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

diff --git a/wxPython/demo/SingleChoiceDialog.py b/wxPython/demo/SingleChoiceDialog.py
index 157e17254170b96d2e7d3f055718ae695fbd40d9..2317d7e398306a33caedee12b153fea70ab754f7 100644 (file)
--- a/wxPython/demo/SingleChoiceDialog.py
+++ b/wxPython/demo/SingleChoiceDialog.py
@@ -3,18 +3,35 @@ import  wx
 
 #---------------------------------------------------------------------------
 
-def runTest(frame, nb, log):
-    dlg = wx.SingleChoiceDialog(
-            frame, 'Test Single Choice', 'The Caption',
-            ['zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'], 
-            wx.CHOICEDLG_STYLE
-            )
+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 SingleChoiceDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        dlg = wx.SingleChoiceDialog(
+                self, 'Test Single Choice', 'The Caption',
+                ['zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'], 
+                wx.CHOICEDLG_STYLE
+                )
+
+        if dlg.ShowModal() == wx.ID_OK:
+            self.log.WriteText('You selected: %s\n' % dlg.GetStringSelection())
 
-    if dlg.ShowModal() == wx.ID_OK:
-        log.WriteText('You selected: %s\n' % dlg.GetStringSelection())
+        dlg.Destroy()
 
-    dlg.Destroy()
 
+
+#---------------------------------------------------------------------------
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
 #---------------------------------------------------------------------------
 
 
@@ -34,5 +51,5 @@ destroy the dialog.
 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:])