Move oleacc.lib from the VC++ projects/makefiles to libraries.h

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

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index 8f220642fa5c03cf3df3265299ec5b7f276248bc..01065dd37b2b19dc797f7836414d114475841bda 100644 (file)
--- a/wxPython/demo/ColourSelect.py
+++ b/wxPython/demo/ColourSelect.py
@@ -15,20 +15,7 @@
 #              - use sizers
 #              - other minor "improvements"
 #----------------------------------------------------------------------------
 #              - use sizers
 #              - other minor "improvements"
 #----------------------------------------------------------------------------

-# 11/22/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for V2.5
-# 
-# 11/24/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-# 
-# o Added Bind() handlers to what events can handle it. However, the
-#   colourselect library must be converted before its events can be
-#   bound using the Bind() method.
-#
-# 12/01/2003 - Jeff Grimmett (grimmtooth@softhome.net)

 # 
 # 

-# o colourselect lib converted; demo converted to match.
-#

 
 import  wx
 import  wx.lib.colourselect as  csel
 
 import  wx
 import  wx.lib.colourselect as  csel


@@ -56,7 +43,7 @@ class TestColourSelect(wx.Panel):
         # show a button with all default values
         self.colourDefaults = csel.ColourSelect(self, -1)
 
         # show a button with all default values
         self.colourDefaults = csel.ColourSelect(self, -1)
 

-        self.colourDefaults.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour, self.colourDefaults.GetId())
+        self.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour, id=self.colourDefaults.GetId())

         
         buttonSizer.AddMany([
             (wx.StaticText(self, -1, "Default Colour/Size"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
         
         buttonSizer.AddMany([
             (wx.StaticText(self, -1, "Default Colour/Size"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),


@@ -118,12 +105,12 @@ def runTest(frame, nb, log):
 
 
 overview = """\
 
 
 overview = """\

-
+A coloured button that when clicked allows the user to select a colour from the wxColourDialog.

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