gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-24 06:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[insertItemWithTitle:...atIndex:] autorelease the return value.

Browse source 
[mouseDown:] when we create the location directory, autorelease it.
In [_locationKey] and [display] remove unneeded checks for popup.
In [copyWithZone:] set the autoenable property before adding items.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10802 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2001-08-30 06:50:04 +00:00
parent 72e8d36398
commit 3a950b8cae
1 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
Source/NSMenu.m
View file

@ -97,10 +97,6 @@ static NSNotificationCenter *nc;
- (NSString*) _locationKey
{
if (_is_beholdenToPopUpButton == YES)
{
return nil; /* Can't save */
}
if (_superMenu == nil)
{
if ([NSApp mainMenu] == self)
@ -301,7 +297,7 @@ static NSNotificationCenter *nc;
[self insertItem: anItem atIndex: index];
// For returns sake.
return anItem;
return AUTORELEASE(anItem);
}
- (void) addItem: (id <NSMenuItem>)newItem
@ -964,13 +960,13 @@ static NSNotificationCenter *nc;
unsigned i;
unsigned count = [_items count];
[new setAutoenablesItems: _autoenable];
for (i = 0; i < count; i++)
{
// This works because the copy on NSMenuItem sets the menu to nil!!!
[new insertItem: [[_items objectAtIndex: i] copyWithZone: zone]
atIndex: i];
}
[new setAutoenablesItems: _autoenable];
return new;
}
@ -1084,50 +1080,42 @@ static NSNotificationCenter *nc;
- (void) display
{
NSString *key;
if (_changed)
[self sizeToFit];
if (_is_beholdenToPopUpButton)
{
[_aWindow orderFront: nil];
return;
}
if (_superMenu && ![self isTornOff]) // query super menu for
{ // position
if (_superMenu && ![self isTornOff])
{
// query super menu for position
[_aWindow setFrameOrigin: [_superMenu locationForSubmenu: self]];
_superMenu->_attachedMenu = self;
}
else
else if (nil != (key = [self _locationKey]))
{
NSString *key = [self _locationKey];
if (key != nil)
{
NSUserDefaults *defaults;
NSDictionary *menuLocations;
NSString *location;
NSUserDefaults *defaults;
NSDictionary *menuLocations;
NSString *location;
defaults = [NSUserDefaults standardUserDefaults];
menuLocations = [defaults objectForKey: NSMenuLocationsKey];
location = [menuLocations objectForKey: key];
if (location && [location isKindOfClass: [NSString class]])
{
[_aWindow setFrameFromString: location];
/*
* May need resize in case saved frame is out of sync
* with number of items in menu.
*/
[self sizeToFit];
}
else
{
NSPoint aPoint = {0, [[NSScreen mainScreen] frame].size.height
- [_aWindow frame].size.height};
[_aWindow setFrameOrigin: aPoint];
[_bWindow setFrameOrigin: aPoint];
}
defaults = [NSUserDefaults standardUserDefaults];
menuLocations = [defaults objectForKey: NSMenuLocationsKey];
location = [menuLocations objectForKey: key];
if (location && [location isKindOfClass: [NSString class]])
{
[_aWindow setFrameFromString: location];
/*
* May need resize in case saved frame is out of sync
* with number of items in menu.
*/
[self sizeToFit];
}
else
{
NSPoint aPoint = {0, [[NSScreen mainScreen] frame].size.height
- [_aWindow frame].size.height};
[_aWindow setFrameOrigin: aPoint];
[_bWindow setFrameOrigin: aPoint];
}
}
@ -1463,12 +1451,11 @@ static NSNotificationCenter *nc;
menuLocations = [[defaults objectForKey: NSMenuLocationsKey] mutableCopy];
if (menuLocations == nil)
{
menuLocations = [[NSMutableDictionary alloc] initWithCapacity: 2];
menuLocations = AUTORELEASE([[NSMutableDictionary alloc] initWithCapacity: 2]);
}
locString = [[menu window] stringWithSavedFrame];
[menuLocations setObject: locString forKey: key];
[defaults setObject: menuLocations forKey: NSMenuLocationsKey];
RELEASE(menuLocations);
[defaults synchronize];
}
}