Fixes to menu code.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4632 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Michael Silva 1999-07-22 23:57:39 +00:00
parent 2038c599a1
commit 3b761f19e8
3 changed files with 17 additions and 3 deletions

View file

@ -1,3 +1,10 @@
1999-07-22 Michael Hanni <mhanni@sprintmail.com>
* Source/NSMenuView.m: some fixes to get things to work correctly
when calling menu item actions. Also autoenable should be working
a little better.
* Source/NSMenuItemCell.m: drawing fixes for disabled cells.
1999-07-20 Michael Hanni <mhanni@sprintmail.com>
* Source/NSMenuView.m: trackEvent: fixed problems that existed for

View file

@ -271,7 +271,11 @@ static BOOL usesUserKeyEquivalents = YES;
NSRectFill(floodRect);
}
[[NSColor blackColor] set];
if ([self isEnabled])
[[NSColor blackColor] set];
else
[[NSColor grayColor] set];
[[NSFont systemFontOfSize:12] set];
DPSmoveto(ctxt, cellFrame.origin.x + 5, cellFrame.origin.y + 6);
DPSshow(ctxt, [[self title] cString]);

View file

@ -660,11 +660,14 @@ cell do the following */
[self setHighlightedItemIndex: -1];
if ([selectedCell action] && ![selectedCell target])
// if ([selectedCell action] && ![selectedCell target])
if (menuv_menu)
[menuv_menu performActionForItem:
[menuv_items_link objectAtIndex: lastIndex]];
else if ([selectedCell action] && [selectedCell target])
if (menuv_popb)
[menuv_popb performSelector:[selectedCell action] withObject:selectedCell];
// else if ([selectedCell action] && [selectedCell target])
/* If we are a menu */