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

More TODO resolution.

This commit is contained in:
Pietro Gagliardi 2015-08-22 00:32:41 -04:00
parent 49364e22fb
commit c4d5e5c047
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
redo/reredo/darwin/menu.m
View File

@ -1,8 +1,6 @@
// 28 april 2015 // 28 april 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODO migrate to map.m functions
static NSMutableArray *menus = nil; static NSMutableArray *menus = nil;
static BOOL menusFinalized = NO; static BOOL menusFinalized = NO;
@ -54,10 +52,8 @@ enum {
- (IBAction)onClicked:(id)sender - (IBAction)onClicked:(id)sender
{ {
uiMenuItem *item; uiMenuItem *item;
NSValue *v;
v = (NSValue *) [self->items objectForKey:sender]; item = (uiMenuItem *) mapGet(self->items, sender);
item = (uiMenuItem *) [v pointerValue];
if (item->type == typeCheckbox) if (item->type == typeCheckbox)
uiMenuItemSetChecked(uiMenuItem(item), !uiMenuItemChecked(uiMenuItem(item))); uiMenuItemSetChecked(uiMenuItem(item), !uiMenuItemChecked(uiMenuItem(item)));
// use the key window as the source of the menu event; it's the active window // use the key window as the source of the menu event; it's the active window
@ -91,8 +87,7 @@ enum {
self->hasAbout = YES; self->hasAbout = YES;
break; break;
} }
v = [NSValue valueWithPointer:smi]; mapSet(self->items, item, smi);
[self->items setObject:v forKey:item];
} }
// on OS X there are two ways to handle menu items being enabled or disabled: automatically and manually // on OS X there are two ways to handle menu items being enabled or disabled: automatically and manually
@ -101,7 +96,6 @@ enum {
- (BOOL)validateMenuItem:(NSMenuItem *)item - (BOOL)validateMenuItem:(NSMenuItem *)item
{ {
uiMenuItem *smi; uiMenuItem *smi;
NSValue *v;
// disable the special items if they aren't present // disable the special items if they aren't present
if (item == self.quitItem && !self->hasQuit) if (item == self.quitItem && !self->hasQuit)
@ -111,8 +105,7 @@ enum {
if (item == self.aboutItem && !self->hasAbout) if (item == self.aboutItem && !self->hasAbout)
return NO; return NO;
// then poll the item's enabled/disabled state // then poll the item's enabled/disabled state
v = (NSValue *) [self->items objectForKey:item]; smi = (uiMenuItem *) mapGet(self->items, item);
smi = (uiMenuItem *) [v pointerValue];
return !smi->disabled; return !smi->disabled;
} }