X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbc5a00631ff8eec5885bd5a88754fac339cb958..72b1ad5c2e42a19e24460c196b47ea54e34d8c2c:/wxPython/wx/lib/colourselect.py diff --git a/wxPython/wx/lib/colourselect.py b/wxPython/wx/lib/colourselect.py index 689e467e67..20fb0d0e35 100644 --- a/wxPython/wx/lib/colourselect.py +++ b/wxPython/wx/lib/colourselect.py @@ -104,8 +104,13 @@ class ColourSelect(wx.BitmapButton): def MakeBitmap(self): - bdr = 10 + bdr = 8 width, height = self.GetSize() + + # yes, this is weird, but it appears to work around a bug in wxMac + if "wxMac" in wx.PlatformInfo and width == height: + height -= 1 + bmp = wx.EmptyBitmap(width-bdr, height-bdr) dc = wx.MemoryDC() dc.SelectObject(bmp) @@ -133,7 +138,8 @@ class ColourSelect(wx.BitmapButton): self.SetBitmapDisabled(bmp) self.SetBitmapFocus(bmp) self.SetBitmapSelected(bmp) - + self.Refresh() + def OnChange(self): wx.PostEvent(self, ColourSelectEvent(self.GetId(), self.GetValue())) @@ -150,7 +156,6 @@ class ColourSelect(wx.BitmapButton): if changed: data = dlg.GetColourData() self.SetColour(data.GetColour()) - dlg.Destroy() # moved after dlg.Destroy, since who knows what the callback will do...