diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:36:32 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:36:32 -0400 |
| commit | 27e426e7a0f3ce93cb7ac3b2daa72ca719636d8c (patch) | |
| tree | a602b8fbeafd3a9b59e1cd97bbe09df8ac09745f /gr-wxgui/python/wxgui/scope_window.py | |
| parent | 694e322bab9bfaa1b9613eebeee5c69fdae8bd7b (diff) | |
| parent | f98715b851b39c0e3f11c0a5e853eec1ac7dbff6 (diff) | |
Merge branch 'maint'
Conflicts:
gr-audio/lib/alsa/audio_alsa_sink.cc
gr-audio/lib/alsa/audio_alsa_source.cc
Diffstat (limited to 'gr-wxgui/python/wxgui/scope_window.py')
| -rw-r--r-- | gr-wxgui/python/wxgui/scope_window.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-wxgui/python/wxgui/scope_window.py b/gr-wxgui/python/wxgui/scope_window.py index 5d367d9c45..357998bf95 100644 --- a/gr-wxgui/python/wxgui/scope_window.py +++ b/gr-wxgui/python/wxgui/scope_window.py @@ -495,7 +495,6 @@ class scope_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.channel_plotter(self) self.plotter.SetSize(wx.Size(*size)) - self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.enable_legend(True) self.plotter.enable_point_label(True) |