diff --git a/wxPython/wxPython/lib/colourdb.py b/wxPython/wxPython/lib/colourdb.py index 82c20f43f4..ec9ae457f2 100644 --- a/wxPython/wxPython/lib/colourdb.py +++ b/wxPython/wxPython/lib/colourdb.py @@ -17,7 +17,7 @@ Load color names/values from the rgb.txt file on my system... def getColourList(): - return map(lambda x: x[0], getColourInfoList()) + return [ x[0] for x in getColourInfoList() ] @@ -656,10 +656,14 @@ def getColourInfoList(): ] +_haveUpdated = False + def updateColourDB(): - from wxPython.wx import wxTheColourDatabase - cl = getColourInfoList() - for info in cl: - apply(wxTheColourDatabase.Append, info) + global _haveUpdated + if not _haveUpdated: + from wxPython.wx import wxTheColourDatabase + cl = getColourInfoList() + for info in cl: + wxTheColourDatabase.Append(*info)