compilation fix after removing wxImage(wxImage *) ctor

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

diff --git a/wxPython/wx/lib/colourchooser/pypalette.py b/wxPython/wx/lib/colourchooser/pypalette.py
index f6ede14fd2d3f17a599c06c94a492635f93598fc..100478384511a7d693b7a97260797c92eea89567 100644 (file)
--- a/wxPython/wx/lib/colourchooser/pypalette.py
+++ b/wxPython/wx/lib/colourchooser/pypalette.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,


@@ -19,6 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # o 2.5 compatability update.
 #
 #
 # 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  cStringIO
 import  zlib


@@ -164,7 +171,12 @@ class PyPalette(canvas.Canvas):
     def __init__(self, parent, id):
         """Creates a palette object."""
         # Load the pre-generated palette XPM
     def __init__(self, parent, id):
         """Creates a palette object."""
         # Load the pre-generated palette XPM

-        wx.InitAllImageHandlers()
+        
+        # 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=(200, 192))
 
         self.palette = getBitmap ()
         canvas.Canvas.__init__ (self, parent, id, size=(200, 192))
 


@@ -172,12 +184,12 @@ class PyPalette(canvas.Canvas):
         """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."""
         """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")
 
     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
 
     def HighlightPoint(self, x, y):
         """Highlights an area of the palette with a little circle around


@@ -185,7 +197,7 @@ class PyPalette(canvas.Canvas):
         colour = wx.Colour(0, 0, 0)
         self.buffer.SetPen(wx.Pen(colour, 1, wx.SOLID))
         self.buffer.SetBrush(wx.Brush(colour, wx.TRANSPARENT))
         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.buffer.DrawCircle(x, y, 3)

         self.Refresh()
 
     def GeneratePaletteBMP(self, file_name, granularity=1):
         self.Refresh()
 
     def GeneratePaletteBMP(self, file_name, granularity=1):


@@ -213,8 +225,8 @@ class PyPalette(canvas.Canvas):
                 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))
                 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))
+                self.buffer.DrawRectangle(x, y,
+                                          self.HORIZONTAL_STEP, self.vertical_step)

 
         # this code is now simpler (and works)
         bitmap = self.buffer.GetBitmap()
 
         # this code is now simpler (and works)
         bitmap = self.buffer.GetBitmap()