diff --git a/changes/2294.misc.rst b/changes/2294.misc.rst new file mode 100644 index 0000000000..3d13a806d8 --- /dev/null +++ b/changes/2294.misc.rst @@ -0,0 +1 @@ +Some minor bugs and inconsistencies discovered during pre-release testing were corrected. diff --git a/demo/toga_demo/app.py b/demo/toga_demo/app.py index 507659e0f3..e272f8c869 100755 --- a/demo/toga_demo/app.py +++ b/demo/toga_demo/app.py @@ -72,7 +72,7 @@ def startup(self): self.action2, "Action 2", tooltip="Perform action 2", - icon=toga.Icon.TOGA_ICON, + icon=toga.Icon.DEFAULT_ICON, ) self.main_window.toolbar.add(cmd1, cmd2) diff --git a/web/src/toga_web/app.py b/web/src/toga_web/app.py index 4d7015b8eb..2a10cb5eb1 100644 --- a/web/src/toga_web/app.py +++ b/web/src/toga_web/app.py @@ -1,5 +1,5 @@ import toga -from toga.command import GROUP_BREAK, SECTION_BREAK +from toga.command import Separator from toga_web.libs import create_element, js from toga_web.window import Window @@ -66,9 +66,7 @@ def create_menus(self): submenu = None for cmd in self.interface.commands: - if cmd == GROUP_BREAK: - submenu = None - elif cmd == SECTION_BREAK: + if isinstance(cmd, Separator): # TODO - add a section break pass else: