Changeset 1c6c3e1d in mainline for uspace/app/calculator/calculator.c

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

• uspace/app/calculator/calculator.c (modified) (4 diffs)

uspace/app/calculator/calculator.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2016 Martin Decky
  * All rights reserved.
@@ -46 +46 @@
 #include <ui/entry.h>
 #include <ui/fixed.h>
+#include <ui/menu.h>
 #include <ui/menubar.h>
-#include <ui/menu.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include <ui/pbutton.h>
@@ -896 +897 @@
         }
 
-        rc = ui_menu_create(calc.menubar, "~F~ile", &mfile);
+        rc = ui_menu_dd_create(calc.menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -910 +911 @@
         ui_menu_entry_set_cb(mexit, calc_file_exit, (void *) &calc);
 
-        rc = ui_menu_create(calc.menubar, "~E~dit", &medit);
+        rc = ui_menu_dd_create(calc.menubar, "~E~dit", NULL, &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");