From 856531509c7998fcbf402f64b26d9c9ef0ac5154 Mon Sep 17 00:00:00 2001 From: "Olli.Pettay%helsinki.fi" Date: Fri, 17 Nov 2006 00:02:49 +0000 Subject: [PATCH] Still trying to fix mac builds, bug Bug 354694 --- widget/src/mac/nsMacEventHandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/widget/src/mac/nsMacEventHandler.cpp b/widget/src/mac/nsMacEventHandler.cpp index 825b01f6c2b..83486bc6c44 100644 --- a/widget/src/mac/nsMacEventHandler.cpp +++ b/widget/src/mac/nsMacEventHandler.cpp @@ -1523,9 +1523,9 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord& aOSEvent) { // set the activation and focus on the widget hit, if it accepts it { - nsMouseEvent mouseActivateEvent(PR_TRUE, 0, nsnull, + nsMouseEvent mouseActivateEvent(PR_TRUE, NS_MOUSE_ACTIVATE, nsnull, nsMouseEvent::eReal); - ConvertOSEventToMouseEvent(aOSEvent, mouseActivateEvent, NS_MOUSE_ACTIVATE); + ConvertOSEventToMouseEvent(aOSEvent, mouseActivateEvent); widgetHit->DispatchMouseEvent(mouseActivateEvent); } @@ -1535,9 +1535,9 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord& aOSEvent) // if we're a control-click, send in an additional NS_CONTEXTMENU event // after the mouse down. if (mouseEvent.button == nsMouseEvent::eRightButton) { - nsMouseEvent contextMenuEvent(PR_TRUE, 0, nsnull, + nsMouseEvent contextMenuEvent(PR_TRUE, NS_CONTEXTMENU, nsnull, nsMouseEvent::eReal); - ConvertOSEventToMouseEvent(aOSEvent, contextMenuEvent, NS_CONTEXTMENU); + ConvertOSEventToMouseEvent(aOSEvent, contextMenuEvent); contextMenuEvent.isControl = PR_FALSE; widgetHit->DispatchMouseEvent(contextMenuEvent); } @@ -1595,7 +1595,7 @@ PRBool nsMacEventHandler::HandleMouseUpEvent( if ( aOSEvent.message == kEventMouseButtonTertiary ) mouseEvent.button = nsMouseEvent::eMiddleButton; - ConvertOSEventToMouseEvent(aOSEvent, mouseEvent, mouseButton); + ConvertOSEventToMouseEvent(aOSEvent, mouseEvent); nsWindow* widgetReleased = (nsWindow*)mouseEvent.widget; nsWindow* widgetHit = mEventDispatchHandler->GetWidgetHit(); @@ -1639,8 +1639,8 @@ PRBool nsMacEventHandler::HandleMouseMoveEvent( EventRecord& aOSEvent ) if (!::IsWindowActive(wind) && windowType != eWindowType_popup) return retVal; - nsMouseEvent mouseEvent(PR_TRUE, 0, nsnull, nsMouseEvent::eReal); - ConvertOSEventToMouseEvent(aOSEvent, mouseEvent, NS_MOUSE_MOVE); + nsMouseEvent mouseEvent(PR_TRUE, NS_MOUSE_MOVE, nsnull, nsMouseEvent::eReal); + ConvertOSEventToMouseEvent(aOSEvent, mouseEvent); if (lastWidgetHit) { Point macPoint = aOSEvent.where;