diff options
| author | Johnathan Corgan | 2013-01-20 09:35:30 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2013-01-20 09:35:30 -0800 |
| commit | 96b457a433dee6a4b814b188e20432ba459c694b (patch) | |
| tree | 0f38ab4b904b6ee1adab12ba91c4b4d8d9812be9 | |
| parent | 5f6bf76beca49831fccef78587668b06a88940a4 (diff) | |
| parent | e41b7a54b2c7799bc4c3e177232574f1d38ccab9 (diff) | |
| download | gnuradio-96b457a433dee6a4b814b188e20432ba459c694b.tar.gz gnuradio-96b457a433dee6a4b814b188e20432ba459c694b.tar.bz2 gnuradio-96b457a433dee6a4b814b188e20432ba459c694b.zip | |
Merge branch 'maint'
| -rw-r--r-- | gr-wxgui/src/python/forms/forms.py | 3 | ||||
| -rw-r--r-- | gr-wxgui/src/python/plotter/plotter_base.py | 2 | ||||
| -rw-r--r-- | grc/gui/FlowGraph.py | 5 |
3 files changed, 7 insertions, 3 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 25811f09b..b8a2ce709 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() diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py index 67e5af97b..6af4bcb62 100644 --- a/grc/gui/FlowGraph.py +++ b/grc/gui/FlowGraph.py @@ -494,8 +494,9 @@ class FlowGraph(Element): Move a selected element to the new coordinate. Auto-scroll the scroll bars at the boundaries. """ - #to perform a movement, the mouse must be pressed, no pending events - if gtk.events_pending() or not self.mouse_pressed: return + #to perform a movement, the mouse must be pressed + # (no longer checking pending events via gtk.events_pending() - always true in Windows) + if not self.mouse_pressed: return #perform autoscrolling width, height = self.get_size() x, y = coordinate |