Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle menu events when there is no window + other fixes

Browse Source
This commit is contained in:
pierre%netscape.com 1998-09-23 09:24:33 +00:00
parent f8474ee65e
commit 1702ec7fa1
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@
#include "nsWidgetsCID.h"
#include <LPeriodical.h>
#define DRAW_ON_RESIZE
#define IsUserWindow(wp) (wp && ((((WindowPeek)wp)->windowKind) >= userKind))
@ -31,6 +30,7 @@ nsWindow* nsMacMessagePump::gCurrentWindow = nsnull;
nsWindow* nsMacMessagePump::gGrabWindow = nsnull; // need this for grabmouse
static NS_DEFINE_IID(kITEXTWIDGETIID, NS_TEXTFIELD_CID);
nsMacMessagePump::nsWindowlessMenuEventHandler nsMacMessagePump::gWindowlessMenuEventHandler = nsnull;
//=================================================================
@ -87,6 +87,8 @@ unsigned char evtype;
{
haveevent = ::WaitNextEvent(everyEvent,&theevent,sleep,0l);
LPeriodical::DevoteTimeToRepeaters(theevent);
if(haveevent)
{
switch(theevent.what)
@ -164,8 +166,6 @@ unsigned char evtype;
break;
}
}
LPeriodical::DevoteTimeToRepeaters(theevent);
}
//if (mDispatchListener)
@ -283,17 +283,16 @@ nsMouseEvent mouseevent;
{
SelectWindow(whichwindow);
thewindow = (nsWindow*)(((WindowPeek)whichwindow)->refCon);
if(thewindow != nsnull)
{
thewindow = thewindow->FindWidgetHit(aTheEvent->where);
}
switch(partcode)
{
case inSysWindow:
break;
case inContent:
if(thewindow != nsnull)
{
thewindow = thewindow->FindWidgetHit(aTheEvent->where);
}
if(thewindow)
{
SetPort(whichwindow);
@ -694,7 +693,7 @@ nsTextWidget *widget;
* @return NONE
*/
void
nsMacMessagePump::DoMenu(EventRecord *aTheEvent, long menuItem)
nsMacMessagePump::DoMenu(EventRecord *aTheEvent, long menuResult)
{
WindowPtr whichwindow;
nsMenuEvent theEvent;
@ -709,15 +708,41 @@ nsMacMessagePump::DoMenu(EventRecord *aTheEvent, long menuItem)
raptorWindow = mToolkit->GetFocus();
#endif
// Convert MacOS menu item to PowerPlant menu item
// because 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;
// Handle the menu command
if (raptorWindow)
{
theEvent.eventStructType = NS_MENU_EVENT;
theEvent.message = NS_MENU_SELECTED;
theEvent.menuItem = menuItem;
theEvent.menuItem = menuResult;
theEvent.widget = raptorWindow;
theEvent.nativeMsg = aTheEvent;
raptorWindow->DispatchEvent(&theEvent);
}
else
{
if (gWindowlessMenuEventHandler != nsnull)
gWindowlessMenuEventHandler(menuResult);
}
HiliteMenu(0);
}