more cvs to svn script changes

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

diff --git a/wxPython/wx/lib/colourselect.py b/wxPython/wx/lib/colourselect.py
index 1183fc4222a66bad5e838b288f46d2870ad8b3e6..4c39ece648e4d38aac4c1f4d2e71e63effdf9e87 100644 (file)
--- a/wxPython/wx/lib/colourselect.py
+++ b/wxPython/wx/lib/colourselect.py
@@ -60,7 +60,7 @@ EVT_COLOURSELECT = wx.PyEventBinder(wxEVT_COMMAND_COLOURSELECT, 1)
 #----------------------------------------------------------------------------
 
 class ColourSelect(wx.BitmapButton):
-    def __init__(self, parent, id, label="", colour=wx.BLACK,
+    def __init__(self, parent, id=wx.ID_ANY, label="", colour=wx.BLACK,
                  pos=wx.DefaultPosition, size=wx.DefaultSize,
                  callback=None, style=0):
         if label:
@@ -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()