Big fixes. Can now use colour names, and exports the event type to

the old namespace

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/lib/colourselect.py b/wxPython/wx/lib/colourselect.py
index 6fb0bd7e77c8340ff8cfc5ff5d03b3ce8f09215e..8b196d6461c4827dfcefdd699368617b2a33053e 100644 (file)
--- a/wxPython/wx/lib/colourselect.py
+++ b/wxPython/wx/lib/colourselect.py
@@ -86,8 +86,10 @@ class ColourSelect(wx.BitmapButton):
         self.SetColour(colour)
 
     def SetColour(self, colour):
-        if type(colour) == type( () ):
-            colour = wxColour(*colour)
+        if type(colour) == tuple:
+            colour = wx.Colour(*colour)
+        if type(colour) == str:
+            colour = wx.NamedColour(colour)
             
         self.colour = colour
         bmp = self.MakeBitmap()

diff --git a/wxPython/wxPython/lib/colourselect.py b/wxPython/wxPython/lib/colourselect.py
index 89d1dff6dfb8ed1a0f9fa09d6d2e27fa5ba37e59..0b41dc16626bd44e3fad0e6092f265320d944a59 100644 (file)
--- a/wxPython/wxPython/lib/colourselect.py
+++ b/wxPython/wxPython/lib/colourselect.py
@@ -9,3 +9,4 @@ __doc__ =  wx.lib.colourselect.__doc__
 ColourSelect = wx.lib.colourselect.ColourSelect
 ColourSelectEvent = wx.lib.colourselect.ColourSelectEvent
 EVT_COLOURSELECT = wx.lib.colourselect.EVT_COLOURSELECT
+wxEVT_COMMAND_COLOURSELECT = wx.lib.colourselect.wxEVT_COMMAND_COLOURSELECT