Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't use nsFocusEvent in Mac OS X code. also remove some dead code. b=387526 r=cbarrett sr=pinkerton

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-07-11 08:40:21 -07:00
parent a94d174799
commit 7a6342321c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
widget/src/cocoa/nsChildView.h
View File

@ -300,7 +300,6 @@ public:
virtual PRBool PointInWidget(Point aThePoint);
virtual PRBool DispatchWindowEvent(nsGUIEvent& event);
virtual PRBool DispatchWindowEvent(nsGUIEvent &event,nsEventStatus &aStatus);
virtual void AcceptFocusOnClick(PRBool aBool) { mAcceptFocusOnClick = aBool;};
PRBool AcceptFocusOnClick() { return mAcceptFocusOnClick;};

19
widget/src/cocoa/nsChildView.mm
View File

@ -1356,13 +1356,6 @@ PRBool nsChildView::DispatchWindowEvent(nsGUIEvent &event)
}
PRBool nsChildView::DispatchWindowEvent(nsGUIEvent &event,nsEventStatus &aStatus)
{
DispatchEvent(&event, aStatus);
return ConvertStatus(aStatus);
}
// Deal with all sort of mouse event
PRBool nsChildView::DispatchMouseEvent(nsMouseEvent &aEvent)
{
@ -3796,7 +3789,7 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
if (!mGeckoChild)
return NO;
nsFocusEvent event(PR_TRUE, NS_GOTFOCUS, mGeckoChild);
nsGUIEvent event(PR_TRUE, NS_GOTFOCUS, mGeckoChild);
mGeckoChild->DispatchWindowEvent(event);
return [super becomeFirstResponder];
@ -3809,7 +3802,7 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
- (BOOL)resignFirstResponder
{
if (mGeckoChild) {
nsFocusEvent event(PR_TRUE, NS_LOSTFOCUS, mGeckoChild);
nsGUIEvent event(PR_TRUE, NS_LOSTFOCUS, mGeckoChild);
mGeckoChild->DispatchWindowEvent(event);
}
@ -3830,10 +3823,10 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
if (isMozWindow)
[[self window] setSuppressMakeKeyFront:YES];
nsFocusEvent focusEvent(PR_TRUE, NS_GOTFOCUS, mGeckoChild);
nsGUIEvent focusEvent(PR_TRUE, NS_GOTFOCUS, mGeckoChild);
mGeckoChild->DispatchWindowEvent(focusEvent);
nsFocusEvent activateEvent(PR_TRUE, NS_ACTIVATE, mGeckoChild);
nsGUIEvent activateEvent(PR_TRUE, NS_ACTIVATE, mGeckoChild);
mGeckoChild->DispatchWindowEvent(activateEvent);
if (isMozWindow)
@ -3846,10 +3839,10 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
if (!mGeckoChild)
return;
nsFocusEvent deactivateEvent(PR_TRUE, NS_DEACTIVATE, mGeckoChild);
nsGUIEvent deactivateEvent(PR_TRUE, NS_DEACTIVATE, mGeckoChild);
mGeckoChild->DispatchWindowEvent(deactivateEvent);
nsFocusEvent unfocusEvent(PR_TRUE, NS_LOSTFOCUS, mGeckoChild);
nsGUIEvent unfocusEvent(PR_TRUE, NS_LOSTFOCUS, mGeckoChild);
mGeckoChild->DispatchWindowEvent(unfocusEvent);
}