git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4620 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Michael Silva 1999-07-19 22:21:10 +00:00
parent 6a4261c380
commit 4bb21c0786
2 changed files with 8 additions and 8 deletions

View file

@ -13,6 +13,9 @@
makes it much easier for me to develop on the multiple machines I
use.
* Source/GSServicesManager.m: removed NSMenuMatrix code. Should
work properly now.
1999-07-18 Michael Hanni <mhanni@sprintmail.com>
* Source/NSPopUpButtonCell.m: removed debug code. Makes

View file

@ -1053,7 +1053,6 @@ static NSString *disabledName = @".GNUstepDisabled";
{
if (servicesMenu && [[application mainMenu] autoenablesItems])
{
NSMenuMatrix *menuCells;
NSArray *a;
unsigned i;
NSMenu *mainMenu = [application mainMenu];
@ -1069,8 +1068,7 @@ static NSString *disabledName = @".GNUstepDisabled";
return;
}
menuCells = [servicesMenu menuCells];
a = [menuCells itemArray];
a = [servicesMenu itemArray];
for (i = 0; i < [a count]; i++)
{
@ -1085,8 +1083,7 @@ static NSString *disabledName = @".GNUstepDisabled";
*/
if (title == nil && [[cell target] isKindOfClass: [NSMenu class]])
{
NSMenuMatrix *subMenuCells = [[cell target] menuCells];
NSArray *sub = [subMenuCells itemArray];
NSArray *sub = [[cell target] itemArray];
int j;
shouldBeEnabled = NO;
@ -1104,8 +1101,8 @@ static NSString *disabledName = @".GNUstepDisabled";
if (subWasEnabled != subShouldBeEnabled)
{
[subCell setEnabled: subShouldBeEnabled];
[subMenuCells setNeedsDisplayInRect:
[subMenuCells cellFrameAtRow: j]];
// [subMenuCells setNeedsDisplayInRect:
// [subMenuCells cellFrameAtRow: j]];
}
}
}
@ -1115,7 +1112,7 @@ static NSString *disabledName = @".GNUstepDisabled";
if (wasEnabled != shouldBeEnabled)
{
[cell setEnabled: shouldBeEnabled];
[menuCells setNeedsDisplayInRect: [menuCells cellFrameAtRow: i]];
// [menuCells setNeedsDisplayInRect: [menuCells cellFrameAtRow: i]];
}
}
}