gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 12:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert last change

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38394 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-03-11 00:57:46 +00:00
parent 2df985f377
commit 687bada9e1
4 changed files with 5 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/NSMenuView.m
View file

@ -90,10 +90,6 @@ static NSMapTable *viewInfo = 0;
- (void) _attachMenu: (NSMenu*)aMenu;
@end
@interface NSMenu (GNUstepPrivate)
+ (void)_setCurrentMenu:(NSMenu*)menu;
@end
@implementation NSMenu (Private)
- (void) _attachMenu: (NSMenu*)aMenu
{
@ -1463,8 +1459,6 @@ static NSMapTable *viewInfo = 0;
NSEvent *original;
NSEventType type;
_finished = NO;
/*
* The original event is unused except to determine whether the method
* was invoked in response to a right or left mouse down.
@ -1737,12 +1731,11 @@ static NSMapTable *viewInfo = 0;
[[event window] sendEvent: event];
}
}
while (type == NSAppKitDefined && (_finished == NO));
while (type == NSAppKitDefined);
}
while ((_finished == NO) &&
((type != NSLeftMouseUp &&
type != NSRightMouseUp &&
type != NSOtherMouseUp) || shouldFinish == NO));
while ((type != NSLeftMouseUp &&
type != NSRightMouseUp &&
type != NSOtherMouseUp) || shouldFinish == NO);
/*
* Ok, we released the mouse
@ -1897,11 +1890,9 @@ static NSMapTable *viewInfo = 0;
originalTopLeft.y += originalFrame.size.height;
}
[NSMenu _setCurrentMenu:[self menu]];
[NSEvent startPeriodicEventsAfterDelay: 0.1 withPeriod: 0.01];
[self trackWithEvent: theEvent];
[NSEvent stopPeriodicEvents];
[NSMenu _setCurrentMenu:nil];
if (restorePosition)
{
@ -1988,10 +1979,5 @@ static NSMapTable *viewInfo = 0;
return _itemCells;
}
- (void)_finish
{
_finished = YES;
}
@end