mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-29 21:07:39 +00:00
Fixes to auto-enabling of menu items
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3360 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5c39f6f65c
commit
0c4d973115
4 changed files with 217 additions and 148 deletions
|
@ -89,11 +89,12 @@ static BOOL usesUserKeyEquivalents = YES;
|
|||
|
||||
- (void)setTarget:(id)anObject
|
||||
{
|
||||
BOOL hadSubmenu = hasSubmenu;
|
||||
hasSubmenu = anObject && [anObject isKindOfClass:[NSMenu class]];
|
||||
if (hasSubmenu) {
|
||||
if (hasSubmenu)
|
||||
[anObject retain];
|
||||
if (hadSubmenu)
|
||||
[target release];
|
||||
}
|
||||
[super setTarget:anObject];
|
||||
}
|
||||
|
||||
|
@ -112,14 +113,6 @@ static BOOL usesUserKeyEquivalents = YES;
|
|||
return hasSubmenu;
|
||||
}
|
||||
|
||||
- (BOOL)isEnabled
|
||||
{
|
||||
if (hasSubmenu)
|
||||
return YES;
|
||||
else
|
||||
return [super isEnabled];
|
||||
}
|
||||
|
||||
- (NSString*)keyEquivalent
|
||||
{
|
||||
if (usesUserKeyEquivalents)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue