in unescape add normal characters in addition to unescaped characters :)

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

diff --git a/wxPython/wx/lib/colourdb.py b/wxPython/wx/lib/colourdb.py
index ec9ae457f21dba655e44c85f0770cee2b3b1c6aa..d44b1ea2f041b332a9f8c5ba6b7aabb17c462338 100644 (file)
--- a/wxPython/wx/lib/colourdb.py
+++ b/wxPython/wx/lib/colourdb.py
@@ -661,9 +661,12 @@ _haveUpdated = False
 def updateColourDB():
     global _haveUpdated
     if not _haveUpdated:
 def updateColourDB():
     global _haveUpdated
     if not _haveUpdated:

-        from wxPython.wx import wxTheColourDatabase
+        import wx
+        assert wx.GetApp() is not None, "You must have a wx.App object before you can use the colour database."

         cl = getColourInfoList()
         cl = getColourInfoList()

+        

         for info in cl:
         for info in cl:

-            wxTheColourDatabase.Append(*info)
-
+            wx.TheColourDatabase.Append(*info)
+            
+        _haveUpdated = True