Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / wx / lib / colourselect.py

diff --git a/wxPython/wx/lib/colourselect.py b/wxPython/wx/lib/colourselect.py
index 5edba11b673e8689d946f2548f9fd9876ae43bc9..4c39ece648e4d38aac4c1f4d2e71e63effdf9e87 100644 (file)
--- a/wxPython/wx/lib/colourselect.py
+++ b/wxPython/wx/lib/colourselect.py
@@ -140,10 +140,10 @@ class ColourSelect(wx.BitmapButton):
 
     def SetBitmap(self, bmp):
         self.SetBitmapLabel(bmp)
-        self.SetBitmapSelected(bmp)
-        self.SetBitmapDisabled(bmp)
-        self.SetBitmapFocus(bmp)
-        self.SetBitmapSelected(bmp)
+        #self.SetBitmapSelected(bmp)
+        #self.SetBitmapDisabled(bmp)
+        #self.SetBitmapFocus(bmp)
+        #self.SetBitmapSelected(bmp)
         self.Refresh()