From d741a8b1bc3fe690a7258e084a5faecdbd34dc9f Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Tue, 28 Jun 2005 14:59:43 +0000 Subject: [PATCH] Bug 298894 - [Mac] Make the enter key only (and always) fire the default button. r=mconnor/jhpedemonte, sr=neil, a=bsmedberg. git-svn-id: svn://10.0.0.236/trunk@175218 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp | 4 ++++ mozilla/toolkit/content/widgets/button.xml | 3 --- mozilla/toolkit/content/widgets/dialog.xml | 9 +-------- .../xpfe/global/resources/content/bindings/button.xml | 3 --- .../xpfe/global/resources/content/bindings/dialog.xml | 3 +-- .../xpfe/global/resources/content/mac/platformDialog.xml | 4 ---- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp b/mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp index 27a148557e2..2b2aa77316c 100644 --- a/mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp @@ -112,6 +112,8 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext, } break; +// On mac, Return fires the defualt button, not the focused one. +#ifndef XP_MACOSX case NS_KEY_PRESS: if (NS_KEY_EVENT == aEvent->eventStructType) { nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent; @@ -119,10 +121,12 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext, nsCOMPtr buttonEl(do_QueryInterface(mContent)); if (buttonEl) { MouseClicked(aPresContext, aEvent); + aEvent->PreventDefault(); } } } break; +#endif case NS_KEY_UP: if (NS_KEY_EVENT == aEvent->eventStructType) { diff --git a/mozilla/toolkit/content/widgets/button.xml b/mozilla/toolkit/content/widgets/button.xml index 681dd07e202..05128bc53f9 100644 --- a/mozilla/toolkit/content/widgets/button.xml +++ b/mozilla/toolkit/content/widgets/button.xml @@ -170,9 +170,6 @@ this.fireAccessKeyButton(buttonBox, charPressedLower); ]]> - - - diff --git a/mozilla/toolkit/content/widgets/dialog.xml b/mozilla/toolkit/content/widgets/dialog.xml index 07dac14a55f..c557628debf 100644 --- a/mozilla/toolkit/content/widgets/dialog.xml +++ b/mozilla/toolkit/content/widgets/dialog.xml @@ -47,13 +47,6 @@ if (!document.documentElement.cancelDialog()) event.preventDefault(); }) - -#ifdef XP_MACOSX - true -#else - false -#endif - - - - diff --git a/mozilla/xpfe/global/resources/content/bindings/dialog.xml b/mozilla/xpfe/global/resources/content/bindings/dialog.xml index 29c999d29e2..31752390dfc 100644 --- a/mozilla/xpfe/global/resources/content/bindings/dialog.xml +++ b/mozilla/xpfe/global/resources/content/bindings/dialog.xml @@ -35,7 +35,6 @@ if (!document.documentElement.cancelDialog()) event.preventDefault(); }) - false - - true - -