X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/493f1553fdfd276ed9944c5f1c070ee34be13b52..758bce950ba9236d0a9edc4c880c3ec73b5173f3:/wxPython/demo/ColourSelect.py

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index ee1360218f..d8d5df8984 100644
--- 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.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
 
+
     def OnClick(self, event):
         result = []
         colour = self.colour_def.GetColour()        # default control value
@@ -60,7 +61,7 @@ class TestColourSelect(wxPanel):
             name = self.names[i]
             result.append(name + ": " + str(colour))        # create string list for easy viewing of results
         out_result = string.joinfields(result, ',  ')
-        self.log.WriteText("Colour Results :" + out_result)
+        self.log.WriteText("Colour Results :" + out_result + "\n")
 
 #---------------------------------------------------------------------------