MacSetMetalAppearance

[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..4c880c8d7d046e3320331174d67599f8a80e6aa9 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
 
 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.
 
 
 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,
 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.
 """
 
 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
 
 class PyColourSlider(canvas.Canvas):
     """A Pure-Python Colour Slider


@@ -41,8 +52,7 @@ class PyColourSlider(canvas.Canvas):
         # drawing function
         self.SetBaseColour(colour)
 
         # 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
 
     def SetBaseColour(self, colour):
         """Sets the base, or target colour, to use as the central colour


@@ -58,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."""
         """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
 
     def DrawBuffer(self):
         """Actual implementation of the widget's drawing. We simply draw


@@ -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)]
         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))
-            self.buffer.DrawRectangle(0, y_pos, 15, 1)
+            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
             v = v - vstep