A bit of cleanup

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

diff --git a/wxPython/demo/MultipleChoiceDialog.py b/wxPython/demo/MultipleChoiceDialog.py
index e354d280707a01cbc8be3788ec2c134f94a16d9e..3a36e9872f7d95b040ed11a15a33c499015495ac 100644 (file)
--- a/wxPython/demo/MultipleChoiceDialog.py
+++ b/wxPython/demo/MultipleChoiceDialog.py
@@ -1,32 +1,40 @@
-# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o wx renamer not applied to lib.
-# 
-# 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o wxMultipleChoiceDialog -> MultipleChoiceDialog
-# 
 
 import  wx
 import  wx.lib.dialogs
 
 #---------------------------------------------------------------------------
 
-def runTest(frame, nb, log):
-    lst = [ 'apple', 'pear', 'banana', 'coconut', 'orange',
-            'etc', 'etc..', 'etc...' ]
+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 MultipleChoiceDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        lst = [ 'apple', 'pear', 'banana', 'coconut', 'orange', 'grape', 'pineapple',
+                'blueberry', 'raspberry', 'blackberry', 'snozzleberry',
+                'etc', 'etc..', 'etc...' ]
+
+        dlg = wx.lib.dialogs.MultipleChoiceDialog(
+                                    self,
+                                    "Pick some from\n this list\nblah blah...",
+                                    "m.s.d.", lst)
+
+        if (dlg.ShowModal() == wx.ID_OK):
+            self.log.write("Selection: %s -> %s\n" % (dlg.GetValue(), dlg.GetValueString()))
 
-    dlg = wx.lib.dialogs.MultipleChoiceDialog(
-                                frame,
-                                "Pick some from\n this list\nblah blah...",
-                                "m.s.d.", lst)
+        dlg.Destroy()
 
-    if (dlg.ShowModal() == wx.ID_OK):
-        print "Selection:", dlg.GetValue(), " -> ", dlg.GetValueString()
+
+
+#---------------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
 
 #---------------------------------------------------------------------------
 
@@ -40,7 +48,7 @@ This is a Python implementation of a dialog that is not yet implemented in wxWin
 proper, so don't let the wxWindows documentation mislead you.
 
 <p><code><b>MultipleChoiceDialog</b>(self, parent, msg, title, lst, 
-pos = wx.wxDefaultPosition, size = (200,200), style = wx.wxDEFAULT_DIALOG_STYLE)
+pos = wx.wxDefaultPosition, size = (200,200), style = wx.DEFAULT_DIALOG_STYLE)
 </code>
 
 <dl>
@@ -89,4 +97,4 @@ methods applicable to that class.
 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:])