Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't register for Carbon events we don't need. b=338166 r=mento

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@196684 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joshmoz%gmail.com 2006-05-16 18:13:02 +00:00
parent 9c4122473c
commit e8822cdba2
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/widget/src/cocoa/nsMenuX.mm
View File

@ -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,

7
mozilla/widget/src/mac/nsMenuX.cpp
View File

@ -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,