338166 - clean up carbon menu events on trunk and 1.8 branch

Status: RESOLVED FIXED

(Core :: Widget: Cocoa, defect)

Description

[Josh Aas]

We register for more Carbon events than we need on branch and trunk, and there is a mistake in the carbon event handling on the branch.

Comment 1

[Josh Aas]

Attachment: 1.8 branch fix v1.0

Registers for fewer Carbon events, also we had something like this in the handling:

if (a == c)
  ...
else if (b == c)
  ...
else if (a == c)
  ...

Comment 2

[Josh Aas]

Attachment: trunk fix v1.0

Comment 3

[Mark Mentovai]

Comment on attachment 222224 [details] [diff] [review]
trunk fix v1.0

>Index: cocoa/nsMenuX.mm
>   // do we really need all these events?

Get rid of that comment.

>   static EventTypeSpec eventList[] = {
>-  {kEventClassMenu, kEventMenuBeginTracking},
>-  {kEventClassMenu, kEventMenuEndTracking},
>-  {kEventClassMenu, kEventMenuChangeTrackingMode},
>   {kEventClassMenu, kEventMenuOpening},
>   {kEventClassMenu, kEventMenuClosed},
>-  {kEventClassMenu, kEventMenuTargetItem},
>-  {kEventClassMenu, kEventMenuMatchKey},
>-  {kEventClassMenu, kEventMenuEnableItems}};
>+  {kEventClassMenu, kEventMenuTargetItem}};

Indent that whole block and put the closing }; on its own (non-indented) line, like in the Carbon implementation.

Comment 4

[Josh Aas]

trunk and 1.8 branch patches landed