diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-17 14:57:48 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-17 14:57:48 -0700 |
| commit | f5cb6160333ed1eb698a4477439e66a792f4efa2 (patch) | |
| tree | fbb0894c9227af1f4b668ffdc6accc64e9aa62ff | |
| parent | c84e7f49eb5e948ef5b041e6e56a3b961070b7bd (diff) | |
| parent | fd2ec0b1eb5713124161da2934964769290eb2e4 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-utils/python/modtool/modtool_makexml.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/forms/forms.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gr-utils/python/modtool/modtool_makexml.py b/gr-utils/python/modtool/modtool_makexml.py index 28eabe1b81..82dc9d94d4 100644 --- a/gr-utils/python/modtool/modtool_makexml.py +++ b/gr-utils/python/modtool/modtool_makexml.py @@ -137,7 +137,7 @@ class ModToolMakeXML(ModTool): 'std::vector<float>': 'real_vector', 'std::vector<gr_complex>': 'complex_vector', } - if p_type in ('int',) and default_v[:2].lower() == '0x': + if p_type in ('int',) and default_v is not None and len(default_v) > 1 and default_v[:2].lower() == '0x': return 'hex' try: return translate_dict[p_type] diff --git a/gr-wxgui/python/wxgui/forms/forms.py b/gr-wxgui/python/wxgui/forms/forms.py index db55472210..f819f13397 100644 --- a/gr-wxgui/python/wxgui/forms/forms.py +++ b/gr-wxgui/python/wxgui/forms/forms.py @@ -515,13 +515,13 @@ class notebook(_chooser_base): _chooser_base.__init__(self, **kwargs) assert len(pages) == len(self._choices) self._notebook = notebook - self._notebook.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self._handle) + self._notebook.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self._handle) #add pages, setting the label on each tab for i, page in enumerate(pages): self._notebook.AddPage(page, self._labels[i]) self._add_widget(self._notebook) - def _handle(self, event): self[INT_KEY] = self._notebook.GetSelection() + def _handle(self, event): self[INT_KEY] = event.GetSelection() # SetSelection triggers a page change event (deprecated, breaks on Windows) and ChangeSelection does not def _update(self, i): self._notebook.ChangeSelection(i) |