Merge pull request #2294 from freakboy3742/prerelease-bugs

Prerelease bugs
beeware · Dec 21, 2023 · bad6340 · bad6340
2 parents de1b76f + 7a8fcea
commit bad6340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/changes/2294.misc.rst 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
@@ -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
@@ -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: