From: Robin Dunn <robin@alldunn.com>
Date: Sat, 21 Feb 2004 01:51:41 +0000 (+0000)
Subject: Big fixes.  Can now use colour names, and exports the event type to
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a27d1f42e2bdb0771a2c0083b6a1ed6642c4bbb6

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 6fb0bd7e77..8b196d6461 100644
--- 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 89d1dff6df..0b41dc1662 100644
--- 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