summaryrefslogtreecommitdiff
path: root/gr-wxgui/src/python/waterfallsink2.py
diff options
context:
space:
mode:
Diffstat (limited to 'gr-wxgui/src/python/waterfallsink2.py')
-rw-r--r--gr-wxgui/src/python/waterfallsink2.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-wxgui/src/python/waterfallsink2.py b/gr-wxgui/src/python/waterfallsink2.py
index c8a4436c7..08e96105d 100644
--- a/gr-wxgui/src/python/waterfallsink2.py
+++ b/gr-wxgui/src/python/waterfallsink2.py
@@ -25,12 +25,9 @@ p = gr.prefs()
style = p.get_string('wxgui', 'style', 'auto')
# In 3.2 we'll change 'auto' to mean 'gl' if possible, then fallback
-if style == 'auto':
- style = 'nongl'
+# Currently, anything other than 'gl' means 'nongl'
-if style == 'nongl':
- from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c
-elif style == 'gl':
+if style == 'gl':
try:
import wx.glcanvas
except ImportError:
@@ -42,3 +39,6 @@ elif style == 'gl':
raise RuntimeError("Unable to import OpenGL. Are Python wrappers for OpenGL installed?")
from waterfallsink_gl import waterfall_sink_f, waterfall_sink_c
+
+else:
+ from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c