Need to let the OS handle Alt+F4.

        Reviewed by Hyatt.

        * WebView.cpp:
        (WebView::keyUp):
        (WebView::keyDown):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index dbf9563e83e276164965c7d8621d909e48791945..07da2dae97141be8f8546af3ecb42540972bc746 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-07  Ada Chan  <adachan@apple.com>
+
+        Need to let the OS handle Alt+F4.
+
+        Reviewed by Hyatt.
+
+        * WebView.cpp:
+        (WebView::keyUp):
+        (WebView::keyDown):
+
 2007-09-07  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Oliver.

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 4a9f22c43859445cc3179458ffacad4f4e2829fd..3c8353bf2eb065f86ff1738c354b19f00566bd19 100644 (file)
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -878,8 +878,8 @@ bool WebView::keyUp(WPARAM virtualKeyCode, LPARAM keyData)
 
     PlatformKeyboardEvent keyEvent(m_viewWindow, virtualKeyCode, keyData, m_currentCharacterCode);
 
-    // Don't send key events for alt+space.
-    if (keyEvent.altKey() && virtualKeyCode == VK_SPACE)
+    // Don't send key events for alt+space and alt+f4.
+    if (keyEvent.altKey() && (virtualKeyCode == VK_SPACE || virtualKeyCode == VK_F4))
         return false;
 
     Frame* frame = m_page->focusController()->focusedOrMainFrame();
@@ -1011,8 +1011,8 @@ bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown)
     if (virtualKeyCode == VK_SHIFT || virtualKeyCode == VK_CONTROL ||  virtualKeyCode == VK_MENU || virtualKeyCode == VK_CAPITAL)
         return false;
 
-    // Don't send key events for alt+space, since the OS needs to handle that.
-    if (virtualKeyCode == VK_SPACE && systemKeyDown)
+    // Don't send key events for alt+space and alt+f4, since the OS needs to handle that.
+    if (systemKeyDown && (virtualKeyCode == VK_SPACE || virtualKeyCode == VK_F4))
         return false;
 
     MSG msg;