diff --git a/chirp/share/model_alias_map.yaml b/chirp/share/model_alias_map.yaml index 2f1acf34c..09cbdd311 100644 --- a/chirp/share/model_alias_map.yaml +++ b/chirp/share/model_alias_map.yaml @@ -123,6 +123,8 @@ Baofeng/Pofung: model: UV-5RE, UV-5RE+ - alt: UV-5R model: UV-5RG, RK, RQ, RS, RT, RU +- alt: Baofeng 5RM + model: UV-5RH Pro Max - alt: BF-F8HP model: UV-5RHP - alt: Radioddity UV-5RX3 diff --git a/chirp/wxui/memedit.py b/chirp/wxui/memedit.py index ae8288d6b..3af747a7f 100644 --- a/chirp/wxui/memedit.py +++ b/chirp/wxui/memedit.py @@ -729,8 +729,10 @@ def __init__(self, radio, *a, **k): self._grid = ChirpMemoryGrid(self) self._table = ChirpGridTable(self._features, len(self._col_defs)) - self._grid.AssignTable(self._table) - self._grid.SetSelectionMode(wx.grid.Grid.SelectRows) + # AssignTable added in wxPython 4.1, so use the older interface for + # earlier version support (i.e. Ubuntu Jammy) + self._grid.SetTable(self._table, takeOwnership=True, + selmode=wx.grid.Grid.SelectRows) self._grid.DisableDragRowSize() self._grid.EnableDragCell() self._grid.SetFocus()