Mercurial > hg > toolkit / file diff

--- a/ui/gtk/menu.h	Sat Apr 15 21:06:45 2023 +0200
+++ b/ui/gtk/menu.h	Mon May 22 16:17:26 2023 +0200
@@ -30,7 +30,7 @@
 #define	MENU_H
 
 #include "../ui/menu.h"
-#include <ucx/list.h>
+#include <cx/list.h>
 #include "toolkit.h"
 
 #ifdef	__cplusplus
@@ -50,13 +50,16 @@
 typedef GtkWidget*(*ui_menu_add_f)(GtkWidget *, int, UiMenuItemI*, UiObject*);
     
 struct UiMenuItemI {
+    UiMenuItemI    *prev;
+    UiMenuItemI    *next;
     ui_menu_add_f  add_to;
 };
 
 struct UiMenu {
     UiMenuItemI    item;
     char           *label;
-    UcxList        *items;
+    UiMenuItemI    *items_begin;
+    UiMenuItemI    *items_end;
     UiMenu         *parent;
 };
 
@@ -65,7 +68,7 @@
     ui_callback    callback;
     char           *label;
     void           *userdata;
-    UcxList        *groups;
+    CxList         *groups;
 };
 
 struct UiStMenuItem {
@@ -73,7 +76,7 @@
     ui_callback    callback;
     char           *stockid;
     void           *userdata;
-    UcxList        *groups;
+    CxList         *groups;
 };
 
 struct UiCheckItem {