Removed typed stuff from darwin/menu.m. Now let's try building it.
This commit is contained in:
parent
5efad5e850
commit
ded1ee6997
|
@ -5,14 +5,12 @@ static NSMutableArray *menus = nil;
|
||||||
static BOOL menusFinalized = NO;
|
static BOOL menusFinalized = NO;
|
||||||
|
|
||||||
struct uiMenu {
|
struct uiMenu {
|
||||||
uiTyped t;
|
|
||||||
NSMenu *menu;
|
NSMenu *menu;
|
||||||
NSMenuItem *item;
|
NSMenuItem *item;
|
||||||
NSMutableArray *items;
|
NSMutableArray *items;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct uiMenuItem {
|
struct uiMenuItem {
|
||||||
uiTyped t;
|
|
||||||
NSMenuItem *item;
|
NSMenuItem *item;
|
||||||
int type;
|
int type;
|
||||||
BOOL disabled;
|
BOOL disabled;
|
||||||
|
@ -230,7 +228,6 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name)
|
||||||
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");
|
||||||
|
|
||||||
item = uiNew(uiMenuItem);
|
item = uiNew(uiMenuItem);
|
||||||
uiTyped(item)->Type = uiMenuItemType();
|
|
||||||
|
|
||||||
item->type = type;
|
item->type = type;
|
||||||
switch (item->type) {
|
switch (item->type) {
|
||||||
|
@ -305,7 +302,6 @@ uiMenu *uiNewMenu(const char *name)
|
||||||
menus = [NSMutableArray new];
|
menus = [NSMutableArray new];
|
||||||
|
|
||||||
m = uiNew(uiMenu);
|
m = uiNew(uiMenu);
|
||||||
uiTyped(m)->Type = uiMenuType();
|
|
||||||
|
|
||||||
m->menu = [[NSMenu alloc] initWithTitle:toNSString(name)];
|
m->menu = [[NSMenu alloc] initWithTitle:toNSString(name)];
|
||||||
// use automatic menu item enabling for all menus for consistency's sake
|
// use automatic menu item enabling for all menus for consistency's sake
|
||||||
|
|
Loading…
Reference in New Issue