author | Mehdi Mulani <mmmulani@uwaterloo.ca> |
Wed, 01 Jun 2011 21:18:27 -0400 | |
changeset 70448 | b3760bf020265db8b97f12ff0f723642570780e6 |
parent 70447 | cadc21488ae788341eeb3695f4fa6b30c834330f |
child 70449 | 9a6c139a4e586eeba4a2ed7b60706acbc146d3b8 |
push id | 20322 |
push user | mmmulani@uwaterloo.ca |
push date | Thu, 02 Jun 2011 02:22:20 +0000 |
treeherder | mozilla-central@b3760bf02026 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | smichaud |
bugs | 426643 |
milestone | 7.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -3623,22 +3623,22 @@ NSEvent* gLastDragMouseDownEvent = nil; cocoaEvent.data.mouse.buttonNumber = [theEvent buttonNumber]; cocoaEvent.data.mouse.clickCount = [theEvent clickCount]; cocoaEvent.data.mouse.deltaX = [theEvent deltaX]; cocoaEvent.data.mouse.deltaY = [theEvent deltaY]; cocoaEvent.data.mouse.deltaZ = [theEvent deltaZ]; geckoEvent.pluginEvent = &cocoaEvent; } - PRBool handled = mGeckoChild->DispatchWindowEvent(geckoEvent); + mGeckoChild->DispatchWindowEvent(geckoEvent); if (!mGeckoChild) return; - if (!handled) - [super rightMouseDown:theEvent]; // let the superview do context menu stuff + // Let the superclass do the context menu stuff. + [super rightMouseDown:theEvent]; NS_OBJC_END_TRY_ABORT_BLOCK; } - (void)rightMouseUp:(NSEvent *)theEvent { NS_OBJC_BEGIN_TRY_ABORT_BLOCK;