interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed pointer abuse in unix/menu.c. Almost there now...

This commit is contained in:
Pietro Gagliardi 2015-04-23 20:15:21 -04:00
parent 58444b0ea2
commit 11ad023f78
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
new/unix/menu.c
View File

@ -7,7 +7,7 @@ static gboolean menusFinalized = FALSE;
struct menu { struct menu {
uiMenu m; uiMenu m;
char *name; char *name;
GArray *items; // []struct menuItem GArray *items; // []*struct menuItem
}; };
struct menuItem { struct menuItem {
@ -130,8 +130,8 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name)
if (menusFinalized) if (menusFinalized)
complain("attempt to create a new menu item after menus have been finalized"); complain("attempt to create a new menu item after menus have been finalized");
g_array_set_size(m->items, m->items->len + 1); item = uiNew(struct menuItem);
item = &g_array_index(m->items, struct menuItem, m->items->len - 1); g_array_append_val(m->items, item);
item->type = type; item->type = type;
switch (item->type) { switch (item->type) {
@ -224,14 +224,13 @@ uiMenu *uiNewMenu(const char *name)
if (menusFinalized) if (menusFinalized)
complain("attempt to create a new menu after menus have been finalized"); complain("attempt to create a new menu after menus have been finalized");
if (menus == NULL) if (menus == NULL)
menus = g_array_new(FALSE, TRUE, sizeof (struct menu)); menus = g_array_new(FALSE, TRUE, sizeof (struct menu *));
// thanks Company in irc.gimp.net/#gtk+ m = uiNew(struct menu);
g_array_set_size(menus, menus->len + 1); g_array_append_val(menus, m);
m = &g_array_index(menus, struct menu, menus->len - 1);
m->name = g_strdup(name); m->name = g_strdup(name);
m->items = g_array_new(FALSE, TRUE, sizeof (struct menuItem)); m->items = g_array_new(FALSE, TRUE, sizeof (struct menuItem *));
uiMenu(m)->AppendItem = menuAppendItem; uiMenu(m)->AppendItem = menuAppendItem;
uiMenu(m)->AppendCheckItem = menuAppendCheckItem; uiMenu(m)->AppendCheckItem = menuAppendCheckItem;
@ -276,12 +275,12 @@ GtkWidget *makeMenubar(uiWindow *w)
menubar = gtk_menu_bar_new(); menubar = gtk_menu_bar_new();
for (i = 0; i < menus->len; i++) { for (i = 0; i < menus->len; i++) {
m = &g_array_index(menus, struct menu, i); m = g_array_index(menus, struct menu *, i);
menuitem = gtk_menu_item_new_with_label(m->name); menuitem = gtk_menu_item_new_with_label(m->name);
submenu = gtk_menu_new(); submenu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
for (j = 0; j < m->items->len; j++) for (j = 0; j < m->items->len; j++)
appendMenuItem(GTK_MENU_SHELL(submenu), &g_array_index(m->items, struct menuItem, j), w); appendMenuItem(GTK_MENU_SHELL(submenu), g_array_index(m->items, struct menuItem *, j), w);
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
} }