checked in forgottern parts of MSLU changes

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

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index 5d4957a52533922d863351134159f0745a8c2adb..c3abd36b93208aefa27c0e37fe50e853e9b828f7 100644 (file)
--- a/wxPython/demo/ColourSelect.py
+++ b/wxPython/demo/ColourSelect.py
@@ -5,9 +5,12 @@
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
-# Version       0.5 
-# Date:         Feb 26, 2001
+# Version       0.6
+# Date:         Nov 14, 2001
 # Licence:      wxWindows license
+
+# Change Log:  Add Label parameter to accommodate updated library code
+
 #----------------------------------------------------------------------------
 
 from wxPython.wx import *
@@ -27,41 +30,45 @@ class TestColourSelect(wxPanel):
         self.x_pos = 30
         self.y_pos = 100
         delta = 40
-        
+
         mID = NewId()
-        wxButton(self, mID, "Get All Colours", wxPoint(self.x_pos, self.y_pos), wxSize(80, 20))
+        wxButton(self, mID, "Get All Colours", wxPoint(self.x_pos, self.y_pos))
         EVT_BUTTON(self, mID, self.OnClick)
         self.y_pos = self.y_pos + delta
 
         wxStaticText(self, -1, "Default", wxPoint(self.x_pos, self.y_pos), wxSize(-1, -1))   # name
-        self.colour_def = ColourSelect(self, wxPoint(self.x_pos+100, self.y_pos))   # default colour selection control
+        self.colour_def = ColourSelect(self, -1, pos=wxPoint(self.x_pos+100, self.y_pos))   # default colour selection control
 
         self.y_pos = self.y_pos + delta
         colours = [[255, 255, 0], [255, 0, 255], [0, 255, 0], [0, 0, 255]]   # list of initial colours for display
         self.names = names = [ "Default Size", "Another Size", "Another Colour", "Larger"]    # display names
-        sizes = [ None, wxSize(60, 20), None, wxSize(60, 60)]       # button sizes
+        sizes = [ wxDefaultSize, wxSize(60, 20), wxDefaultSize, wxSize(60, 60)]       # button sizes
         self.set_val = []
 
         for i in range(len(colours)):
             wxStaticText(self, -1, names[i], wxPoint(self.x_pos, self.y_pos), wxSize(-1, -1))   # name
 
-            val = ColourSelect(self, wxPoint(self.x_pos+100, self.y_pos), colours[i], sizes[i])     # colour selection button
+            val = ColourSelect(self, -1, "", colours[i], wxPoint(self.x_pos+100, self.y_pos), sizes[i])     # colour selection button
             self.set_val.append(val)     # store control for reference
             self.y_pos = self.y_pos + delta
 
+        self.y_pos = self.y_pos - delta
+        ColourSelect(self, -1, "Color Label", colours[0], wxPoint(self.x_pos+200, self.y_pos), sizes[0])     # colour selection button
+
+
     def OnClick(self, event):
         result = []
         colour = self.colour_def.GetColour()        # default control value
-        result.append("Default: " + str(colour))
-        
+        result.append("%s: #%02x%02x%02x" % ("Default", colour[0], colour[1], colour[2]))
+
         for i in range(len(self.set_val)):
             val = self.set_val[i]
             colour = val.GetColour()        # get the colour selection button result
             name = self.names[i]
-            result.append(name + ": " + str(colour))        # create string list for easy viewing of results
+            result.append("%s: #%02x%02x%02x" % (name, colour[0], colour[1], colour[2]))
         out_result = string.joinfields(result, ',  ')
-        self.log.WriteText("Colour Results :" + out_result)
-        
+        self.log.WriteText("Colour Results :" + out_result + "\n")
+
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
@@ -85,33 +92,5 @@ def runTest(frame, nb, log):
 
 
 overview = """\
-A checkbox is a labelled box which is either on (checkmark is visible) or off (no checkmark).
-
-wxCheckBox()
------------------------
-
-Default constructor.
-
-wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val, const wxString& name = "checkBox")
-
-Constructor, creating and showing a checkbox.
-
-Parameters
--------------------
-
-parent = Parent window. Must not be NULL.
-
-id = Checkbox identifier. A value of -1 indicates a default value.
-
-label = Text to be displayed next to the checkbox.
-
-pos = Checkbox position. If the position (-1, -1) is specified then a default position is chosen.
-
-size = Checkbox size. If the default size (-1, -1) is specified then a default size is chosen.
-
-style = Window style. See wxCheckBox.
-
-validator = Window validator.
 
-name = Window name.
 """