Added a typemap that converts the references returned for some GDI

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

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):
         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()
             
         self.colour = colour
         bmp = self.MakeBitmap()