mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 19:10:48 +00:00
Revert the WinUX theme specific patch Doug put in some time ago.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31522 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f6603574d1
commit
687d59cb1a
2 changed files with 5 additions and 9 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2010-10-17 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
|
* Source/NSMenuView.m: Revert the WinUX theme specific patch Doug
|
||||||
|
put in some time ago.
|
||||||
|
|
||||||
2010-10-16 Wolfgang Lux <wolfgang.lux@gmail.com>
|
2010-10-16 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||||
|
|
||||||
* Source/NSWorkspace.m (-_iconForExtension:): Fix bug where the
|
* Source/NSWorkspace.m (-_iconForExtension:): Fix bug where the
|
||||||
|
|
|
@ -1452,13 +1452,6 @@ static NSMapTable *viewInfo = 0;
|
||||||
NSEvent *original;
|
NSEvent *original;
|
||||||
NSEventType type;
|
NSEventType type;
|
||||||
NSEventType end;
|
NSEventType end;
|
||||||
NSPopUpButtonCell *bcell = nil;
|
|
||||||
SEL bcellAction = NULL;
|
|
||||||
if([_attachedMenu _ownedByPopUp])
|
|
||||||
{
|
|
||||||
bcell = [_attachedMenu _owningPopUp];
|
|
||||||
bcellAction = [bcell action];
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The original event is unused except to determine whether the method
|
* The original event is unused except to determine whether the method
|
||||||
|
@ -1663,13 +1656,11 @@ static NSMapTable *viewInfo = 0;
|
||||||
lastLocation = location;
|
lastLocation = location;
|
||||||
}
|
}
|
||||||
|
|
||||||
[bcell setAction:NULL]; // block actions while fetching an event (this is a problem on Windows)
|
|
||||||
event = [NSApp nextEventMatchingMask: eventMask
|
event = [NSApp nextEventMatchingMask: eventMask
|
||||||
untilDate: theDistantFuture
|
untilDate: theDistantFuture
|
||||||
inMode: NSEventTrackingRunLoopMode
|
inMode: NSEventTrackingRunLoopMode
|
||||||
dequeue: YES];
|
dequeue: YES];
|
||||||
type = [event type];
|
type = [event type];
|
||||||
[bcell setAction:bcellAction]; // restore the popUpButtonCell's action
|
|
||||||
}
|
}
|
||||||
while (type != end || shouldFinish == NO);
|
while (type != end || shouldFinish == NO);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue