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

Timestamp:

2023-10-22T17:55:33Z (20 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/uidemo/uidemo.c (modified) (6 diffs)

uspace/app/uidemo/uidemo.c

@@ -45 +45 @@
 #include <ui/label.h>
 #include <ui/list.h>
+#include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
-#include <ui/menu.h>
 #include <ui/msgdialog.h>
 #include <ui/pbutton.h>
@@ -764 +765 @@
         }
 
-        rc = ui_menu_create(demo.mbar, "~F~ile", &demo.mfile);
+        rc = ui_menu_dd_create(demo.mbar, "~F~ile", NULL, &demo.mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -804 +805 @@
         }
 
+        ui_menu_entry_set_disabled(mfoobar, true);
+
         rc = ui_menu_entry_sep_create(demo.mfile, &msep);
         if (rc != EOK) {
@@ -818 +821 @@
         ui_menu_entry_set_cb(mexit, uidemo_file_exit, (void *) &demo);
 
-        rc = ui_menu_create(demo.mbar, "~E~dit", &demo.medit);
+        rc = ui_menu_dd_create(demo.mbar, "~E~dit", NULL, &demo.medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -842 +845 @@
             (void *) &demo);
 
-        rc = ui_menu_create(demo.mbar, "~P~references", &demo.mpreferences);
+        rc = ui_menu_dd_create(demo.mbar, "~P~references", NULL,
+            &demo.mpreferences);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -848 +852 @@
         }
 
-        rc = ui_menu_create(demo.mbar, "~H~elp", &demo.mhelp);
+        rc = ui_menu_dd_create(demo.mbar, "~H~elp", NULL, &demo.mhelp);
         if (rc != EOK) {
                 printf("Error creating menu.\n");