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

Added duplication guards to Quit, Preferences, and About items on GTK+.

This commit is contained in:
Pietro Gagliardi 2015-04-30 13:02:30 -04:00
parent 45a204744f
commit 7a70c3f568
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unix/menu.c
View File

@ -5,6 +5,9 @@
static GArray *menus = NULL; static GArray *menus = NULL;
static gboolean menusFinalized = FALSE; static gboolean menusFinalized = FALSE;
static gboolean hasQuit = FALSE;
static gboolean hasPreferences = FALSE;
static gboolean hasAbout = FALSE;
struct menu { struct menu {
uiMenu m; uiMenu m;
@ -191,7 +194,9 @@ uiMenuItem *menuAppendCheckItem(uiMenu *mm, const char *name)
uiMenuItem *menuAppendQuitItem(uiMenu *mm) uiMenuItem *menuAppendQuitItem(uiMenu *mm)
{ {
// TODO check multiple quit items if (hasQuit)
complain("attempt to add multiple Quit menu items");
hasQuit = TRUE;
// TODO conditionally add separator // TODO conditionally add separator
newItem((struct menu *) mm, typeSeparator, NULL); newItem((struct menu *) mm, typeSeparator, NULL);
return newItem((struct menu *) mm, typeQuit, NULL); return newItem((struct menu *) mm, typeQuit, NULL);
@ -199,7 +204,9 @@ uiMenuItem *menuAppendQuitItem(uiMenu *mm)
uiMenuItem *menuAppendPreferencesItem(uiMenu *mm) uiMenuItem *menuAppendPreferencesItem(uiMenu *mm)
{ {
// TODO check multiple preferences items if (hasPreferences)
complain("attempt to add multiple Preferences menu items");
hasPreferences = TRUE;
// TODO conditionally add separator // TODO conditionally add separator
newItem((struct menu *) mm, typeSeparator, NULL); newItem((struct menu *) mm, typeSeparator, NULL);
return newItem((struct menu *) mm, typePreferences, NULL); return newItem((struct menu *) mm, typePreferences, NULL);
@ -207,7 +214,9 @@ uiMenuItem *menuAppendPreferencesItem(uiMenu *mm)
uiMenuItem *menuAppendAboutItem(uiMenu *mm) uiMenuItem *menuAppendAboutItem(uiMenu *mm)
{ {
// TODO check multiple about items if (hasAbout)
complain("attempt to add multiple About menu items");
hasAbout = TRUE;
// TODO conditionally add separator // TODO conditionally add separator
newItem((struct menu *) mm, typeSeparator, NULL); newItem((struct menu *) mm, typeSeparator, NULL);
return newItem((struct menu *) mm, typeAbout, NULL); return newItem((struct menu *) mm, typeAbout, NULL);