fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index 8e7a239ba77e5389b57df4ca24b40e51989b42c6..cd9a4cfda043afbd18d7f3f73e7092c8240596f7 100644 (file)
--- a/wxPython/demo/ColourSelect.py
+++ b/wxPython/demo/ColourSelect.py
@@ -34,21 +34,22 @@ class TestColourSelect(wxPanel):
         self.y_pos = self.y_pos + delta
 
         wxStaticText(self, -1, "Default", wxPoint(self.x_pos, self.y_pos), wxSize(-1, -1))   # name
         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
 
         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
 
         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.set_val.append(val)     # store control for reference
             self.y_pos = self.y_pos + delta
 

+

     def OnClick(self, event):
         result = []
         colour = self.colour_def.GetColour()        # default control value
     def OnClick(self, event):
         result = []
         colour = self.colour_def.GetColour()        # default control value


@@ -87,31 +88,4 @@ def runTest(frame, nb, log):
 overview = """\
 A checkbox is a labelled box which is either on (checkmark is visible) or off (no checkmark).
 
 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.

 """
 """