X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7722248d7510121367c9d4db7af1156197c26e82..f78e4942ec0f3f6abd2992502e2d6c5c2e8e55f6:/wxPython/wx/lib/colourchooser/pypalette.py

diff --git a/wxPython/wx/lib/colourchooser/pypalette.py b/wxPython/wx/lib/colourchooser/pypalette.py
index 321750c1b1..1004783845 100644
--- a/wxPython/wx/lib/colourchooser/pypalette.py
+++ b/wxPython/wx/lib/colourchooser/pypalette.py
@@ -1,25 +1,40 @@
 """
-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,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 """
+# 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
+# o Commented out wx.InitAllImageHandlers() (see comments at that
+#   point for explanation
+#
+
+import  cStringIO
+import  zlib
+
+import  wx
+
+import  canvas
+import  colorsys
 
-import canvas
-import colorsys
-import cStringIO, zlib
-from wxPython.wx import *
 
 # Bitmap functions generated from img2py
 def getData():
@@ -128,11 +143,11 @@ L\x1a\xc5\x9c\x88U\xde\xc7\x9d\xd04\x04\x8en\x11\x8112\xbd\xf6J\x96wP\x06\
 \xc5\x8e\x1a\xd5\x84\x8b\x7f\x8f\x01\x0e6\x8e\xd6eV~W\xff\x01[x\x1b=' )
 
 def getBitmap():
-    return wxBitmapFromImage(getImage())
+    return wx.BitmapFromImage(getImage())
 
 def getImage():
     stream = cStringIO.StringIO(getData())
-    return wxImageFromStream(stream)
+    return wx.ImageFromStream(stream)
 
 class PyPalette(canvas.Canvas):
     """The Pure-Python Palette
@@ -156,27 +171,33 @@ class PyPalette(canvas.Canvas):
     def __init__(self, parent, id):
         """Creates a palette object."""
         # Load the pre-generated palette XPM
+        
+        # Leaving this in causes warning messages in some cases.
+        # It is the responsibility of the app to init the image
+        # handlers, IAW RD
+        #wx.InitAllImageHandlers()
+        
         self.palette = getBitmap ()
-        canvas.Canvas.__init__ (self, parent, id, size=wxSize(200, 192))
+        canvas.Canvas.__init__ (self, parent, id, size=(200, 192))
 
     def GetValue(self, x, y):
         """Returns a colour value at a specific x, y coordinate pair. This
         is useful for determining the colour found a specific mouse click
         in an external event handler."""
-        return self.buffer.GetPixel((x, y))
+        return self.buffer.GetPixel(x, y)
 
     def DrawBuffer(self):
         """Draws the palette XPM into the memory buffer."""
         #self.GeneratePaletteBMP ("foo.bmp")
-        self.buffer.DrawBitmap(self.palette, (0, 0), 0)
+        self.buffer.DrawBitmap(self.palette, 0, 0, 0)
 
     def HighlightPoint(self, x, y):
         """Highlights an area of the palette with a little circle around
         the coordinate point"""
-        colour = wxColour(0, 0, 0)
-        self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
-        self.buffer.SetBrush(wxBrush(colour, wxTRANSPARENT))
-        self.buffer.DrawCircle((x, y), 3)
+        colour = wx.Colour(0, 0, 0)
+        self.buffer.SetPen(wx.Pen(colour, 1, wx.SOLID))
+        self.buffer.SetBrush(wx.Brush(colour, wx.TRANSPARENT))
+        self.buffer.DrawCircle(x, y, 3)
         self.Refresh()
 
     def GeneratePaletteBMP(self, file_name, granularity=1):
@@ -201,13 +222,13 @@ class PyPalette(canvas.Canvas):
             for x in range(0, width, self.HORIZONTAL_STEP):
                 hue = float(x) / float(width)
                 r,g,b = colorsys.hsv_to_rgb(hue, saturation, value)
-                colour = wxColour(int(r * 255.0), int(g * 255.0), int(b * 255.0))
-                self.buffer.SetPen(wxPen(colour, 1, wxSOLID))
-                self.buffer.SetBrush(wxBrush(colour, wxSOLID))
-                self.buffer.DrawRectangle((x, y),
-                                          (self.HORIZONTAL_STEP, self.vertical_step))
+                colour = wx.Colour(int(r * 255.0), int(g * 255.0), int(b * 255.0))
+                self.buffer.SetPen(wx.Pen(colour, 1, wx.SOLID))
+                self.buffer.SetBrush(wx.Brush(colour, wx.SOLID))
+                self.buffer.DrawRectangle(x, y,
+                                          self.HORIZONTAL_STEP, self.vertical_step)
 
         # this code is now simpler (and works)
         bitmap = self.buffer.GetBitmap()
-        image = wxImageFromBitmap(bitmap)
-        image.SaveFile (file_name, wxBITMAP_TYPE_XPM)
+        image = wx.ImageFromBitmap(bitmap)
+        image.SaveFile (file_name, wx.BITMAP_TYPE_XPM)