summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2008-08-14 19:20:58 +0000
committerjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2008-08-14 19:20:58 +0000
commitc3c6eb14f1d8b250322f63fb6b6adc3fb60c67eb (patch)
tree139b11884af28e3c1558b75f9ebbb883a5177932
parent36649d4e472172fe840444ac0268c7b6b4da94b4 (diff)
changed glcanvas test (fedora fix)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9292 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gr-wxgui/src/python/fftsink2.py5
-rw-r--r--gr-wxgui/src/python/scopesink2.py5
-rw-r--r--gr-wxgui/src/python/waterfallsink2.py5
3 files changed, 6 insertions, 9 deletions
diff --git a/gr-wxgui/src/python/fftsink2.py b/gr-wxgui/src/python/fftsink2.py
index ad2a09c96e..2d8364aaad 100644
--- a/gr-wxgui/src/python/fftsink2.py
+++ b/gr-wxgui/src/python/fftsink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
from fftsink_nongl import fft_sink_f, fft_sink_c
elif style == 'gl':
try:
- import wx
- wx.glcanvas.GLCanvas
- except AttributeError:
+ import wx.glcanvas
+ except ImportError:
raise RuntimeError("wxPython doesn't support glcanvas")
try:
diff --git a/gr-wxgui/src/python/scopesink2.py b/gr-wxgui/src/python/scopesink2.py
index 5eee3efd59..4d9f33afcd 100644
--- a/gr-wxgui/src/python/scopesink2.py
+++ b/gr-wxgui/src/python/scopesink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
from scopesink_nongl import scope_sink_f, scope_sink_c
elif style == 'gl':
try:
- import wx
- wx.glcanvas.GLCanvas
- except AttributeError:
+ import wx.glcanvas
+ except ImportError:
raise RuntimeError("wxPython doesn't support glcanvas")
try:
diff --git a/gr-wxgui/src/python/waterfallsink2.py b/gr-wxgui/src/python/waterfallsink2.py
index 2151930445..c8a4436c73 100644
--- a/gr-wxgui/src/python/waterfallsink2.py
+++ b/gr-wxgui/src/python/waterfallsink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c
elif style == 'gl':
try:
- import wx
- wx.glcanvas.GLCanvas
- except AttributeError:
+ import wx.glcanvas
+ except ImportError:
raise RuntimeError("wxPython doesn't support glcanvas")
try: