Merge branch 'maint'

* maint:
  wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper)

diff --git a/gr-wxgui/src/python/plotter/gltext.py b/gr-wxgui/src/python/plotter/gltext.py
index 67f62ca566d53adb33319e0c013e9a457a867c58..1b3c047dceeeb35172818459bf55d97c14379c36 100644 (file)
--- a/gr-wxgui/src/python/plotter/gltext.py
+++ b/gr-wxgui/src/python/plotter/gltext.py
@@ -193,7 +193,7 @@ class TextElement(object):
         img   = wx.ImageFromBitmap(bmp)\r
         alpha = img.GetData()\r
         \r
-        if isinstance(self._foreground, wx.Color):  \r
+        if isinstance(self._foreground, wx.Colour):\r
             """\r
             If we have a static color...  \r
             """    \r