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 87a4442579305a1f5fc489757dbb78732e64d7a4..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,
@@ -16,9 +16,20 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 """
 
-import canvas
-import colorsys
-from wxPython.wx import *
+# 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o 2.5 compatability update.
+#
+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxPyColorChooser -> PyColorChooser
+# o wxPyColourChooser -> PyColourChooser
+#
+
+import  wx
+
+import  canvas
+import  colorsys
 
 class PyColourSlider(canvas.Canvas):
     """A Pure-Python Colour Slider
@@ -41,8 +52,7 @@ class PyColourSlider(canvas.Canvas):
         # drawing function
         self.SetBaseColour(colour)
 
-        canvas.Canvas.__init__(self, parent, id,
-                                size=wxSize(self.WIDTH, self.HEIGHT))
+        canvas.Canvas.__init__(self, parent, id, size=(self.WIDTH, self.HEIGHT))
 
     def SetBaseColour(self, colour):
         """Sets the base, or target colour, to use as the central colour
@@ -76,7 +86,7 @@ class PyColourSlider(canvas.Canvas):
         vstep = 1.0 / self.HEIGHT
         for y_pos in range(0, self.HEIGHT):
             r,g,b = [c * 255.0 for c in colorsys.hsv_to_rgb(h,s,v)]
-            colour = wxColour(int(r), int(g), int(b))
-            self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
+            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)
             v = v - vstep