From 67b5372c2b5e27c15fc547bef92e85788faf9629 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Tue, 20 Jun 2000 13:49:24 +0000 Subject: [PATCH] #42637 r=hyatt, a=brendan OS/2 bring up - change menu code so clicks are NOT passed to the default window proc if they are handled. This fix has been tested on Linux, Windows, OS/2 - does not affect Mac. --- layout/xul/base/src/nsMenuFrame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp index 16bb8e978f8..adf8a22d871 100644 --- a/layout/xul/base/src/nsMenuFrame.cpp +++ b/layout/xul/base/src/nsMenuFrame.cpp @@ -283,7 +283,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext, nsEventStatus* aEventStatus) { NS_ENSURE_ARG_POINTER(aEventStatus); - *aEventStatus = nsEventStatus_eConsumeDoDefault; + *aEventStatus = nsEventStatus_eConsumeNoDefault; if (aEvent->message == NS_KEY_PRESS && !IsDisabled()) { nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent; @@ -398,6 +398,8 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext, mOpenTimer->Init(this, menuDelay, NS_PRIORITY_HIGHEST); } } + else + *aEventStatus = nsEventStatus_eConsumeDoDefault; return NS_OK; }