summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Seeber2013-01-18 16:28:10 -0800
committerBalint Seeber2013-01-18 16:43:43 -0800
commit6b9b1f762eacd6ad53727cf116d12a76d6e8b6b8 (patch)
treeb05ace5729285114c56cc4b500c14245ca02cc46
parentd3c7e93f2143e31ed5ff80aa21c8d983df92d19f (diff)
downloadgnuradio-6b9b1f762eacd6ad53727cf116d12a76d6e8b6b8.tar.gz
gnuradio-6b9b1f762eacd6ad53727cf116d12a76d6e8b6b8.tar.bz2
gnuradio-6b9b1f762eacd6ad53727cf116d12a76d6e8b6b8.zip
Added PaintDC to 'plotter_base' so WX GL sinks will work under Windows.
Changed 'notebook' SetSelection (deprecated) to ChangeSelection.
-rw-r--r--gr-wxgui/src/python/forms/forms.py3
-rw-r--r--gr-wxgui/src/python/plotter/plotter_base.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/forms/forms.py b/gr-wxgui/src/python/forms/forms.py
index f1d0038ab..cabc5860b 100644
--- a/gr-wxgui/src/python/forms/forms.py
+++ b/gr-wxgui/src/python/forms/forms.py
@@ -500,7 +500,8 @@ class notebook(_chooser_base):
self._add_widget(self._notebook)
def _handle(self, event): self[INT_KEY] = self._notebook.GetSelection()
- def _update(self, i): self._notebook.SetSelection(i)
+ # SetSelection triggers a page change event (deprecated, breaks on Windows) and ChangeSelection does not
+ def _update(self, i): self._notebook.ChangeSelection(i)
# ----------------------------------------------------------------
# Stand-alone test application
diff --git a/gr-wxgui/src/python/plotter/plotter_base.py b/gr-wxgui/src/python/plotter/plotter_base.py
index 41c94e5e0..f1cbaf3c7 100644
--- a/gr-wxgui/src/python/plotter/plotter_base.py
+++ b/gr-wxgui/src/python/plotter/plotter_base.py
@@ -151,6 +151,8 @@ class plotter_base(wx.glcanvas.GLCanvas, common.mutex):
Resize the view port if the width or height changed.
Redraw the screen, calling the draw functions.
"""
+ # create device context (needed on Windows, noop on X)
+ dc = wx.PaintDC(self)
self.lock()
self.SetCurrent()