From 7942dfc2b617caa09c876c12aeb232d19937d2a6 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Fri, 25 Feb 2000 00:51:51 +0000 Subject: [PATCH] fix for 29016. tell the rollup listener to rollup xul popups when the user clicks in the menubar or a DA. r=sfraser a=jar. git-svn-id: svn://10.0.0.236/trunk@61620 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/mac/nsMacMessagePump.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mozilla/widget/src/mac/nsMacMessagePump.cpp b/mozilla/widget/src/mac/nsMacMessagePump.cpp index 47b059eb143..9fe42a068ca 100644 --- a/mozilla/widget/src/mac/nsMacMessagePump.cpp +++ b/mozilla/widget/src/mac/nsMacMessagePump.cpp @@ -48,6 +48,8 @@ #include "plevent.h" #include "prthread.h" #include "nsMacTSMMessagePump.h" +#include "nsIRollupListener.h" +#include "nsIWidget.h" #include #include @@ -77,6 +79,11 @@ const short kMinWindowHeight = 150; NS_WIDGET nsMacMessagePump::nsWindowlessMenuEventHandler nsMacMessagePump::gWindowlessMenuEventHandler = nsnull; + +extern nsIRollupListener * gRollupListener; +extern nsIWidget * gRollupWidget; + + //====================================================================================== // PROFILE //====================================================================================== @@ -377,6 +384,8 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent) switch (partCode) { case inSysWindow: + if ( gRollupListener && gRollupWidget ) + gRollupListener->Rollup(); break; case inMenuBar: @@ -387,6 +396,8 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent) menuResult = ConvertOSMenuResultToPPMenuResult(menuResult); DoMenu(anEvent, menuResult); } + if ( gRollupListener && gRollupWidget ) + gRollupListener->Rollup(); break; }