X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4b73b1b8e585418459362c9bf9173aa21da8c41..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/wx/lib/colourchooser/pypalette.py diff --git a/wxPython/wx/lib/colourchooser/pypalette.py b/wxPython/wx/lib/colourchooser/pypalette.py index 4af5a7af1f..1004783845 100644 --- a/wxPython/wx/lib/colourchooser/pypalette.py +++ b/wxPython/wx/lib/colourchooser/pypalette.py @@ -184,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.""" - 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 @@ -197,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)) - self.buffer.DrawCircle((x, y), 3) + self.buffer.DrawCircle(x, y, 3) self.Refresh() def GeneratePaletteBMP(self, file_name, granularity=1): @@ -225,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)) - 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()