From e8822cdba2509088c312b7a113d76a202d92bcdb Mon Sep 17 00:00:00 2001
From: "joshmoz%gmail.com"
 <joshmoz%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 16 May 2006 18:13:02 +0000
Subject: [PATCH] don't register for Carbon events we don't need. b=338166
 r=mento

git-svn-id: svn://10.0.0.236/trunk@196684 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/cocoa/nsMenuX.mm | 13 ++++---------
 mozilla/widget/src/mac/nsMenuX.cpp  |  7 +------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/mozilla/widget/src/cocoa/nsMenuX.mm b/mozilla/widget/src/cocoa/nsMenuX.mm
index 7ad94209f4e..18e168643ae 100644
--- a/mozilla/widget/src/cocoa/nsMenuX.mm
+++ b/mozilla/widget/src/cocoa/nsMenuX.mm
@@ -1177,16 +1177,11 @@ static pascal OSStatus MyMenuEventHandler(EventHandlerCallRef myHandler, EventRe
 
 static OSStatus InstallMyMenuEventHandler(MenuRef menuRef, void* userData, EventHandlerRef* outHandler)
 {
-  // do we really need all these events?
   static EventTypeSpec eventList[] = {
-  {kEventClassMenu, kEventMenuBeginTracking},
-  {kEventClassMenu, kEventMenuEndTracking},
-  {kEventClassMenu, kEventMenuChangeTrackingMode},
-  {kEventClassMenu, kEventMenuOpening},
-  {kEventClassMenu, kEventMenuClosed},
-  {kEventClassMenu, kEventMenuTargetItem},
-  {kEventClassMenu, kEventMenuMatchKey},
-  {kEventClassMenu, kEventMenuEnableItems}};
+    {kEventClassMenu, kEventMenuOpening},
+    {kEventClassMenu, kEventMenuClosed},
+    {kEventClassMenu, kEventMenuTargetItem}
+  };
   
   static EventHandlerUPP gMyMenuEventHandlerUPP = NewEventHandlerUPP(&MyMenuEventHandler);
   OSStatus status = ::InstallMenuEventHandler(menuRef, gMyMenuEventHandlerUPP,
diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp
index af804923e7d..6f7d73c7339 100644
--- a/mozilla/widget/src/mac/nsMenuX.cpp
+++ b/mozilla/widget/src/mac/nsMenuX.cpp
@@ -774,14 +774,9 @@ static OSStatus InstallMyMenuEventHandler(MenuRef menuRef, void* userData, Event
 {
   // install the event handler for the various carbon menu events.
   static EventTypeSpec eventList[] = {
-      { kEventClassMenu, kEventMenuBeginTracking },
-      { kEventClassMenu, kEventMenuEndTracking },
-      { kEventClassMenu, kEventMenuChangeTrackingMode },
       { kEventClassMenu, kEventMenuOpening },
       { kEventClassMenu, kEventMenuClosed },
-      { kEventClassMenu, kEventMenuTargetItem },
-      { kEventClassMenu, kEventMenuMatchKey },
-      { kEventClassMenu, kEventMenuEnableItems }
+      { kEventClassMenu, kEventMenuTargetItem }
   };
   static EventHandlerUPP gMyMenuEventHandlerUPP = NewEventHandlerUPP(&MyMenuEventHandler);
   return ::InstallMenuEventHandler(menuRef, gMyMenuEventHandlerUPP,