From 372180e89cd535fb42e811db9ae2deec073ffbb2 Mon Sep 17 00:00:00 2001
From: "kyle.yuan@sun.com" <kyle.yuan@sun.com>
Date: Wed, 30 Oct 2002 01:05:43 +0000
Subject: [PATCH] Bug 119696 Many keyboard shortcuts don't work when focus is
 on a <select> (listbox or drop-down) r=jkeiser, sr=bzbarsky, a=roc+moz Thanks
 for Simford.Dong@sun.com's fix

---
 layout/forms/nsListControlFrame.cpp          | 23 ++++++++++++--------
 layout/html/forms/src/nsListControlFrame.cpp | 23 ++++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 4d17ddbef3c8..b1f48e7b5cec 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -3334,14 +3334,9 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
     return rv;
   }
 
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-
-  if (nsevent) {
-    // We are handling this so don't let it bubble up
-
-    nsevent->PreventBubble();
-  }
-
+  // Whether we need PreventDefault or not
+  PRBool needPreventDefault = PR_TRUE;
+  
   // Whether we did an incremental search or another action
   PRBool didIncrementalSearch = PR_FALSE;
   
@@ -3467,6 +3462,8 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
         }
         return NS_OK;
       }
+      
+      needPreventDefault = PR_FALSE;
 
       PRUnichar uniChar = ToLowerCase(NS_STATIC_CAST(PRUnichar, charCode));
 
@@ -3516,14 +3513,22 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
               if (wasChanged) {
                 UpdateSelection(); // dispatch event, update combobox, etc.
               }
+              needPreventDefault = PR_TRUE;
               break;
             }
           }
         }
-      } // while
+      } // for
     } break;//case
   } // switch
 
+  //if current key has been processed then we need to call PreventDefault()
+  if (needPreventDefault){
+	  
+      aKeyEvent->PreventDefault();
+      
+  }
+
   // If we didn't do an incremental search, clear the string
   if (!didIncrementalSearch) {
     GetIncrementalString().Truncate();
diff --git a/layout/html/forms/src/nsListControlFrame.cpp b/layout/html/forms/src/nsListControlFrame.cpp
index 4d17ddbef3c8..b1f48e7b5cec 100644
--- a/layout/html/forms/src/nsListControlFrame.cpp
+++ b/layout/html/forms/src/nsListControlFrame.cpp
@@ -3334,14 +3334,9 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
     return rv;
   }
 
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
-
-  if (nsevent) {
-    // We are handling this so don't let it bubble up
-
-    nsevent->PreventBubble();
-  }
-
+  // Whether we need PreventDefault or not
+  PRBool needPreventDefault = PR_TRUE;
+  
   // Whether we did an incremental search or another action
   PRBool didIncrementalSearch = PR_FALSE;
   
@@ -3467,6 +3462,8 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
         }
         return NS_OK;
       }
+      
+      needPreventDefault = PR_FALSE;
 
       PRUnichar uniChar = ToLowerCase(NS_STATIC_CAST(PRUnichar, charCode));
 
@@ -3516,14 +3513,22 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
               if (wasChanged) {
                 UpdateSelection(); // dispatch event, update combobox, etc.
               }
+              needPreventDefault = PR_TRUE;
               break;
             }
           }
         }
-      } // while
+      } // for
     } break;//case
   } // switch
 
+  //if current key has been processed then we need to call PreventDefault()
+  if (needPreventDefault){
+	  
+      aKeyEvent->PreventDefault();
+      
+  }
+
   // If we didn't do an incremental search, clear the string
   if (!didIncrementalSearch) {
     GetIncrementalString().Truncate();