Changes in uspace/lib/ui/private/menubar.h [4034954c:5d380b6] in mainline

File:

• uspace/lib/ui/private/menubar.h (modified) (2 diffs)

uspace/lib/ui/private/menubar.h

@@ -42 +42 @@
 #include <stdbool.h>
 #include <types/common.h>
+#include <types/ui/menu.h>
 #include <types/ui/menubar.h>
-#include <types/ui/menudd.h>
 
 /** Actual structure of menu bar.
@@ -60 +60 @@
         /** Menu bar is active */
         bool active;
-        /** Selected menu drop-down or @c NULL */
-        struct ui_menu_dd *selected;
-        /** List of menu drop-downs (ui_menu_dd_t) */
-        list_t menudds;
+        /** Selected menu or @c NULL */
+        struct ui_menu *selected;
+        /** List of menus (ui_menu_t) */
+        list_t menus;
 };
 
-extern void ui_menu_bar_select(ui_menu_bar_t *, ui_menu_dd_t *, bool, sysarg_t);
-extern void ui_menu_bar_select_sysmenu(ui_menu_bar_t *, bool, sysarg_t);
+extern void ui_menu_bar_select(ui_menu_bar_t *, ui_menu_t *, bool, sysarg_t);
 extern void ui_menu_bar_left(ui_menu_bar_t *, sysarg_t);
 extern void ui_menu_bar_right(ui_menu_bar_t *, sysarg_t);
 extern ui_evclaim_t ui_menu_bar_key_press_unmod(ui_menu_bar_t *, kbd_event_t *);
-extern void ui_menu_bar_entry_rect(ui_menu_bar_t *, ui_menu_dd_t *,
-    gfx_rect_t *);
+extern void ui_menu_bar_entry_rect(ui_menu_bar_t *, ui_menu_t *, gfx_rect_t *);
 
 #endif