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

Implemented menu uninit on GTK+.

This commit is contained in:
Pietro Gagliardi 2015-05-08 10:17:33 -04:00
parent dc7274c067
commit 057c6d0cfd
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/main.c
View File

@ -20,7 +20,7 @@ const char *uiInit(uiInitOptions *o)
void uiUninit(void)
{
// TODO free menus
uninitMenus();
uninitAlloc();
}

23
unix/menu.c
View File

@ -346,3 +346,26 @@ void freeMenubar(GtkWidget *mb)
gtk_container_foreach(GTK_CONTAINER(mb), freeMenu, &i);
// no need to worry about destroying any widgets; destruction of the window they're in will do it for us
}
void uninitMenus(void)
{
struct menu *m;
struct menuItem *item;
guint i, j;
for (i = 0; i < menus->len; i++) {
m = g_array_index(menus, struct menu *, i);
g_free(m->name);
for (j = 0; j < m->items->len; j++) {
item = g_array_index(m->items, struct menuItem *, j);
if (g_hash_table_size(item->windows) != 0)
complain("menu item %p (%s) still has uiWindows attached; did you forget to free some?", item, item->name);
g_free(item->name);
g_hash_table_destroy(item->windows);
uiFree(item);
}
g_array_free(m->items, TRUE);
uiFree(m);
}
g_array_free(menus, TRUE);
}

1
unix/uipriv_unix.h
View File

@ -14,6 +14,7 @@
// menu.c
extern GtkWidget *makeMenubar(uiWindow *);
extern void freeMenubar(GtkWidget *);
extern void uninitMenus(void);
// alloc.c
extern void initAlloc(void);