warning fix

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

diff --git a/wxPython/demo/ColourDialog.py b/wxPython/demo/ColourDialog.py
index be0fc703d4129890afde39b7a73e92425c56a52e..13422421dd6a40cc976df346daf65fdff7f46fd7 100644 (file)
--- a/wxPython/demo/ColourDialog.py
+++ b/wxPython/demo/ColourDialog.py
@@ -1,32 +1,45 @@
-# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-
+ 

 import  wx
 
 #---------------------------------------------------------------------------
 
 import  wx
 
 #---------------------------------------------------------------------------
 

-def runTest(frame, nb, log):
-    dlg = wx.ColourDialog(frame)
+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 ColourDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        dlg = wx.ColourDialog(self)
+
+        # Ensure the full colour dialog is displayed, 
+        # not the abbreviated version.
+        dlg.GetColourData().SetChooseFull(True)

 
 

-    # Ensure the full colour dialog is displayed, 
-    # not the abbreviated version.
-    dlg.GetColourData().SetChooseFull(True)
+        if dlg.ShowModal() == wx.ID_OK:

 
 

-    if dlg.ShowModal() == wx.ID_OK:
+            # If the user selected OK, then the dialog's wx.ColourData will
+            # contain valid information. Fetch the data ...
+            data = dlg.GetColourData()

 
 

-        # If the user selected OK, then the dialog's wx.ColourData will
-        # contain valid information. Fetch the data ...
-        data = dlg.GetColourData()
-        
-        # ... then do something with it. The actual colour data will be
-        # returned as a three-tuple (r, g, b) in this particular case.
-        log.WriteText('You selected: %s\n' % str(data.GetColour().Get()))
+            # ... then do something with it. The actual colour data will be
+            # returned as a three-tuple (r, g, b) in this particular case.
+            self.log.WriteText('You selected: %s\n' % str(data.GetColour().Get()))
+
+        # Once the dialog is destroyed, Mr. wx.ColourData is no longer your
+        # friend. Don't use it again!
+        dlg.Destroy()
+
+#---------------------------------------------------------------------------
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win

 
 

-    # Once the dialog is destroyed, Mr. wx.ColourData is no longer your
-    # friend. Don't use it again!
-    dlg.Destroy()

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


@@ -43,17 +56,17 @@ to suit your needs. In the example, we set the dialog up to show the extended co
 data selection pane. Otherwise, only the more compact and less extensive colour 
 dialog is shown.  You may also preset the colour as well as other items. 
 
 data selection pane. Otherwise, only the more compact and less extensive colour 
 dialog is shown.  You may also preset the colour as well as other items. 
 

-If the user selects something and selects OK, then the wxColourData instance contains
+If the user selects something and selects OK, then the wx.ColourData instance contains

 the colour data that the user selected. Before destroying the dialog, retrieve the data.
 <b>Do not try to retain the wx.ColourData instance.</b> It will probably not be valid
 after the dialog is destroyed.
 
 the colour data that the user selected. Before destroying the dialog, retrieve the data.
 <b>Do not try to retain the wx.ColourData instance.</b> It will probably not be valid
 after the dialog is destroyed.
 

-Along with he wxColourDialog documentation, see also the wx.ColourData documentation 
+Along with he wx.ColourDialog documentation, see also the wx.ColourData documentation 

 for details.
 """
 
 if __name__ == '__main__':
     import sys,os
     import run
 for details.
 """
 
 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:])