Fix "warning: operation on 'y' may be undefined".

[wxWidgets.git] / wxPython / wx / lib / colourchooser / pycolourslider.py

diff --git a/wxPython/wx/lib/colourchooser/pycolourslider.py b/wxPython/wx/lib/colourchooser/pycolourslider.py
index bd8f892ea7b3542325fdede6cfabce4340dd47f9..d1fd8dc62a6eff4e78e8da093768b3990f20ac26 100644 (file)
--- a/wxPython/wx/lib/colourchooser/pycolourslider.py
+++ b/wxPython/wx/lib/colourchooser/pycolourslider.py
@@ -1,14 +1,14 @@
 """
-wxPyColourChooser
+PyColourChooser
 Copyright (C) 2002 Michael Gilfix
 
-This file is part of wxPyColourChooser.
+This file is part of PyColourChooser.
 
 You should have received a file COPYING containing license terms
 along with this program; if not, write to Michael Gilfix
 (mgilfix@eecs.tufts.edu) for a copy.
 
-This version of wxPyColourChooser is open source; you can redistribute it and/or
+This version of PyColourChooser is open source; you can redistribute it and/or
 modify it under the terms listed in the file COPYING.
 
 This program is distributed in the hope that it will be useful,
@@ -20,6 +20,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # o 2.5 compatability update.
 #
+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxPyColorChooser -> PyColorChooser
+# o wxPyColourChooser -> PyColourChooser
+#
 
 import  wx
 
@@ -63,7 +68,7 @@ class PyColourSlider(canvas.Canvas):
         """Returns the colour value for a position on the slider. The position
         must be within the valid height of the slider, or results can be
         unpredictable."""
-        return self.buffer.GetPixel((0, pos))
+        return self.buffer.GetPixel(0, pos)
 
     def DrawBuffer(self):
         """Actual implementation of the widget's drawing. We simply draw
@@ -83,5 +88,5 @@ class PyColourSlider(canvas.Canvas):
             r,g,b = [c * 255.0 for c in colorsys.hsv_to_rgb(h,s,v)]
             colour = wx.Colour(int(r), int(g), int(b))
             self.buffer.SetPen(wx.Pen(colour, 1, wx.SOLID))
-            self.buffer.DrawRectangle((0, y_pos), (15, 1))
+            self.buffer.DrawRectangle(0, y_pos, 15, 1)
             v = v - vstep