diff options
| author | Johnathan Corgan | 2010-07-21 18:29:48 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-07-21 18:29:48 -0700 |
| commit | 9df7bb4aafc6196f15d2d2b4f4458368c6a685e8 (patch) | |
| tree | e9623a3af4bcc24e1a34c4fe6f6977921f0ecab1 | |
| parent | f7a2b8b09bf8d30534dd2d7546a7300e2f358595 (diff) | |
| parent | 1620ab8499a7854ff1248a94782a800fb016d1f2 (diff) | |
| download | gnuradio-9df7bb4aafc6196f15d2d2b4f4458368c6a685e8.tar.gz gnuradio-9df7bb4aafc6196f15d2d2b4f4458368c6a685e8.tar.bz2 gnuradio-9df7bb4aafc6196f15d2d2b4f4458368c6a685e8.zip | |
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)
| -rw-r--r-- | gr-wxgui/src/python/plotter/gltext.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/plotter/gltext.py b/gr-wxgui/src/python/plotter/gltext.py index 67f62ca56..1b3c047dc 100644 --- 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)
alpha = img.GetData()
- if isinstance(self._foreground, wx.Color):
+ if isinstance(self._foreground, wx.Colour):
"""
If we have a static color...
"""
|