Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved ConvertOSMenuResultToPPMenuResult() from nsMacMain

Browse Source
This commit is contained in:
pierre%netscape.com 1999-01-19 10:29:30 +00:00
parent 4908a5c207
commit daef1833b0
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
widget/src/mac/nsMacMessagePump.cpp
View File

@ -42,6 +42,7 @@
#include <MacWindows.h>
#include <ToolUtils.h>
#include <LowMem.h>
#include <PP_Types.h>
#if DEBUG
#include <SIOUX.h>
@ -63,6 +64,33 @@ inline bool IsUserWindow(WindowPtr wp)
return wp && ((::GetWindowKind(wp) & kRaptorWindowKindBit) != 0);
}
//=================================================================
static long ConvertOSMenuResultToPPMenuResult(long menuResult);
static long ConvertOSMenuResultToPPMenuResult(long menuResult)
{
// Convert MacOS menu item to PowerPlant menu item because
// in our sample app, we use Constructor for resource editing
long menuID = HiWord(menuResult);
long menuItem = LoWord(menuResult);
Int16** theMcmdH = (Int16**) ::GetResource('Mcmd', menuID);
if (theMcmdH != nil)
{
if (::GetHandleSize((Handle)theMcmdH) > 0)
{
Int16 numCommands = (*theMcmdH)[0];
if (numCommands >= menuItem)
{
CommandT* theCommandNums = (CommandT*)(&(*theMcmdH)[1]);
menuItem = theCommandNums[menuItem-1];
}
}
::ReleaseResource((Handle) theMcmdH);
}
menuResult = (menuID << 16) + menuItem;
return (menuResult);
}
//=================================================================
/* Constructor
@ -218,7 +246,10 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
{
long menuResult = ::MenuSelect(anEvent.where);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
break;
}
@ -376,7 +407,10 @@ void nsMacMessagePump::DoKey(EventRecord &anEvent)
// do a menu key command
long menuResult = ::MenuKey(theChar);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
}
else
{