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

Fix a missing break in the menu bar click code. No bug, r=pinkerton

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@63489 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2000-03-20 23:20:12 +00:00
parent 08e2ef909b
commit c7db5c436c
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/widget/src/mac/nsMacMessagePump.cpp
View File

@@ -397,20 +397,23 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
case inMenuBar:
{
// If a xul popup is displayed, roll it up and don't allow the click
// through to the menu code. This is how MacOS context menus work, so
// I think this is a valid solution.
if ( gRollupListener && gRollupWidget )
gRollupListener->Rollup();
else {
long menuResult = ::MenuSelect(anEvent.where);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
break;
}
// If a xul popup is displayed, roll it up and don't allow the click
// through to the menu code. This is how MacOS context menus work, so
// I think this is a valid solution.
if ( gRollupListener && gRollupWidget )
{
gRollupListener->Rollup();
}
else
{
long menuResult = ::MenuSelect(anEvent.where);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
}
break;
}
case inContent:
@@ -462,7 +465,7 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
Point oldPt = anEvent.where;
while (::WaitMouseUp())
{
Repeater::DoRepeaters(anEvent);
Repeater::DoRepeaters(anEvent);
Point origin = {0,0};
::LocalToGlobal(&origin);