Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only call GetCharCode for KeyPress events to avoid triggering a warning in nsDOMKeyEvent.cpp. bug 309316, r+sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@195703 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2006-04-29 00:39:03 +00:00
parent 7cf3397f6c
commit e747e9d893
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/forms/nsTextControlFrame.cpp
View File

@@ -370,7 +370,8 @@ DoCommandCallback(const char *aCommand, void *aData)
static PRBool
DOMEventToNativeKeyEvent(nsIDOMEvent *aDOMEvent,
nsNativeKeyEvent *aNativeEvent)
nsNativeKeyEvent *aNativeEvent,
PRBool aGetCharCode)
{
nsCOMPtr<nsIDOMNSUIEvent> uievent = do_QueryInterface(aDOMEvent);
PRBool defaultPrevented;
@@ -386,7 +387,11 @@ DOMEventToNativeKeyEvent(nsIDOMEvent *aDOMEvent,
nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aDOMEvent);
keyEvent->GetCharCode(&aNativeEvent->charCode);
if (aGetCharCode) {
keyEvent->GetCharCode(&aNativeEvent->charCode);
} else {
aNativeEvent->charCode = 0;
}
keyEvent->GetKeyCode(&aNativeEvent->keyCode);
keyEvent->GetAltKey(&aNativeEvent->altKey);
keyEvent->GetCtrlKey(&aNativeEvent->ctrlKey);
@@ -401,7 +406,8 @@ nsTextInputListener::KeyDown(nsIDOMEvent *aKeyEvent)
{
nsNativeKeyEvent nativeEvent;
nsINativeKeyBindings *bindings = GetKeyBindings();
if (bindings && DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent)) {
if (bindings &&
DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent, PR_FALSE)) {
if (bindings->KeyDown(nativeEvent, DoCommandCallback, mFrame)) {
aKeyEvent->PreventDefault();
}
@@ -415,7 +421,8 @@ nsTextInputListener::KeyPress(nsIDOMEvent *aKeyEvent)
{
nsNativeKeyEvent nativeEvent;
nsINativeKeyBindings *bindings = GetKeyBindings();
if (bindings && DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent)) {
if (bindings &&
DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent, PR_TRUE)) {
if (bindings->KeyPress(nativeEvent, DoCommandCallback, mFrame)) {
aKeyEvent->PreventDefault();
}
@@ -429,7 +436,8 @@ nsTextInputListener::KeyUp(nsIDOMEvent *aKeyEvent)
{
nsNativeKeyEvent nativeEvent;
nsINativeKeyBindings *bindings = GetKeyBindings();
if (bindings && DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent)) {
if (bindings &&
DOMEventToNativeKeyEvent(aKeyEvent, &nativeEvent, PR_FALSE)) {
if (bindings->KeyUp(nativeEvent, DoCommandCallback, mFrame)) {
aKeyEvent->PreventDefault();
}