ARC: Update BundleMenu framework

This commit is contained in:
Allan Odgaard
2012-09-23 02:01:57 +02:00
parent 7cc86ae8cf
commit 596bd65140
4 changed files with 18 additions and 28 deletions

View File

@@ -7,20 +7,10 @@
#import <oak/oak.h>
@interface BundlePopupMenuTarget : NSObject
{
NSString* selectedItemUUID;
}
@property (nonatomic, retain) NSString* selectedItemUUID;
@end
@implementation BundlePopupMenuTarget
@synthesize selectedItemUUID;
- (void)dealloc
{
self.selectedItemUUID = nil;
[super dealloc];
}
- (BOOL)validateMenuItem:(NSMenuItem*)menuItem
{
return [menuItem action] == @selector(takeItemUUIDFrom:);
@@ -156,8 +146,8 @@ bundles::item_ptr OakShowMenuForBundleItems (std::vector<bundles::item_ptr> cons
else if(items.size() == 1)
return items.front();
BundlePopupMenuTarget* menuTarget = [[[BundlePopupMenuTarget alloc] init] autorelease];
NSMenu* menu = [[[NSMenu alloc] init] autorelease];
BundlePopupMenuTarget* menuTarget = [BundlePopupMenuTarget new];
NSMenu* menu = [NSMenu new];
[menu setFont:[NSFont menuFontOfSize:[NSFont smallSystemFontSize]]];
OakAddBundlesToMenu(items, hasSelection, false, menu, @selector(takeItemUUIDFrom:), menuTarget);