meerk40t 0.9.7051__py2.py3-none-any.whl → 0.9.7900__py2.py3-none-any.whl

meerk40t/gui/statusbarwidgets/shapepropwidget.py

@@ -1,7 +1,7 @@
 import wx
 
 from meerk40t.core.elements.element_types import elem_nodes
-from meerk40t.core.units import Length, UNITS_PER_PIXEL
+from meerk40t.core.units import UNITS_PER_PIXEL, Length
 from meerk40t.gui.icons import (
     icon_cap_butt,
     icon_cap_round,
@@ -41,38 +41,40 @@ class LinecapWidget(StatusBarWidget):
             )
         )
         self.btn_cap_butt = wxStaticBitmap(
-            self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(self.height, -1),
+            style=wx.BORDER_RAISED,
         )
-        isize = int(max(20, self.parent.available_height - 4) * self.context.root.bitmap_correction_scale)
-
-        self.btn_cap_butt.SetBitmap(
-            icon_cap_butt.GetBitmap(
-                resize=isize, buffer=1
-            )
+        isize = int(
+            max(20, self.parent.available_height - 4)
+            * self.context.root.bitmap_correction_scale
         )
+
+        self.btn_cap_butt.SetBitmap(icon_cap_butt.GetBitmap(resize=isize, buffer=1))
         self.btn_cap_butt.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_butt.SetToolTip(_("Set the end of the lines to a butt-shape"))
         self.btn_cap_butt.Bind(wx.EVT_LEFT_DOWN, self.on_cap_butt)
 
         self.btn_cap_round = wxStaticBitmap(
-            self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
-        )
-        self.btn_cap_round.SetBitmap(
-            icon_cap_round.GetBitmap(
-                resize=isize, buffer=1
-            )
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(self.height, -1),
+            style=wx.BORDER_RAISED,
         )
+        self.btn_cap_round.SetBitmap(icon_cap_round.GetBitmap(resize=isize, buffer=1))
         self.btn_cap_round.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_round.SetToolTip(_("Set the end of the lines to a round-shape"))
         self.btn_cap_round.Bind(wx.EVT_LEFT_DOWN, self.on_cap_round)
 
         self.btn_cap_square = wxStaticBitmap(
-            self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(self.height, -1),
+            style=wx.BORDER_RAISED,
         )
 
-        self.btn_cap_square.SetBitmap(
-            icon_cap_square.GetBitmap(resize=isize, buffer=1)
-        )
+        self.btn_cap_square.SetBitmap(icon_cap_square.GetBitmap(resize=isize, buffer=1))
         self.btn_cap_square.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_square.SetToolTip(_("Set the end of the lines to a square-shape"))
         self.btn_cap_square.Bind(wx.EVT_LEFT_DOWN, self.on_cap_square)
@@ -116,16 +118,14 @@ class LinejoinWidget(StatusBarWidget):
             )
         )
         isize = int(
-            max(20, self.parent.available_height - 4) *
-            self.context.root.bitmap_correction_scale
+            max(20, self.parent.available_height - 4)
+            * self.context.root.bitmap_correction_scale
         )
         self.btn_join_bevel = wxStaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
 
-        self.btn_join_bevel.SetBitmap(
-            icon_join_bevel.GetBitmap(resize=isize, buffer=1)
-        )
+        self.btn_join_bevel.SetBitmap(icon_join_bevel.GetBitmap(resize=isize, buffer=1))
         self.btn_join_bevel.SetMaxSize(wx.Size(50, -1))
         self.btn_join_bevel.SetToolTip(_("Set the join of the lines to a bevel-shape"))
         self.btn_join_bevel.Bind(wx.EVT_LEFT_DOWN, self.on_join_bevel)
@@ -133,9 +133,7 @@ class LinejoinWidget(StatusBarWidget):
         self.btn_join_round = wxStaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
-        self.btn_join_round.SetBitmap(
-            icon_join_round.GetBitmap(resize=isize, buffer=1)
-        )
+        self.btn_join_round.SetBitmap(icon_join_round.GetBitmap(resize=isize, buffer=1))
         self.btn_join_round.SetMaxSize(wx.Size(50, -1))
         self.btn_join_round.SetToolTip(_("Set the join of lines to a round-shape"))
         self.btn_join_round.Bind(wx.EVT_LEFT_DOWN, self.on_join_round)
@@ -143,9 +141,7 @@ class LinejoinWidget(StatusBarWidget):
         self.btn_join_miter = wxStaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
-        self.btn_join_miter.SetBitmap(
-            icon_join_miter.GetBitmap(resize=isize, buffer=1)
-        )
+        self.btn_join_miter.SetBitmap(icon_join_miter.GetBitmap(resize=isize, buffer=1))
         self.btn_join_miter.SetMaxSize(wx.Size(50, -1))
         self.btn_join_miter.SetToolTip(_("Set the join of lines to a miter-shape"))
         self.btn_join_miter.Bind(wx.EVT_LEFT_DOWN, self.on_join_miter)
@@ -207,12 +203,15 @@ class FillruleWidget(StatusBarWidget):
             )
         )
         isize = int(
-            max(20, self.parent.available_height - 4) *
-            self.context.root.bitmap_correction_scale
+            max(20, self.parent.available_height - 4)
+            * self.context.root.bitmap_correction_scale
         )
 
         self.btn_fill_nonzero = wxStaticBitmap(
-            self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(self.height, -1),
+            style=wx.BORDER_RAISED,
         )
         self.btn_fill_nonzero.SetMaxSize(wx.Size(50, -1))
         self.btn_fill_nonzero.SetBitmap(
@@ -222,7 +221,10 @@ class FillruleWidget(StatusBarWidget):
         self.btn_fill_nonzero.Bind(wx.EVT_LEFT_DOWN, self.on_fill_nonzero)
 
         self.btn_fill_evenodd = wxStaticBitmap(
-            self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(self.height, -1),
+            style=wx.BORDER_RAISED,
         )
         self.btn_fill_evenodd.SetBitmap(
             icon_fill_evenodd.GetBitmap(resize=isize, buffer=1)
@@ -289,18 +291,27 @@ class PositionWidget(StatusBarWidget):
             self.parent, wx.ID_ANY, label=self.units[self.unit_index]
         )
         icon_size = int(
-            max(20, self.parent.available_height - 4) *
-            self.context.root.bitmap_correction_scale
+            max(20, self.parent.available_height - 8)
+            * self.context.root.bitmap_correction_scale
         )
 
-        self.button_lock_ratio = wxStaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_RAISED)
+        self.button_lock_ratio = wxStaticBitmap(
+            self.parent,
+            id=wx.ID_ANY,
+            size=wx.Size(icon_size, -1),
+            style=wx.BORDER_RAISED,
+        )
         self.bitmap_locked = icons8_lock.GetBitmap(resize=icon_size, use_theme=False)
-        self.bitmap_unlocked = icons8_unlock.GetBitmap(resize=icon_size, use_theme=False)
+        self.bitmap_unlocked = icons8_unlock.GetBitmap(
+            resize=icon_size, use_theme=False
+        )
 
         self.offset_index = 0  # 0 to 8 tl tc tr cl cc cr bl bc br
         self.offset_x = 0.0
         self.offset_y = 0.0
-        self.button_param = wxStaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_RAISED)
+        self.button_param = wxStaticBitmap(
+            self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_NONE
+        )
         self.pos_bitmaps = self.calculate_icons(icon_size)
         self.button_param.SetBitmap(self.pos_bitmaps[self.offset_index])
 
@@ -369,8 +380,7 @@ class PositionWidget(StatusBarWidget):
         )
 
         self._lock_ratio = True
-        self.lock_ratio =  self.context.lock_active
-
+        self.lock_ratio = self.context.lock_active
 
     @property
     def units_name(self):

meerk40t/gui/statusbarwidgets/statusbar.py

@@ -1,7 +1,7 @@
 import wx
 
 from meerk40t.gui.icons import icons8_circled_right
-from meerk40t.gui.wxutils import wxStaticBitmap, dip_size
+from meerk40t.gui.wxutils import dip_size, wxStaticBitmap
 
 _ = wx.GetTranslation
 
@@ -61,7 +61,7 @@ class CustomStatusBar(wx.StatusBar):
     @property
     def available_height(self):
         sb_size = self.GetSize()
-        return sb_size[1]
+        return max(1, sb_size[1] - 2)
 
     def Clear(self):
         """

meerk40t/gui/toolwidgets/toolmeasure.py

@@ -40,7 +40,7 @@ class MeasureTool(PointListTool):
             return
         mat_fact = get_gc_scale(gc)
         try:
-            font_size = 10.0 / mat_fact
+            font_size = 10.0 * self.magnification / mat_fact
         except ZeroDivisionError:
             font_size = 5000
         if font_size > 1e8:

meerk40t/gui/toolwidgets/toolnodeedit.py

@@ -907,7 +907,10 @@ class EditTool(ToolWidget):
                 path.approximate_arcs_with_cubics()
         except AttributeError:
             return
-        newnode = node.replace_node(path=path, type="elem path")
+        try:
+            newnode = node.replace_node(path=path, type="elem path")
+        except ValueError:
+            return
         for item in oldstuff:
             setattr(newnode, item[0], item[1])
         newnode.altered()

meerk40t/gui/toolwidgets/tooltabedit.py

@@ -11,7 +11,7 @@ from meerk40t.gui.scene.sceneconst import (
     RESPONSE_DROP,
 )
 from meerk40t.gui.toolwidgets.toolwidget import ToolWidget
-from meerk40t.gui.wxutils import get_gc_scale
+from meerk40t.gui.wxutils import get_gc_scale, dip_size
 
 _ = wx.GetTranslation
 
@@ -35,6 +35,7 @@ class SimpleSlider:
             trailer = ""
         self.trailer = trailer
         self.no_value_display = False
+        self.magnification = dip_size(scene.gui, 100, 100)[1] / 100
 
     @property
     def value(self):
@@ -77,7 +78,7 @@ class SimpleSlider:
         """
         gc.PushState()
         s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
-        offset = self.pt_offset / s
+        offset = self.pt_offset * self.magnification / s
 
         mypen = wx.Pen(wx.LIGHT_GREY)
         sx = get_gc_scale(gc)
@@ -119,7 +120,7 @@ class SimpleSlider:
             if not self.trailer.startswith("%"):
                 symbol += " "
             symbol += _(self.trailer)
-        font_size = 10 / s
+        font_size = 10 * self.magnification / s
         if font_size < 1.0:
             font_size = 1.0
         try:
@@ -146,7 +147,7 @@ class SimpleSlider:
 
     def hit(self, xpos, ypos):
         s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
-        offset = self.pt_offset / s
+        offset = self.pt_offset * self.magnification / s
         inside = bool(abs(self.ptx - xpos) <= offset and abs(self.pty - ypos) <= offset)
         return inside
 
@@ -177,6 +178,7 @@ class TabEditTool(ToolWidget):
         slider = SimpleSlider(0, self.scene, minval, maxval, 0, 0, self.slider_size, info )
         slider.no_value_display = True
         self.sliders.append(slider)
+        self.magnification = dip_size(scene.gui, 100, 100)[1] / 100
 
     def reset(self):
         self.points.clear()
@@ -358,7 +360,7 @@ class TabEditTool(ToolWidget):
         if len(self.sliders) == 0:
             return
         s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
-        offset = self.pt_offset / s
+        offset = self.pt_offset * self.magnification / s
         width = self.slider_size / s
         x = bb[0]
         y = bb[1]
@@ -377,7 +379,7 @@ class TabEditTool(ToolWidget):
         """
         gc.PushState()
         s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
-        offset = self.pt_offset / s
+        offset = self.pt_offset * self.magnification / s
         gc.SetPen(wx.RED_PEN)
         gc.SetBrush(wx.RED_BRUSH)
         for index, g in enumerate(self.points):
@@ -424,7 +426,7 @@ class TabEditTool(ToolWidget):
                 return RESPONSE_CHAIN
             self.scene.pane.tool_active = True
             self.scene.pane.modif_active = True
-            offset = self.pt_offset
+            offset = self.pt_offset * self.magnification
             s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
             offset /= s
             xp = space_pos[0]

meerk40t/gui/wxmeerk40t.py

@@ -1065,6 +1065,7 @@ class wxMeerK40t(wx.App, Module):
                 register_panel_debugger,
                 register_panel_icon,
                 register_panel_window,
+                register_panel_plotter,
             )
 
             kernel.register("wxpane/debug_tree", register_panel_debugger)
@@ -1072,6 +1073,7 @@ class wxMeerK40t(wx.App, Module):
             kernel.register("wxpane/debug_icons", register_panel_icon)
             kernel.register("wxpane/debug_shutdown", register_panel_crash)
             kernel.register("wxpane/debug_window", register_panel_window)
+            kernel.register("wxpane/debug_plotter", register_panel_plotter) 
 
             from meerk40t.gui.utilitywidgets.debugwidgets import register_widget_icon
 

meerk40t/gui/wxmmain.py

@@ -1241,6 +1241,20 @@ class MeerK40t(MWindow):
                 "page": "Scene",
                 "section": "General",
             },
+            {
+                "attr": "file_selection",
+                "object": context.root,
+                "default": True,
+                "type": bool,
+                "label": _("Treat file selection as group selection"),
+                "tip": _(
+                    "Active: Single click within the boundaries of the contained elements of a filenode selects all elements within the file"
+                )
+                + "\n"
+                + _("Inactive: filenodes will not be used for selection"),
+                "page": "Scene",
+                "section": "General",
+            },
         ]
         context.kernel.register_choices("preferences", choices)
 
@@ -3002,7 +3016,7 @@ class MeerK40t(MWindow):
 
         @context.console_command("dialog_gear", hidden=True)
         def gear(**kwargs):
-            dlg = wx.TextEntryDialog(gui, _("Enter Forced Gear"), _("Gear Entry"), "")
+            dlg = wx.TextEntryDialog(gui, _("Enter Forced Gear"), _("Gear Entry"), "0")
             dlg.SetValue("")
 
             if dlg.ShowModal() == wx.ID_OK:
@@ -3545,6 +3559,7 @@ class MeerK40t(MWindow):
         if hasattr(context.kernel.busyinfo, "reparent"):
             context.kernel.busyinfo.reparent(self)
 
+    @signal_listener("pane")
     @lookup_listener("pane")
     def dynamic_fill_pane_menu(self, new=None, old=None):
         def toggle_pane(pane_toggle):
@@ -3620,15 +3635,14 @@ class MeerK40t(MWindow):
                 pane_name = pane.name
             except AttributeError:
                 pane_name = suffix_path
-
-            pane_caption = pane_name[0].upper() + pane_name[1:] + "."
-            try:
+            pane_caption = ""
+            src = "default"
+            if hasattr(pane, "control") and hasattr(pane.control, "caption"):
+                pane_caption = pane.control.caption
+            elif hasattr(pane, "caption"):
                 pane_caption = pane.caption
-            except AttributeError:
-                pass
             if not pane_caption:
                 pane_caption = pane_name[0].upper() + pane_name[1:] + "."
-
             menu_item = menu_context.Append(wx.ID_ANY, pane_caption, "", wx.ITEM_CHECK)
             menu_item.SetHelp(helptext)
             self.Bind(
@@ -5611,7 +5625,7 @@ class MeerK40t(MWindow):
         Zoom scene to bed size.
         """
         zoom = self.context.zoom_margin
-        self.context(f"scene focus -a {-zoom}% {-zoom}% {zoom+100}% {zoom+100}%\n")
+        self.context(f"scene focus -a {-zoom}% {-zoom}% {zoom + 100}% {zoom + 100}%\n")
 
     def update_statusbar(self, text):
         self.main_statusbar.SetStatusText(text, 0)
@@ -5701,7 +5715,7 @@ class MeerK40t(MWindow):
                 return
             helptext = menuitem.GetHelp()
             if not helptext:
-                helptext = f'{menuitem.GetItemLabelText()} ({_("No help text")})'
+                helptext = f"{menuitem.GetItemLabelText()} ({_('No help text')})"
             self.update_statusbar(helptext)
         except RuntimeError:
             pass

meerk40t/gui/wxmribbon.py

@@ -678,6 +678,42 @@ class MKRibbonBarPanel(RibbonBarPanel):
         self.apply_enable_rules()
         self.redrawn()
 
+    @signal_listener("icon;label")
+    def on_label_update(self, origin, node=None, *args):
+        """
+        Signal to update the icon or label of a button.
+        This is used to update the icon or label of a button when it changes.
+        """
+        if node is None or len(args) == 0:
+            return
+        if not isinstance(node, (list, tuple)):
+            node = [node]
+        newlabel = None
+        newtooltip = None
+        if isinstance(args[0], (list, tuple)):
+            newlabel = args[0][0] if len(args[0]) > 0 else None
+            newtooltip = args[0][1] if len(args[0]) > 1 else None
+        else:
+            newlabel = args[0]  # First argument is the new label
+        if newlabel is None and newtooltip is None:
+            return
+        for page in self.pages:
+            for panel in page.panels:
+                for button in panel.buttons:
+                    if button.identifier in node:
+                        button.label = newlabel if newlabel is not None else button.label
+                        button.tip = (
+                            newtooltip if newtooltip is not None else button.tip
+                        )
+                    if "multi" in button.button_dict:
+                        for subbutton in button.button_dict["multi"]:
+                            if subbutton["identifier"] in node:
+                                if newlabel is not None:
+                                    subbutton["label"] = newlabel
+                                if newtooltip is not None:
+                                    subbutton["tip"] = newtooltip
+        self.redrawn()  
+
     @signal_listener("tool_changed")
     def on_tool_changed(self, origin, newtool=None, *args):
         # Signal provides a tuple with (togglegroup, id)

meerk40t/gui/wxutils.py

@@ -1650,58 +1650,31 @@ class wxCheckListBox(StaticBoxSizer):
         **kwargs,
     ):
         self.parent = parent
-        self.choices = choices
+        self.choices = []
         self._children = []
-        self._tool_tip = None
+        self._tool_tip = ""
         self._help = None
         super().__init__(
             parent=parent, id=wx.ID_ANY, label=label, orientation=wx.VERTICAL
         )
         self.majorDimension = majorDimension
         self.style = style
-        self._build_controls()
-
-    def _build_controls(self):
-        """
-        Build the controls for the CheckListBox.
-        This method is called during initialization to create the checkboxes.
-        """
-        if self.choices is None:
-            self.choices = []
-        if self.majorDimension == 0 or self.style == wx.RA_SPECIFY_ROWS:
-            self.majorDimension = 1000
-        container = None
-        for idx, c in enumerate(self.choices):
-            if idx % self.majorDimension == 0:
-                container = wx.BoxSizer(wx.HORIZONTAL)
-                self.Add(container, 0, wx.EXPAND, 0)
-            check_option = wx.CheckBox(self.parent, wx.ID_ANY, label=c)
-            container.Add(check_option, 1, wx.ALIGN_CENTER_VERTICAL, 0)
-            self._children.append(check_option)
-
-        if platform.system() == "Linux":
-
-            def on_mouse_over_check(ctrl):
-                def mouse(event=None):
-                    ctrl.SetToolTip(self._tool_tip)
-                    event.Skip()
-
-                return mouse
-
-            for ctrl in self._children:
-                ctrl.Bind(wx.EVT_MOTION, on_mouse_over_check(ctrl))
-
-        for ctrl in self._children:
-            ctrl.Bind(wx.EVT_CHECKBOX, self.on_check)
-            ctrl.Bind(wx.EVT_RIGHT_DOWN, self.on_right_click)
-
-        for ctrl in self._children:
-            set_color_according_to_theme(ctrl, "text_bg", "text_fg")
+        if choices is None:
+            choices = []
+        self.Set(choices)
 
     @property
     def Children(self):
         return self._children
 
+    def on_mouse_over_check(self, event):
+        """
+        Handle mouse over events to show tooltips on Linux.
+        """
+        if self._tool_tip:
+            event.GetEventObject().SetToolTip(self._tool_tip)
+        event.Skip()
+
     def GetParent(self):
         return self.parent
 
@@ -1764,6 +1737,11 @@ class wxCheckListBox(StaticBoxSizer):
             ),
             id=item.GetId(),
         )
+        # Test routines
+        # item = menu.Append(wx.ID_ANY, "Test-Routine to set few items", "")
+        # parent.Bind(wx.EVT_MENU, lambda e: self.Set(["A", "B", "C"]), id=item.GetId())
+        # item = menu.Append(wx.ID_ANY, "Test-Routine to set many items", "")
+        # parent.Bind(wx.EVT_MENU, lambda e: self.Set([f"Item {i}" for i in range(20)]), id=item.GetId())
         parent.PopupMenu(menu)
         menu.Destroy()
 
@@ -1843,9 +1821,55 @@ class wxCheckListBox(StaticBoxSizer):
         :param choices: A list of strings to set as choices.
         """
         # print (f"Setting choices for {self.GetLabel()}: {choices}")
-        self.Clear()
+        """
+        This is more efficient than clearing and rebuilding the controls.
+        Update the labels of existing controls to match new_choices.
+        If there are more controls than choices, extra controls are destroyed.
+        If there are fewer controls than choices, new controls are created.
+        """
+        # Update existing controls
+        if self.majorDimension == 0 or self.style == wx.RA_SPECIFY_ROWS:
+            self.majorDimension = 1000
+        last_container = None
+        for idx, choice in enumerate(choices):
+            if idx < len(self._children):
+                self._children[idx].SetLabel(choice)
+                # self._children[idx].Show(True)
+            else:
+                # Add new controls if needed
+                check_option = wx.CheckBox(self.parent, wx.ID_ANY, label=choice)
+                if self._tool_tip:
+                    check_option.SetToolTip(self._tool_tip)
+                check_option.Bind(wx.EVT_CHECKBOX, self.on_check)
+                check_option.Bind(wx.EVT_RIGHT_DOWN, self.on_right_click)
+                if platform.system() == "Linux":
+                    check_option.Bind(wx.EVT_MOTION, self.on_mouse_over_check)
+                set_color_according_to_theme(check_option, "text_bg", "text_fg")
+                self._children.append(check_option)
+                # Add to layout
+                # Find or create the appropriate container
+                if idx % self.majorDimension == 0:
+                    last_container = wx.BoxSizer(wx.HORIZONTAL)
+                    self.Add(last_container, 0, wx.EXPAND, 0)
+                else:
+                    # Find the last container
+                    if last_container is None:
+                        for c in self.GetChildren():
+                            if c.IsSizer():
+                                last_container = c.GetSizer()
+                    if last_container is None:
+                        # fallback: create new container
+                        last_container = wx.BoxSizer(wx.HORIZONTAL)
+                        self.Add(last_container, 0, wx.EXPAND, 0)
+                last_container.Add(check_option, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+        # Remove extra controls
+        if len(self._children) > len(choices):
+            for idx in range(len(choices), len(self._children)):
+                self._children[idx].Destroy()
+            self._children = self._children[: len(choices)]
+        self.Layout()
+        self.parent.Layout()
         self.choices = list(choices)
-        self._build_controls()
 
 
 ##############