(on bsmedberg's advice) third time lucky?

This commit is contained in:
neil%parkwaycc.co.uk 2004-02-19 13:20:57 +00:00
parent 0b48b027be
commit bf3e577efc
4 changed files with 22 additions and 24 deletions

View File

@ -6098,14 +6098,22 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
}
}
// Continue with second dispatch to system event handlers.
// Stopping propagation in the default group does not affect
// propagation in the system event group.
// (see also section 1.2.2.6 of the DOM3 Events Working Draft)
aEvent->flags &= ~NS_EVENT_FLAG_STOP_DISPATCH;
// 3. Give event to the Frames for browser default processing.
// XXX The event isn't translated into the local coordinate space
// of the frame...
if (aEvent->eventStructType != NS_EVENT && GetCurrentEventFrame()) {
rv = mCurrentEventFrame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent,
aStatus);
}
// Continue with second dispatch to system event handlers.
// Need to null check mCurrentEventContent and mCurrentEventFrame
// since the previous dispatch could have nuked them.
if (mCurrentEventContent) {
@ -6124,15 +6132,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
}
}
// 3. Give event to the Frames for browser default processing.
// XXX The event isn't translated into the local coordinate space
// of the frame...
if (GetCurrentEventFrame() && NS_SUCCEEDED (rv) &&
aEvent->eventStructType != NS_EVENT) {
rv = mCurrentEventFrame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent,
aStatus);
}
// 4. Give event to event manager for post event state changes and
// generation of synthetic events.
if (NS_SUCCEEDED (rv) &&

View File

@ -349,12 +349,12 @@ protected:
PRUint8 mFlags;
// prefs used to configure the double-click word selection behavior
friend class WordSelectListener;
class WordSelectListener: public nsIObserver {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
};
friend class WordSelectListener;
static WordSelectListener *sWordSelectListener; // have we read the prefs yet?
static PRBool sWordSelectStopAtPunctuation; // should we stop at punctuation?

View File

@ -6098,14 +6098,22 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
}
}
// Continue with second dispatch to system event handlers.
// Stopping propagation in the default group does not affect
// propagation in the system event group.
// (see also section 1.2.2.6 of the DOM3 Events Working Draft)
aEvent->flags &= ~NS_EVENT_FLAG_STOP_DISPATCH;
// 3. Give event to the Frames for browser default processing.
// XXX The event isn't translated into the local coordinate space
// of the frame...
if (aEvent->eventStructType != NS_EVENT && GetCurrentEventFrame()) {
rv = mCurrentEventFrame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent,
aStatus);
}
// Continue with second dispatch to system event handlers.
// Need to null check mCurrentEventContent and mCurrentEventFrame
// since the previous dispatch could have nuked them.
if (mCurrentEventContent) {
@ -6124,15 +6132,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
}
}
// 3. Give event to the Frames for browser default processing.
// XXX The event isn't translated into the local coordinate space
// of the frame...
if (GetCurrentEventFrame() && NS_SUCCEEDED (rv) &&
aEvent->eventStructType != NS_EVENT) {
rv = mCurrentEventFrame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent,
aStatus);
}
// 4. Give event to event manager for post event state changes and
// generation of synthetic events.
if (NS_SUCCEEDED (rv) &&

View File

@ -349,12 +349,12 @@ protected:
PRUint8 mFlags;
// prefs used to configure the double-click word selection behavior
friend class WordSelectListener;
class WordSelectListener: public nsIObserver {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
};
friend class WordSelectListener;
static WordSelectListener *sWordSelectListener; // have we read the prefs yet?
static PRBool sWordSelectStopAtPunctuation; // should we stop at punctuation?