diff --git a/ChangeLog b/ChangeLog index 348593a41..7309166e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-17 Fred Kiefer + + * Source/NSMenuView.m: Revert the WinUX theme specific patch Doug + put in some time ago. + 2010-10-16 Wolfgang Lux * Source/NSWorkspace.m (-_iconForExtension:): Fix bug where the diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m index 2f78906ec..48837256a 100644 --- a/Source/NSMenuView.m +++ b/Source/NSMenuView.m @@ -1452,13 +1452,6 @@ static NSMapTable *viewInfo = 0; NSEvent *original; NSEventType type; 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 @@ -1663,13 +1656,11 @@ static NSMapTable *viewInfo = 0; lastLocation = location; } - [bcell setAction:NULL]; // block actions while fetching an event (this is a problem on Windows) event = [NSApp nextEventMatchingMask: eventMask untilDate: theDistantFuture inMode: NSEventTrackingRunLoopMode dequeue: YES]; type = [event type]; - [bcell setAction:bcellAction]; // restore the popUpButtonCell's action } while (type != end || shouldFinish == NO);