gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-20 22:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Major fixes all around.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4677 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Michael Silva 1999-07-30 22:10:02 +00:00
parent 6aea8ff03e
commit cf61ae7e46
11 changed files with 542 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/NSMenuView.m
View file

@ -87,19 +87,6 @@ static float GSMenuBarHeight = 25.0; // a guess.
return menuv_menu;
}
// Or random items.
- (void) setPopUpButton: (NSPopUpButton *)popb;
{
ASSIGN(menuv_popb, popb);
menuv_items_link = [menuv_popb itemArray];
}
- (NSPopUpButton *)popupButton
{
return menuv_popb;
}
- (void)setHorizontal: (BOOL)flag
{
menuv_horizontal = flag;
@ -316,7 +303,8 @@ static float GSMenuBarHeight = 25.0; // a guess.
neededWidth = aWidth;
}
cellSize.width = 7 + neededWidth + 7 + 7 + 5;
if (![menuv_menu _isBeholdenToPopUpButton])
cellSize.width = 7 + neededWidth + 7 + 7 + 5;
if ([window contentView] == self)
[window setContentSize: NSMakeSize(cellSize.width,howHigh)];
@ -671,16 +659,10 @@ cell do the following */
[self setHighlightedItemIndex: -1];
if (menuv_menu)
[menuv_menu performActionForItem:
[menuv_items_link objectAtIndex: lastIndex]];
[menuv_menu performActionForItem:
[menuv_items_link objectAtIndex: lastIndex]];
if (menuv_popb)
[menuv_popb performSelector:[selectedCell action] withObject:selectedCell];
/* If we are a menu */
if (menuv_menu)
if (![menuv_menu _isBeholdenToPopUpButton])
{
while (!finished)
{ // "forward"cursive menu find.
@ -707,14 +689,10 @@ cell do the following */
[window flushWindow];
}
}
/* If we are a popup */
if (menuv_popb)
else
{
[menuv_popb close];
[menuv_menu close];
}
}
else
{