Merge recent wxPython changes from 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-23 20:50:39 +00:00
parent e31f4da5f0
commit fe45b493dc
50 changed files with 7989 additions and 2997 deletions
--- 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()