Changes in uspace/lib/ui/private/menu.h [d92b8e8f:3c8c580] in mainline

File:

• uspace/lib/ui/private/menu.h (modified) (5 diffs)

uspace/lib/ui/private/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
-#include <types/common.h>
 #include <types/ui/menu.h>
 #include <types/ui/resource.h>
@@ -50 +49 @@
  */
 struct ui_menu {
-        /** Parent window */
-        struct ui_window *parent;
+        /** Containing menu bar */
+        struct ui_menu_bar *mbar;
+        /** Link to @c bar->menus */
+        link_t lmenus;
         /** Caption */
         char *caption;
@@ -66 +67 @@
         /** Menu entries (ui_menu_entry_t) */
         list_t entries;
-        /** Callbacks */
-        struct ui_menu_cb *cb;
-        /** Callback argument */
-        void *arg;
-        /** ID of device that activated entry */
-        sysarg_t idev_id;
 };
 
@@ -87 +82 @@
 extern void ui_menu_get_geom(ui_menu_t *, gfx_coord2_t *, ui_menu_geom_t *);
 extern ui_resource_t *ui_menu_get_res(ui_menu_t *);
-extern errno_t ui_menu_paint_bg_gfx(ui_menu_t *, gfx_coord2_t *);
-extern errno_t ui_menu_paint_bg_text(ui_menu_t *, gfx_coord2_t *);
-extern void ui_menu_up(ui_menu_t *);
-extern void ui_menu_down(ui_menu_t *);
-extern void ui_menu_left(ui_menu_t *, sysarg_t);
-extern void ui_menu_right(ui_menu_t *, sysarg_t);
-extern void ui_menu_close_req(ui_menu_t *);
-extern void ui_menu_press_accel(ui_menu_t *, char32_t, sysarg_t);
 
 #endif